Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165

service-backend/service-backend-api/src/main/java/com/usky/backend/domain/DataTVStatisticResponseVO.java

@@ -10,6 +10,11 @@ public class DataTVStatisticResponseVO implements Serializable {
     //告警数
     private Integer alarmNum;
 
+    /**
+     * 故障数
+     */
+    private Integer faultNum;
+
     //离线数
     private Integer offlineNum;
 

service-iot/service-iot-biz/src/main/java/com/usky/iot/mapper/DmpDeviceInfoMapper.java

@@ -31,6 +31,8 @@ public interface DmpDeviceInfoMapper extends CrudMapper<DmpDeviceInfo> {
 
     Integer baseAlarmCount(@Param("deviceIdList") List<String> deviceIdList);
 
+    Integer baseFaultCount(@Param("deviceIdList") List<String> deviceIdList);
+
     Integer deviceOfflineCount(@Param("deviceIdList") List<String> deviceIdList);
 
     List<BaseAlarm> baseAlarmList(@Param("deviceIdList") List<String> deviceIdList);

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/DmpDeviceInfoServiceImpl.java

@@ -696,9 +696,11 @@ public class DmpDeviceInfoServiceImpl extends AbstractCrudService<DmpDeviceInfoM
                 deviceIdList.add(list1.get(i).getDeviceId());
             }
             Integer alarmCount = baseMapper.baseAlarmCount(deviceIdList);
+            Integer faultCount = baseMapper.baseFaultCount(deviceIdList);
             Integer offlineCount = baseMapper.deviceOfflineCount(deviceIdList);
             DataTVStatisticResponseVO responseVO = new DataTVStatisticResponseVO();
             responseVO.setAlarmNum(alarmCount);
+            responseVO.setFaultNum(faultCount);
             responseVO.setOfflineNum(offlineCount);
             list.add(responseVO);
         }

service-iot/service-iot-biz/src/main/resources/mapper/iot/DmpDeviceInfoMapper.xml

@@ -85,7 +85,22 @@
                 </foreach>
             </if>
             <if test="1 == 1">
-                and handle_status = 0
+                and handle_status = 0 and alarm_type != '815'
+            </if>
+        </where>
+    </select>
+    <select id="baseFaultCount" resultType="integer">
+        select count(*)
+        from base_alarm
+        <where>
+            <if test="deviceIdList != null and deviceIdList.size() > 0">
+                and device_id in
+                <foreach item="item" collection="deviceIdList" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="1 == 1">
+                and handle_status = 0 and alarm_type = '815'
             </if>
         </where>
     </select>