Merge branch 'master' into prod

device-api-service/src/main/java/com/xy/entity/DeviceTempSet.java

@@ -51,9 +51,15 @@ public class DeviceTempSet {
     /**
      * 目标温度
      */
-    @ApiModelProperty(value = "目标温度1")
+    @ApiModelProperty(value = "目标温度")
     private Integer tempValue;
 
+    /**
+     * 目标温度
+     */
+    @ApiModelProperty(value = "目标温度1")
+    private Integer tempValue1;
+
     /**
      * 目标温度
      */

device-api-service/src/main/java/com/xy/service/factory/cmd/impl/SetsCmdServiceImpl.java

@@ -34,7 +34,8 @@ public class SetsCmdServiceImpl implements CmdService {
                 DeviceTempSetDto.Save save = new DeviceTempSetDto.Save()
                         .setDeviceId(mqttDto.getDeviceId())
                         .setWorkMode(data.getStr("workModel"))
-                        .setTempValue(data.getInt("target1"))
+                        .setTempValue(data.getInt("target"))
+                        .setTempValue1(data.getInt("target1"))
                         .setTempValue2(data.getInt("target2"))
                         .setTempValue3(data.getInt("target3"))
                         .setJob1StartTime(data.getInt("start1"))

device-api/src/main/java/com/xy/dto/DeviceTempSetDto.java

@@ -46,6 +46,9 @@ public class DeviceTempSetDto {
         @ApiModelProperty(value = "目标温度1")
         private Integer tempValue;
 
+        @ApiModelProperty(value = "目标温度1")
+        private Integer tempValue1;
+
         @ApiModelProperty(value = "目标温度2")
         private Integer tempValue2;
 
@@ -101,9 +104,12 @@ public class DeviceTempSetDto {
         @ApiModelProperty(value = "最高温度报警")
         private Integer warningHigh;
 
-        @ApiModelProperty(value = "目标温度1")
+        @ApiModelProperty(value = "目标温度")
         private Integer tempValue;
 
+        @ApiModelProperty(value = "目标温度1")
+        private Integer tempValue1;
+
         @ApiModelProperty(value = "目标温度2")
         private Integer tempValue2;