From d59ff9eee0d0d805127ca20f44c02ccb1ee3719d Mon Sep 17 00:00:00 2001 From: hupeng Date: Thu, 21 Mar 2019 10:23:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E8=AE=BE=E5=A4=87][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=BE=E5=A4=87=E9=85=8D=E7=BD=AE=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/domain/po/WxDevice.java | 12 ++++++++++++ .../src/main/resources/mapper/WxDeviceMapper.xml | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) 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/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 From b79d1548fe540d3b58d57d43bd31479141c1c87b Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 21 Mar 2019 10:34:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E6=8B=BC=E5=9B=A2][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/service/impl/WxChartServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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);