From 7c5e0c625e071c13240a65c2e9b62964bfa9cce8 Mon Sep 17 00:00:00 2001 From: hupeng Date: Sat, 15 Jun 2019 15:37:32 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=94=B5=E8=A1=A8][=E4=BF=AE=E5=A4=8D]:?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=80=9A=E4=BF=A1=E5=AF=86=E9=92=A5=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/device/KwBoxV1Controller.java | 6 +++++- .../src/main/java/com/iformall/domain/po/KwBox.java | 3 +++ mallinkService/src/main/resources/mapper/KwBoxMapper.xml | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java b/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java index 9c5af779a..8cbd0c975 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java @@ -83,8 +83,12 @@ public class KwBoxV1Controller extends BaseController { record.setStatus(EnumBoxStatus.REGISTERED.getCode()); kwBoxService.saveOrUpdate(record); Map data = new HashMap<>(); + + data.put("sysStatus",kwBox.getStatus()); + if (kwBox.getComKey() != null) + data.put("comKey",kwBox.getComKey()); if (kwBox.getConfig() != null) - data.put("config",kwBox.getConfig() ); + data.put("config",kwBox.getConfig()); List meters = kwBoxService.findMeters(kwBox); if (!meters.isEmpty()) data.put("meters",meters); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/KwBox.java b/mallinkService/src/main/java/com/iformall/domain/po/KwBox.java index 1d3123341..fd7922e67 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/KwBox.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwBox.java @@ -71,6 +71,9 @@ public class KwBox extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "修改时间", name = "updateTime") private Date updateTime; + @io.swagger.annotations.ApiModelProperty(value = "通信密钥", name = "comKey") + private String comKey; + public static enum Field { Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), CreateTime_ASC("`create_time` ASC"), CreateTime_DESC("`create_time` DESC"), UpdateTime_ASC("`update_time` ASC"), UpdateTime_DESC("`update_time` DESC"); private String value; diff --git a/mallinkService/src/main/resources/mapper/KwBoxMapper.xml b/mallinkService/src/main/resources/mapper/KwBoxMapper.xml index 4ad622975..fb370a55e 100644 --- a/mallinkService/src/main/resources/mapper/KwBoxMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwBoxMapper.xml @@ -16,11 +16,12 @@ + `id`,`tenant_id`,`imei`,`iccid`,`place`,`fw_version`,`hd_version`,`status`,`online`,`register_time`, - `last_online_time`,`config`,`create_time`,`update_time` + `last_online_time`,`config`,`create_time`,`update_time`,`com_key`