diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxDevice.java b/mallinkService/src/main/java/com/iformall/domain/po/WxDevice.java index b62f16b2a..4df4f4afc 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxDevice.java +++ b/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") private Integer hbCmd; + /**设备名**/ + @io.swagger.annotations.ApiModelProperty(value="设备配置",name="config") + private String config; + public String getTenantId() { return tenantId; } @@ -195,6 +199,14 @@ public class WxDevice implements Serializable { this.hbCmd = hbCmd; } + public String getConfig() { + return config; + } + + public void setConfig(String config) { + this.config = config; + } + public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index f0dc4a23f..7e4fe044f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/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"))) { params.put("enddate", endTime); } 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"); } - List> successlist = wxOrderGroupMapper.queryOrderGroupSuccessCountAndTime(params); List> verifyList = wxOrderGroupMapper.queryOrderGroupVerifyCountAndTime(params); diff --git a/mallinkService/src/main/resources/mapper/WxDeviceMapper.xml b/mallinkService/src/main/resources/mapper/WxDeviceMapper.xml index 0050312eb..c33a30a69 100644 --- a/mallinkService/src/main/resources/mapper/WxDeviceMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxDeviceMapper.xml @@ -16,10 +16,11 @@ + - `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` @@ -82,6 +83,10 @@ and `hb_cmd` = #{hbCmd} + + and `config` = #{config} + + and id in