温度下发指令

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

@@ -9,7 +9,6 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 
 import java.time.LocalDateTime;
-import java.time.LocalTime;
 
 
 /**
@@ -59,37 +58,37 @@ public class DeviceTempSet {
      * 工作时段1起始时间
      */
     @ApiModelProperty(value = "工作时段1起始时间")
-    private LocalTime job1StartTime;
+    private Integer job1StartTime;
 
     /**
      * 工作时段1结束时间
      */
     @ApiModelProperty(value = "工作时段1结束时间")
-    private LocalTime job1StartEnd;
+    private Integer job1StartEnd;
 
     /**
      * 工作时段2起始时间
      */
     @ApiModelProperty(value = "工作时段2起始时间")
-    private LocalTime job2StartTime;
+    private Integer job2StartTime;
 
     /**
      * 工作时段2结束时间
      */
     @ApiModelProperty(value = "工作时段2结束时间")
-    private LocalTime job2StartEnd;
+    private Integer job2StartEnd;
 
     /**
      * 工作时段3起始时间
      */
     @ApiModelProperty(value = "工作时段3起始时间")
-    private LocalTime job3StartTime;
+    private Integer job3StartTime;
 
     /**
      * 工作时段3结束时间
      */
     @ApiModelProperty(value = "工作时段3结束时间")
-    private LocalTime job3EndTime;
+    private Integer job3EndTime;
 
     /**
      * 设置状态

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

@@ -6,7 +6,6 @@ import com.xy.dto.MqttDto;
 import com.xy.dto.PaterDto;
 import com.xy.entity.DeviceTempSet;
 import com.xy.service.DeviceTempSetServiceImpl;
-import com.xy.utils.DataTime;
 import com.xy.utils.LambdaUtils;
 import com.xy.utils.R;
 import com.xy.utils.enums.SetsEnum;
@@ -37,12 +36,12 @@ public class SetsCmdServiceImpl implements CmdService {
                         .setDeviceId(mqttDto.getDeviceId())
                         .setWorkMode(data.getStr("workModel"))
                         .setTempValue(data.getInt("target"))
-                        .setJob1StartTime(DataTime.toLocal(data.getStr("start1")).toLocalTime())
-                        .setJob1StartEnd(DataTime.toLocal(data.getStr("end1")).toLocalTime())
-                        .setJob2StartTime(DataTime.toLocal(data.getStr("start2")).toLocalTime())
-                        .setJob2StartEnd(DataTime.toLocal(data.getStr("end2")).toLocalTime())
-                        .setJob3StartTime(DataTime.toLocal(data.getStr("start3")).toLocalTime())
-                        .setJob3EndTime(DataTime.toLocal(data.getStr("end3")).toLocalTime());
+                        .setJob1StartTime(data.getInt("start1"))
+                        .setJob1StartEnd(data.getInt("end1"))
+                        .setJob2StartTime(data.getInt("start2"))
+                        .setJob2StartEnd(data.getInt("end2"))
+                        .setJob3StartTime(data.getInt("start3"))
+                        .setJob3EndTime(data.getInt("end3"));
                 deviceTempSetService.save(save);
             }
         }

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

@@ -8,7 +8,6 @@ import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
-import java.time.LocalTime;
 
 /**
  * <p>
@@ -48,28 +47,22 @@ public class DeviceTempSetDto {
         private Integer tempValue;
 
         @ApiModelProperty(value = "工作时段1起始时间")
-        @JsonFormat(pattern = "HH:mm:ss")
-        private LocalTime job1StartTime;
+        private Integer job1StartTime;
 
         @ApiModelProperty(value = "工作时段1结束时间")
-        @JsonFormat(pattern = "HH:mm:ss")
-        private LocalTime job1StartEnd;
+        private Integer job1StartEnd;
 
         @ApiModelProperty(value = "工作时段2起始时间")
-        @JsonFormat(pattern = "HH:mm:ss")
-        private LocalTime job2StartTime;
+        private Integer job2StartTime;
 
         @ApiModelProperty(value = "工作时段2结束时间")
-        @JsonFormat(pattern = "HH:mm:ss")
-        private LocalTime job2StartEnd;
+        private Integer job2StartEnd;
 
         @ApiModelProperty(value = "工作时段3起始时间")
-        @JsonFormat(pattern = "HH:mm:ss")
-        private LocalTime job3StartTime;
+        private Integer job3StartTime;
 
         @ApiModelProperty(value = "工作时段3结束时间")
-        @JsonFormat(pattern = "HH:mm:ss")
-        private LocalTime job3EndTime;
+        private Integer job3EndTime;
     }
 
     @Data
@@ -106,28 +99,22 @@ public class DeviceTempSetDto {
         private Integer tempValue;
 
         @ApiModelProperty(value = "工作时段1起始时间")
-        @JsonFormat(pattern = "HH:mm:ss")
-        private LocalTime job1StartTime;
+        private Integer job1StartTime;
 
         @ApiModelProperty(value = "工作时段1结束时间")
-        @JsonFormat(pattern = "HH:mm:ss")
-        private LocalTime job1StartEnd;
+        private Integer job1StartEnd;
 
         @ApiModelProperty(value = "工作时段2起始时间")
-        @JsonFormat(pattern = "HH:mm:ss")
-        private LocalTime job2StartTime;
+        private Integer job2StartTime;
 
         @ApiModelProperty(value = "工作时段2结束时间")
-        @JsonFormat(pattern = "HH:mm:ss")
-        private LocalTime job2StartEnd;
+        private Integer job2StartEnd;
 
         @ApiModelProperty(value = "工作时段3起始时间")
-        @JsonFormat(pattern = "HH:mm:ss")
-        private LocalTime job3StartTime;
+        private Integer job3StartTime;
 
         @ApiModelProperty(value = "工作时段3结束时间")
-        @JsonFormat(pattern = "HH:mm:ss")
-        private LocalTime job3EndTime;
+        private Integer job3EndTime;
 
         @ApiModelProperty(value = "设置状态")
         private String status;