listHome接口修改

business-service/src/main/java/com/ozs/service/entity/MsgAlarm.java

@@ -278,4 +278,8 @@ public class MsgAlarm extends BaseEntity implements Serializable {
     @TableField(exist = false)
     private String cameraSn;
 
+
+    @TableField(exist = false)
+    private Integer unlockNum;
+
 }

business-service/src/main/java/com/ozs/service/service/impl/MsgAlarmServiceImpl.java

@@ -247,10 +247,18 @@ public class MsgAlarmServiceImpl extends ServiceImpl<MsgAlarmMapper, MsgAlarm> i
 
         // 创建返回结果的 map
         Map<String, Integer> results = new HashMap<>();
-        results.put("highAlarmCount", statistics.get("highAlarmCount"));
-        results.put("puAlarmCount", statistics.get("puAlarmCount"));
-        results.put("highUnresolvedCount", statistics.get("highUnresolvedCount"));
-        results.put("puUnresolvedCount", statistics.get("puUnresolvedCount"));
+        if (statistics != null) {
+            results.put("highAlarmCount", statistics.get("highAlarmCount"));
+            results.put("puAlarmCount", statistics.get("puAlarmCount"));
+            results.put("highUnresolvedCount", statistics.get("highUnresolvedCount"));
+            results.put("puUnresolvedCount", statistics.get("puUnresolvedCount"));
+        } else {
+            // 处理statistics为空的情况，设置默认值或空值
+            results.put("highAlarmCount", 0);
+            results.put("puAlarmCount", 0);
+            results.put("highUnresolvedCount", 0);
+            results.put("puUnresolvedCount", 0);
+        }
 
         return AjaxResult.success(results);
     }

business-service/src/main/resources/mapper/service/MsgAlarmMapper.xml

@@ -306,7 +306,8 @@
         a.released_time AS releasedTime,
         a.released_type AS releasedType,
         a.released_reason AS releasedReason,
-        a.remark AS remark
+        a.remark AS remark,
+        COUNT(CASE WHEN a.is_lock = 2 THEN 1 END) OVER() AS unlockNum
         FROM msg_alarm AS a
             join base_camera_management AS b on a.camera_code=b.camera_code
             join base_railway_management AS l on b.railway_code=l.railway_code

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/MsgAlarmController.java

@@ -40,6 +40,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.util.*;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
 /**