Browse Source

工作温度设置,设备详情返回

谭斌 1 year ago
parent
commit
37d3e4dacd

+ 6 - 2
device-api-service-merc-mini/src/main/java/com/xy/controller/MercMiniDeviceController.java

@@ -80,6 +80,9 @@ public class MercMiniDeviceController {
 
     private final DeviceConfigServiceImpl deviceConfigService;
 
+    private final DeviceTempSetServiceImpl deviceTempSetService;
+
+
     @ApiOperation("设备列表带卡包数")
     @PostMapping("algorithmChargingDevice")
     public R<PageBean<DeviceInfoDto.AlgorithmChargingVo>> algorithmChargingDevice(@RequestBody @Validated DeviceInfoDto.AlgorithmCharging algorithmCharging) {
@@ -183,8 +186,9 @@ public class MercMiniDeviceController {
                     vo.setDeviceStatus(deviceStatus);
                 }
             }
-
-
+            //工作温度设置
+            DeviceTempSetDto.Vo lastTempset = R.feignCheckData(deviceTempSetService.getLastOne(new DeviceTempSetDto.GetLastOneDto().setDeviceId(vo.getDeviceId())));
+            vo.setJobTempSetValue(lastTempset == null ? null : lastTempset.getTempValue());
         }
 
         DeviceConfig deviceConfig = deviceConfigService.getById(obj.getDeviceId());

+ 5 - 1
device-api/src/main/java/com/xy/dto/DeviceInfoDto.java

@@ -300,7 +300,7 @@ public class DeviceInfoDto {
 
         @ApiModelProperty("通电状态")
         private Integer sysPower;
-        
+
         @ApiModelProperty("左门锁机状态名称")
         private String deviceStateLName;
 
@@ -417,6 +417,10 @@ public class DeviceInfoDto {
 
         @ApiModelProperty("温度设置信息")
         private TempSetInfo tempSetInfo;
+
+        @ApiModelProperty("工作温度设置值")
+        private Integer jobTempSetValue;
+ 
     }
 
     @Data