设备健康状况接口

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

@@ -147,9 +147,14 @@ public class DeviceStatus {
     private Integer cameraRSecondState;
 
     /**
-     * 锁机状态
+     * 左门锁机状态
      */
-    private Integer deviceState;
+    private Integer deviceStateL;
+
+    /**
+     * 右门锁机状态
+     */
+    private Integer deviceStateR;
 
     /**
      * 更新时间

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

@@ -17,6 +17,7 @@ import com.xy.mapper.DeviceInfoMapper;
 import com.xy.mapper.entity.DeviceInfoQueryPage;
 import com.xy.utils.*;
 import com.xy.utils.enums.DictEnum;
+import com.xy.utils.enums.DictSonEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -118,8 +119,12 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         DeviceStatusDto.Vo deviceStatus = deviceInfo.getDeviceStatus();
         check(deviceInfo.getBusyState(), 2, "设备已停运");
         check(deviceInfo.getFreezeStatus(), 2, "设备已冻结");
+        SysDictRedis sysDictRedis = SysDictUtils.get(DictEnum.DEVICE_FAULT_LEVEL_PAY_THRESHOLD.getKey(), DictSonEnum.DEVICE_FAULT_LEVEL_PAY_THRESHOLD_NOT_PAY.getKey());
+        if (deviceInfo.getFaultLevel() >= Integer.valueOf(sysDictRedis.getValue())) {
+            return R.fail("设备故障");
+        }
         check(deviceStatus.getNetState(), 2, "设备已离线");
-        check(deviceStatus.getDeviceState(), 2, "设备已锁机");
+        check(obj.getIsTwoDoor() != null && obj.getIsTwoDoor() ? deviceStatus.getDeviceStateR() : deviceStatus.getDeviceStateL(), 2, "设备已锁机");
         return R.ok();
     }
 

device-api-service/src/main/java/com/xy/utils/enums/DictEnum.java

@@ -19,6 +19,8 @@ public enum DictEnum {
 
     MQTT_CMD_TEMPLET_QUALITY("mqtt_cmd_templet_quality", "mqtt指令-指令模板-质检"),
 
+    DEVICE_FAULT_LEVEL_PAY_THRESHOLD("device_fault_level_pay_threshold", "设备-故障等级-阈值"),
+
     ;
 
     private String key;

device-api-service/src/main/java/com/xy/utils/enums/DictSonEnum.java

@@ -20,6 +20,8 @@ public enum DictSonEnum {
 
     DEVICE_FACTORY_STATUS_CAN_SHIPPED("can_shipped", "设备质检-出厂状态-可出厂"),
 
+    DEVICE_FAULT_LEVEL_PAY_THRESHOLD_NOT_PAY("not_pay", "设备-故障等级-阈值-无法交易"),
+
     ;
 
     private String key;

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

@@ -21,6 +21,9 @@ public class DeviceInfoDto {
 
         @ApiModelProperty("设备id")
         private Long deviceId;
+
+        @ApiModelProperty("是否是2号门")
+        private Boolean isTwoDoor;
     }
 
     @Data

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

@@ -115,8 +115,11 @@ public class DeviceStatusDto {
         @ApiModelProperty("右柜副摄像头状态")
         private Integer cameraRSecondState;
 
-        @ApiModelProperty("锁机状态")
-        private Integer deviceState;
+        @ApiModelProperty("左门锁机状态")
+        private Integer deviceStateL;
+
+        @ApiModelProperty("右门锁机状态")
+        private Integer deviceStateR;
 
         @ApiModelProperty("更新时间")
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")