bug

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/dao/mysql/KwsAlarmMapper.java

@@ -27,6 +27,8 @@ public interface KwsAlarmMapper extends BaseMapper<KwsAlarm> {
 
     List<Map<String, Long>> selectByDevicesId(@Param("devicesId") List<Long> devicesId);
 
+    List<Map<String, Object>> selectDataByDevicesId(@Param("devicesId") List<Long> devicesId);
+
     /**
      * 统计
      *

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/model/param/DeviceAdd.java

@@ -77,7 +77,6 @@ public class DeviceAdd {
     /**
      * 备注
      */
-    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String remark;
 
     /**

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/service/DeviceService.java

@@ -152,6 +152,7 @@ public class DeviceService {
         }
         List<Long> devicesId = list.stream().map(DeviceVo::getId).toList();
         List<Map<String, Long>> alarmData = alarmMapper.selectByDevicesId(devicesId);
+        List<Map<String, Object>> dataError = alarmMapper.selectDataByDevicesId(devicesId);
 
         Map<String, SystemDict> deviceType = commonService.getDictList(null, new HashMap<>() {{
             put("code", DictEnum.DEVICE_TYPE.getCodeType());
@@ -165,16 +166,27 @@ public class DeviceService {
 
         for (DeviceVo vo : list) {
             vo.setStatusText(DeviceEnum.getName(vo.getStatus()));
+            vo.setDeviceErrorCount(0L);
+            vo.setDataErrorCount(0L);
             if (!CollectionUtils.isEmpty(alarmData)) {
                 for (int i = 0; i < alarmData.size(); i++) {
                     Map<String, Long> map = alarmData.get(i);
                     if (map.get("device_id").toString().equals(vo.getId().toString())) {
-                        vo.setDataErrorCount(map.get("count"));
-                        vo.setDeviceErrorCount(map.get("count"));
+                        //vo.setDataErrorCount(map.get("count"));
+                        String count = map.get("count").toString();
+                        vo.setDeviceErrorCount(Long.parseLong(count));
+                    }
+                }
+            }
+            if (!CollectionUtils.isEmpty(dataError)) {
+                for (int i = 0; i < dataError.size(); i++) {
+                    Map<String, Object> map = dataError.get(i);
+                    if (map.get("device_id").toString().equals(vo.getId().toString())) {
+                        String count = map.get("count").toString();
+
+                        vo.setDataErrorCount(Long.parseLong(count));
+                        //vo.setDeviceErrorCount(map.get("count"));
                     }
-                    /*if(map.get("pid").toString().equals(vo.getId().toString()) && map.get("type").toString().equals(AlarmTypeEnum.ALARM_TWO.getCode())){
-                        vo.setDeviceErrorCount(map.get("count"));
-                    }*/
                 }
             }
             if(Objects.nonNull(vo.getDeviceType())){

slope-modules/slope-detection/src/main/resources/mapper/mysql/KwsAlarmMapper.xml

@@ -49,16 +49,35 @@
         select count(d.id) as count,a.device_id,type
         from kws_alarm as a inner join kws_alarm_detail as d
         on a.id=d.alarm_id
-        where 1 = 1
+        where a.type = 1
+        and a.del_flag = 0
         <if test="devicesId != null and devicesId.size() > 0">
             AND device_id IN
             <foreach collection="devicesId" open="(" close=")" item="item" separator=",">
                 #{item}
             </foreach>
+            AND d.pid IN
+            <foreach collection="devicesId" open="(" close=")" item="item" separator=",">
+                #{item}
+            </foreach>
         </if>
         group by device_id, type
     </select>
 
+    <select id="selectDataByDevicesId" parameterType="java.lang.String" resultType="java.util.Map">
+        <!--@mbg.generated-->
+        select sum(trigger_times) as count,a.device_id,type
+        from kws_alarm as a
+        where a.del_flag = 0
+        <if test="devicesId != null and devicesId.size() > 0">
+            AND device_id IN
+            <foreach collection="devicesId" open="(" close=")" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        group by device_id
+    </select>
+
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
         <!--@mbg.generated-->
         delete