设备断电

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) {
@@ -158,6 +161,7 @@ public class MercMiniDeviceController {
 
                 Integer deviceStateL = deviceStatus.getLockStateL();
                 Integer deviceStateR = deviceStatus.getLockStateR();
+                vo.setSysPower(deviceStatus.getSysPower());
                 vo.setDeviceStateL(deviceStateL);
                 vo.setDeviceStateR(deviceStateR);
                 DeviceLockState deviceLockStateL = DeviceLockState.getEnumByCode(deviceStateL);
@@ -182,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());

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

@@ -278,6 +278,11 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         if (deviceInfo == null) {
             return R.fail("设备不存在");
         }
+        Integer busyState = deviceInfo.getBusyState();
+        SysDictRedis sdr = SysDictUtils.get(EnumDeviceBusyStatus.Code.CODE.getCode(), EnumDeviceBusyStatus.N_2.getCode());
+        if (busyState.intValue() == Integer.valueOf(sdr.getValue()).intValue()) {
+            return R.fail("设备已停运");
+        }
         DeviceStatusDto.Vo deviceStatus = deviceInfo.getDeviceStatus();
         SysDictRedis sysDictRedis = SysDictUtils.get(EnumDeviceFaultLevelPayThreshold.Code.CODE.getCode(), EnumDeviceFaultLevelPayThreshold.NOT_PAY.getCode());
         if (deviceInfo.getFaultLevel() >= Integer.valueOf(sysDictRedis.getValue())) {
@@ -895,6 +900,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
                     device.setTempValue(deviceStatus.getTempValue());
                     device.setDeviceStateL(deviceStateL);
                     device.setDeviceStateR(deviceStateR);
+                    device.setSysPower(deviceStatus.getSysPower());
                     DeviceLockState deviceLockStateL = DeviceLockState.getEnumByCode(deviceStateL);
                     DeviceLockState deviceLockStateR = DeviceLockState.getEnumByCode(deviceStateR);
                     device.setDeviceStateRName(deviceLockStateR == null ? "未知" : deviceLockStateR.getDescription());

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

@@ -298,6 +298,9 @@ public class DeviceInfoDto {
     @Accessors(chain = true)
     public static class Vo {
 
+        @ApiModelProperty("通电状态")
+        private Integer sysPower;
+
         @ApiModelProperty("左门锁机状态名称")
         private String deviceStateLName;
 
@@ -414,6 +417,10 @@ public class DeviceInfoDto {
 
         @ApiModelProperty("温度设置信息")
         private TempSetInfo tempSetInfo;
+
+        @ApiModelProperty("工作温度设置值")
+        private Integer jobTempSetValue;
+
     }
 
     @Data
@@ -825,6 +832,9 @@ public class DeviceInfoDto {
         @ApiModelProperty("右门锁机状态，字典类型：devcie_lock_status")
         private Integer deviceStateR;
 
+        @ApiModelProperty("通电状态")
+        private Integer sysPower;
+
     }