设备健康状况接口

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

@@ -117,7 +117,6 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
             return R.fail("设备不存在");
         }
         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())) {

device-api-service/src/main/resources/mapper/DeviceInfoMapper.xml

@@ -63,7 +63,8 @@
             <result column="memery_remain_space" property="memeryRemainSpace" />
             <result column="camera_l_main_state" property="cameraLMainState" />
             <result column="camera_l_second_state" property="cameraLSecondState" />
-            <result column="device_state" property="deviceState" />
+            <result column="device_state_l" property="deviceStateL" />
+            <result column="device_state_r" property="deviceStateR" />
             <result column="update_time" property="updateTime" />
         </association>
         <association property="deviceRegister" javaType="com.xy.dto.DeviceRegisterDto$Vo">

device-api-service/src/main/resources/mapper/DeviceStatusMapper.xml

@@ -6,12 +6,12 @@
     <select id="statusCount" resultType="com.xy.mapper.entity.DeviceStatusCount">
         select
         (select count(*) device_count from device_info) deviceCount,
-        (select count(*) busy_state from device_info where busy_state = 1) busyState,
-        (select count(*) net_state from device_status where net_state = 0) netState,
-        (select count(*) device_state from device_status where device_state = 1) deviceState,
-        (select count(*) active_state from device_info where active_state = 1) activeState,
+        (select count(*) busy_state from device_info where busy_state = 2) busyState,
+        (select count(*) net_state from device_status where net_state = 1) netState,
+        (select count(*) device_state from device_status where device_state_l = 2 and device_state_r = 2) deviceState,
+        (select count(*) active_state from device_info where active_state = 2) activeState,
 
-        (select count(*) temp_state from device_status where temp_state = 1) tempState
+        (select count(*) temp_state from device_status where temp_state = 2) tempState
         from dual
     </select>