Преглед изворни кода

Merge remote-tracking branch 'origin/develop' into develop

release_toaliyun_real
luozukai пре 7 година
родитељ
комит
e3adcac607
3 измењених фајлова са 19 додато и 2 уклоњено
  1. +12
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxDevice.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java
  3. +6
    -1
      mallinkService/src/main/resources/mapper/WxDeviceMapper.xml

+ 12
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxDevice.java Прегледај датотеку

@@ -92,6 +92,10 @@ public class WxDevice implements Serializable {
@io.swagger.annotations.ApiModelProperty(value="最后一次在线时间",name="hbCmd") @io.swagger.annotations.ApiModelProperty(value="最后一次在线时间",name="hbCmd")
private Integer hbCmd; private Integer hbCmd;


/**设备名**/
@io.swagger.annotations.ApiModelProperty(value="设备配置",name="config")
private String config;

public String getTenantId() { public String getTenantId() {
return tenantId; return tenantId;
} }
@@ -195,6 +199,14 @@ public class WxDevice implements Serializable {
this.hbCmd = hbCmd; this.hbCmd = hbCmd;
} }


public String getConfig() {
return config;
}

public void setConfig(String config) {
this.config = config;
}

public static enum Field public static enum Field
{ {
Id_ASC("`id` ASC"),Id_DESC("`id` DESC") Id_ASC("`id` ASC"),Id_DESC("`id` DESC")


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java Прегледај датотеку

@@ -1640,9 +1640,9 @@ public class WxChartServiceImpl implements WxChartDataService {
if (StringUtils.isEmpty(paramsMap.get("enddate"))) { if (StringUtils.isEmpty(paramsMap.get("enddate"))) {
params.put("enddate", endTime); params.put("enddate", endTime);
} else { } else {
endTime = DateUtils.stringToDate(paramsMap.get("enddate") + " 23:59:59", "yyyy-MM-dd HH:mm:ss");
params.put("enddate", paramsMap.get("enddate") + " 23:59:59"); params.put("enddate", paramsMap.get("enddate") + " 23:59:59");
} }

List<Map<String, Object>> successlist = wxOrderGroupMapper.queryOrderGroupSuccessCountAndTime(params); List<Map<String, Object>> successlist = wxOrderGroupMapper.queryOrderGroupSuccessCountAndTime(params);
List<Map<String, Object>> verifyList = wxOrderGroupMapper.queryOrderGroupVerifyCountAndTime(params); List<Map<String, Object>> verifyList = wxOrderGroupMapper.queryOrderGroupVerifyCountAndTime(params);




+ 6
- 1
mallinkService/src/main/resources/mapper/WxDeviceMapper.xml Прегледај датотеку

@@ -16,10 +16,11 @@
<result column="first_hb_time" jdbcType="TIMESTAMP" property="firstHbTime"/> <result column="first_hb_time" jdbcType="TIMESTAMP" property="firstHbTime"/>
<result column="last_hb_time" jdbcType="TIMESTAMP" property="lastHbTime"/> <result column="last_hb_time" jdbcType="TIMESTAMP" property="lastHbTime"/>
<result column="hb_cmd" jdbcType="INTEGER" property="hbCmd"/> <result column="hb_cmd" jdbcType="INTEGER" property="hbCmd"/>
<result column="config" jdbcType="VARCHAR" property="config"/>
</resultMap> </resultMap>


<sql id="allColumns"> <sql id="allColumns">
`id`, `tenant_id`, `device_id`, `type`, `status`, `location`, `name`, `version`, `create_date`, `update_date`, `online_status`, `first_hb_time`, `last_hb_time`, `hb_cmd`
`id`, `tenant_id`, `device_id`, `type`, `status`, `location`, `name`, `version`, `create_date`, `update_date`, `online_status`, `first_hb_time`, `last_hb_time`, `hb_cmd`, `config`
</sql> </sql>


<sql id="dynamicWhereConditions"> <sql id="dynamicWhereConditions">
@@ -82,6 +83,10 @@
and `hb_cmd` = #{hbCmd} and `hb_cmd` = #{hbCmd}
</if> </if>


<if test=" null != config ">
and `config` = #{config}
</if>



<if test=" null != ids "> <if test=" null != ids ">
and id in and id in


Loading…
Откажи
Сачувај