From 4f954e9469bd7c1bbbff96d8e288ca6bb30dd738 Mon Sep 17 00:00:00 2001 From: xuyang <748613696@qq.com> Date: Mon, 7 Aug 2023 20:08:59 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E7=BD=AE=E6=A8=A1=E6=9D=BF=E8=A1=A8?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../csdevice/pojo/param/CsDevModelRelationAddParm.java | 3 ++- .../com/njcn/csdevice/pojo/po/CsDevModelRelationPO.java | 7 +++++++ .../service/impl/CsDevModelRelationServiceImpl.java | 1 - .../njcn/csdevice/service/impl/MqttUserServiceImpl.java | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelRelationAddParm.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelRelationAddParm.java index 6cdcbe4..c4d68a2 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelRelationAddParm.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelRelationAddParm.java @@ -27,6 +27,7 @@ public class CsDevModelRelationAddParm { @ApiModelProperty(value="模板 id") @NotNull(message="模板 id不能为空！") private String modelId; - + @ApiModelProperty(value="逻辑设备id") + private Integer did; } \ No newline at end of file diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDevModelRelationPO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDevModelRelationPO.java index eb1b529..e5dc105 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDevModelRelationPO.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDevModelRelationPO.java @@ -40,4 +40,11 @@ public class CsDevModelRelationPO extends BaseEntity { @TableField(value = "status") @ApiModelProperty(value="状态(0：删除 1：正常)") private String status; + + /** + * 逻辑设备id + */ + @TableField(value = "did") + @ApiModelProperty(value="逻辑设备id") + private Integer did; } \ No newline at end of file diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDevModelRelationServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDevModelRelationServiceImpl.java index 59f6a6e..f5b3a28 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDevModelRelationServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDevModelRelationServiceImpl.java @@ -41,7 +41,6 @@ public class CsDevModelRelationServiceImpl extends ServiceImpl csDevModelRelationVOS = this.queryDevModelRelation (queryParm); if(csDevModelRelationVOS.size ()>0){ throw new BusinessException (AlgorithmResponseEnum.DATA_ERROR); - } CsDevModelRelationPO csDevModelRelationPO = new CsDevModelRelationPO(); BeanUtils.copyProperties (addParm, csDevModelRelationPO); diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/MqttUserServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/MqttUserServiceImpl.java index 5881f9a..bc844ad 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/MqttUserServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/MqttUserServiceImpl.java @@ -30,7 +30,7 @@ public class MqttUserServiceImpl extends ServiceImpl i mqttUser.setUsername(password); mqttUser.setSalt("mqtt"); mqttUser.setIsSuperuser(1); - mqttUser.setPassword(DigestUtil.sha256Hex(password + "mqtt")); + mqttUser.setPassword(DigestUtil.sha256Hex(password + mqttUser.getSalt())); this.save(mqttUser); } }