listHome接口修改

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

@@ -142,7 +142,6 @@ public class MsgAlarmController extends BaseController {
     @PostMapping("/listHome")
     @Log(title = "首页", businessType = BusinessType.SELECT)
     public AjaxResult selectMsgAlarmHome(@RequestBody MsgAlarmVo msgAlarmVo) {
-        AtomicReference<Integer> count = new AtomicReference<>(0);
         msgAlarmVo = (MsgAlarmVo) dataScoreUtil.setDataScore(getUserId(), msgAlarmVo);
         if (!ObjectUtils.isEmpty(msgAlarmVo.getAlarmMile())) {
             msgAlarmVo.setAlarmMile(msgAlarmVo.getAlarmMile() * 1000);
@@ -200,10 +199,6 @@ public class MsgAlarmController extends BaseController {
                         "泥石流范围为左上角坐标(" + split1[2] + "," + split1[3] + ")" +
                         "大小" + split1[4] + "×" + split1[5];
                 o.setAlarmAttr(stringBuilder);
-                if (o.getIsLock() == 2) {
-                    count.getAndSet(count.get() + 1);
-                }
-                o.setUnlockNum(count.get());
                 return o;
             }).collect(Collectors.toList());
             page.setRecords(dto1);