From f422beab1d62bb86226e780b44862b871101c5ce Mon Sep 17 00:00:00 2001 From: hupeng Date: Fri, 26 Jul 2019 15:26:43 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=94=B5=E8=A1=A8][=E4=BC=98=E5=8C=96]:?= =?UTF-8?q?=E7=94=B5=E8=A1=A8=E5=8D=8F=E8=AE=AE=E5=AD=98=E5=82=A8=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/device/KwMeterController.java | 10 ++++++++-- .../java/com/iformall/domain/po/KwMeter.java | 18 ++++++++++-------- .../resources/mapper/KwMerchantMeterMapper.xml | 2 -- .../main/resources/mapper/KwMeterMapper.xml | 4 +--- 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java index 03d121456..fa50afdf7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java @@ -1,5 +1,6 @@ package com.iformall.controller.device; +import com.alibaba.fastjson.JSONObject; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.common.Result; @@ -203,13 +204,18 @@ public class KwMeterController extends BaseController { if (c != null) {kwMeter.setBrand(c.getStringCellValue());} c = row.getCell(3,Row.MissingCellPolicy.RETURN_BLANK_AS_NULL); if (c != null) {kwMeter.setModel(c.getStringCellValue());} + c = row.getCell(4,Row.MissingCellPolicy.RETURN_BLANK_AS_NULL); if (c != null) {kwMeter.setProtocol(Integer.parseInt(c.getStringCellValue()));} - else kwMeter.setProtocol(0); c = row.getCell(5,Row.MissingCellPolicy.RETURN_BLANK_AS_NULL); if (c != null) {kwMeter.setBandrate(Integer.parseInt(c.getStringCellValue()));} - else kwMeter.setBandrate(1200); + if (kwMeter.getProtocol() != null || kwMeter.getBandrate() != null) { + JSONObject jsonObject = new JSONObject(); + if (kwMeter.getProtocol() != null) jsonObject.put("protocol",kwMeter.getProtocol()); + if (kwMeter.getBandrate() != null) jsonObject.put("bandrate",kwMeter.getBandrate()); + kwMeter.setConfig(jsonObject.toJSONString()); + } c = row.getCell(6,Row.MissingCellPolicy.RETURN_BLANK_AS_NULL); if (c != null) { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java b/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java index 3e7aa0d21..10a6a89e1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java @@ -45,14 +45,6 @@ public class KwMeter extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "型号", name = "model") private String model; - @Excel(name = "协议(0,1,2-AUTO,97,07协议)", width =30, orderNum = "5") - @io.swagger.annotations.ApiModelProperty(value = "协议(0,1,2-AUTO,97,07协议)", name = "protocol") - private Integer protocol; - - @Excel(name = "波特率(1200,2400,9600)", width = 30, orderNum = "6") - @io.swagger.annotations.ApiModelProperty(value = "波特率(1200,2400,9600)", name = "bandrate") - private Integer bandrate; - @io.swagger.annotations.ApiModelProperty(value = "在线状态1在线0离线", name = "onlineStatus") private Integer onlineStatus; @@ -84,6 +76,16 @@ public class KwMeter extends BaseEntity { @Transient private String boxImei; + @Excel(name = "协议(0,1,2-AUTO,97,07协议)", width =30, orderNum = "5") + @Transient + @io.swagger.annotations.ApiModelProperty(value = "协议(0,1,2-AUTO,97,07协议)", name = "protocol") + private Integer protocol; + + @Excel(name = "波特率(1200,2400,9600)", width = 30, orderNum = "6") + @Transient + @io.swagger.annotations.ApiModelProperty(value = "波特率(1200,2400,9600)", name = "bandrate") + private Integer bandrate; + @Excel(name = "商户", width = 20, orderNum = "8") @Transient private String merchantName; diff --git a/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml b/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml index 86ca5f889..8fae94be6 100644 --- a/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml @@ -62,8 +62,6 @@ - - diff --git a/mallinkService/src/main/resources/mapper/KwMeterMapper.xml b/mallinkService/src/main/resources/mapper/KwMeterMapper.xml index 2d55b1c38..22f2e8fe2 100644 --- a/mallinkService/src/main/resources/mapper/KwMeterMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwMeterMapper.xml @@ -8,8 +8,6 @@ - - @@ -22,7 +20,7 @@ - `id`,`tenant_id`,`address`,`brand`,`model`,`place`,`protocol`,`bandrate`,`last_online_time`,`last_total_power`,`online_status`,`config`,`create_time`,`update_time`,`box_id`,`status`,`bind_status` + `id`,`tenant_id`,`address`,`brand`,`model`,`place`,`last_online_time`,`last_total_power`,`online_status`,`config`,`create_time`,`update_time`,`box_id`,`status`,`bind_status`