Merge branch 'master' into test

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

@@ -51,9 +51,21 @@ public class DeviceTempSet {
     /**
      * 目标温度
      */
-    @ApiModelProperty(value = "目标温度")
+    @ApiModelProperty(value = "目标温度1")
     private Integer tempValue;
 
+    /**
+     * 目标温度
+     */
+    @ApiModelProperty(value = "目标温度2")
+    private Integer tempValue2;
+
+    /**
+     * 目标温度
+     */
+    @ApiModelProperty(value = "目标温度3")
+    private Integer tempValue3;
+
     /**
      * 工作时段1起始时间
      */
@@ -64,7 +76,7 @@ public class DeviceTempSet {
      * 工作时段1结束时间
      */
     @ApiModelProperty(value = "工作时段1结束时间")
-    private Integer job1StartEnd;
+    private Integer job1EndTime;
 
     /**
      * 工作时段2起始时间
@@ -76,7 +88,7 @@ public class DeviceTempSet {
      * 工作时段2结束时间
      */
     @ApiModelProperty(value = "工作时段2结束时间")
-    private Integer job2StartEnd;
+    private Integer job2EndTime;
 
     /**
      * 工作时段3起始时间

device-api-service/src/main/java/com/xy/service/DeviceTempSetServiceImpl.java

@@ -1,6 +1,5 @@
 package com.xy.service;
 
-import cn.hutool.core.lang.Console;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xy.dto.DeviceTempSetDto;
@@ -33,23 +32,22 @@ public class DeviceTempSetServiceImpl extends ServiceImpl<DeviceTempSetMapper, D
     @ApiOperation("新增")
     @PostMapping("save")
     public R save(@RequestBody DeviceTempSetDto.Save dto) {
-        DeviceTempSet save = copy(DeviceTempSet.class,dto);
+        DeviceTempSet save = copy(DeviceTempSet.class, dto);
         save.setStatus(DeviceTempSetStatusEnum.SETTING.getCode());
         save(save);
-        Console.log(save.getId());
         return R.ok();
     }
 
     @ApiOperation("获取最新一条记录")
     @PostMapping("getLastOne")
-    public R<DeviceTempSetDto.Vo> getLastOne(@RequestBody DeviceTempSetDto.GetLastOneDto dto){
-        LambdaQueryWrapper lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(dto,DeviceTempSet.class)
+    public R<DeviceTempSetDto.Vo> getLastOne(@RequestBody DeviceTempSetDto.GetLastOneDto dto) {
+        LambdaQueryWrapper lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(dto, DeviceTempSet.class)
                 .build()
                 .orderByDesc(DeviceTempSet::getId)
                 .last("limit 1");
         DeviceTempSet tempSet = getOne(lambdaQueryWrapper);
-        if(Emptys.check(tempSet)){
-            return R.ok(copy(DeviceTempSetDto.Vo.class,tempSet));
+        if (Emptys.check(tempSet)) {
+            return R.ok(copy(DeviceTempSetDto.Vo.class, tempSet));
         }
         return R.ok();
     }

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");

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

@@ -43,20 +43,26 @@ public class DeviceTempSetDto {
         @ApiModelProperty(value = "最高温度报警")
         private Integer warningHigh;
 
-        @ApiModelProperty(value = "目标温度")
+        @ApiModelProperty(value = "目标温度1")
         private Integer tempValue;
 
+        @ApiModelProperty(value = "目标温度2")
+        private Integer tempValue2;
+
+        @ApiModelProperty(value = "目标温度3")
+        private Integer tempValue3;
+
         @ApiModelProperty(value = "工作时段1起始时间")
         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;
@@ -95,20 +101,26 @@ public class DeviceTempSetDto {
         @ApiModelProperty(value = "最高温度报警")
         private Integer warningHigh;
 
-        @ApiModelProperty(value = "目标温度")
+        @ApiModelProperty(value = "目标温度1")
         private Integer tempValue;
 
+        @ApiModelProperty(value = "目标温度2")
+        private Integer tempValue2;
+
+        @ApiModelProperty(value = "目标温度3")
+        private Integer tempValue3;
+
         @ApiModelProperty(value = "工作时段1起始时间")
         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;