装置模板表新增字段

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;
 }

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;
 }

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDevModelRelationServiceImpl.java

@@ -41,7 +41,6 @@ public class CsDevModelRelationServiceImpl extends ServiceImpl<CsDevModelRelatio
         List<CsDevModelRelationVO> csDevModelRelationVOS = this.queryDevModelRelation (queryParm);
         if(csDevModelRelationVOS.size ()>0){
             throw new BusinessException (AlgorithmResponseEnum.DATA_ERROR);
-
         }
         CsDevModelRelationPO csDevModelRelationPO = new CsDevModelRelationPO();
         BeanUtils.copyProperties (addParm, csDevModelRelationPO);

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/MqttUserServiceImpl.java

@@ -30,7 +30,7 @@ public class MqttUserServiceImpl extends ServiceImpl<MqttUserMapper, MqttUser> 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);
     }
 }