Browse Source

更改温度字段名

hechunping 1 năm trước cách đây
mục cha
commit
7ca9c55098

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

@@ -76,7 +76,7 @@ public class DeviceTempSet {
      * 工作时段1结束时间
      */
     @ApiModelProperty(value = "工作时段1结束时间")
-    private Integer job1StartEnd;
+    private Integer job1EndTime;
 
     /**
      * 工作时段2起始时间
@@ -88,7 +88,7 @@ public class DeviceTempSet {
      * 工作时段2结束时间
      */
     @ApiModelProperty(value = "工作时段2结束时间")
-    private Integer job2StartEnd;
+    private Integer job2EndTime;
 
     /**
      * 工作时段3起始时间

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

@@ -36,9 +36,9 @@ public class SetsCmdServiceImpl implements CmdService {
                         .setWorkMode(data.getStr("workModel"))
                         .setTempValue(data.getInt("target"))
                         .setJob1StartTime(data.getInt("start1"))
-                        .setJob1StartEnd(data.getInt("end1"))
+                        .setJob1EndTime(data.getInt("end1"))
                         .setJob2StartTime(data.getInt("start2"))
-                        .setJob2StartEnd(data.getInt("end2"))
+                        .setJob2EndTime(data.getInt("end2"))
                         .setJob3StartTime(data.getInt("start3"))
                         .setJob3EndTime(data.getInt("end3"));
                 String warningLow = data.getStr("warningLow");

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

@@ -56,13 +56,13 @@ public class DeviceTempSetDto {
         private Integer job1StartTime;
 
         @ApiModelProperty(value = "工作时段1结束时间")
-        private Integer job1StartEnd;
+        private Integer job1EndTime;
 
         @ApiModelProperty(value = "工作时段2起始时间")
         private Integer job2StartTime;
 
         @ApiModelProperty(value = "工作时段2结束时间")
-        private Integer job2StartEnd;
+        private Integer job2EndTime;
 
         @ApiModelProperty(value = "工作时段3起始时间")
         private Integer job3StartTime;
@@ -114,19 +114,13 @@ public class DeviceTempSetDto {
         private Integer job1StartTime;
 
         @ApiModelProperty(value = "工作时段1结束时间")
-        private Integer job1StartEnd;
+        private Integer job1EndTime;
 
         @ApiModelProperty(value = "工作时段2起始时间")
         private Integer job2StartTime;
 
         @ApiModelProperty(value = "工作时段2结束时间")
-        private Integer job2StartEnd;
-
-        @ApiModelProperty(value = "工作时段3起始时间")
-        private Integer job3StartTime;
-
-        @ApiModelProperty(value = "工作时段3结束时间")
-        private Integer job3EndTime;
+        private Integer job2EndTime;
 
         @ApiModelProperty(value = "设置状态")
         private String status;