Explorar el Código

[电表][修复]:增加通信密钥字段

release_toaliyun_real
hupeng hace 7 años
padre
commit
7c5e0c625e
Se han modificado 3 ficheros con 10 adiciones y 2 borrados
  1. +5
    -1
      mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java
  2. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/KwBox.java
  3. +2
    -1
      mallinkService/src/main/resources/mapper/KwBoxMapper.xml

+ 5
- 1
mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java Ver fichero

@@ -83,8 +83,12 @@ public class KwBoxV1Controller extends BaseController {
record.setStatus(EnumBoxStatus.REGISTERED.getCode()); record.setStatus(EnumBoxStatus.REGISTERED.getCode());
kwBoxService.saveOrUpdate(record); kwBoxService.saveOrUpdate(record);
Map<String,Object> data = new HashMap<>(); Map<String,Object> data = new HashMap<>();

data.put("sysStatus",kwBox.getStatus());
if (kwBox.getComKey() != null)
data.put("comKey",kwBox.getComKey());
if (kwBox.getConfig() != null) if (kwBox.getConfig() != null)
data.put("config",kwBox.getConfig() );
data.put("config",kwBox.getConfig());
List<String> meters = kwBoxService.findMeters(kwBox); List<String> meters = kwBoxService.findMeters(kwBox);
if (!meters.isEmpty()) if (!meters.isEmpty())
data.put("meters",meters); data.put("meters",meters);


+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/po/KwBox.java Ver fichero

@@ -71,6 +71,9 @@ public class KwBox extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value = "修改时间", name = "updateTime") @io.swagger.annotations.ApiModelProperty(value = "修改时间", name = "updateTime")
private Date updateTime; private Date updateTime;


@io.swagger.annotations.ApiModelProperty(value = "通信密钥", name = "comKey")
private String comKey;

public static enum Field { 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"); 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; private String value;


+ 2
- 1
mallinkService/src/main/resources/mapper/KwBoxMapper.xml Ver fichero

@@ -16,11 +16,12 @@
<result column="config" jdbcType="VARCHAR" property="config"/> <result column="config" jdbcType="VARCHAR" property="config"/>
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/> <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/> <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
<result column="com_key" jdbcType="VARCHAR" property="comKey"/>
</resultMap> </resultMap>
<sql id="allColumns"> <sql id="allColumns">
`id`,`tenant_id`,`imei`,`iccid`,`place`,`fw_version`,`hd_version`,`status`,`online`,`register_time`, `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`
</sql> </sql>
<sql id="dynamicWhereConditions"> <sql id="dynamicWhereConditions">


Cargando…
Cancelar
Guardar