代码修改

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

@@ -1,6 +1,7 @@
 package com.ozs.service.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 
 import java.time.LocalDateTime;
@@ -99,4 +100,10 @@ public class MsgAlarmFrequency extends BaseEntity implements Serializable {
      * 备注
      */
     private String remark;
+
+    /**
+     * 报警是否解除 1已解除2未解除
+     */
+    @TableField(exist = false)
+    private Integer isLock;
 }

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

@@ -454,11 +454,30 @@ public class MsgAlarmController extends BaseController {
     @ApiOperation("报警消息详情历史报警次数信息")
     @Log(title = "报警信息管理", businessType = BusinessType.SELECT)
     public AjaxResult alarmHistoricalAlarm(@PathVariable String alarmId) {
+        QueryWrapper<MsgAlarm> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("alarm_id", alarmId);
+        MsgAlarm one = msgAlarmService.getOne(queryWrapper);
+        if (ObjectUtils.isEmpty(one)){
+            return error("报警表没有此报警唯一标识的报警数据"); 
+        }
         QueryWrapper<MsgAlarmFrequency> wrapper = new QueryWrapper<>();
         wrapper.eq("alarm_id", alarmId);
         wrapper.orderByDesc("alarm_time");
         List<MsgAlarmFrequency> list = msgAlarmFrequencyService.list(wrapper);
-        return AjaxResult.success(list);
+        if (list.size()>0) {
+            if (one.getIsLock() == 1) {
+                for (int i = 0; i < list.size(); i++) {
+                    if (i == 0) {
+                        list.get(i).setIsLock(1);
+                    } else {
+                        list.get(i).setIsLock(2);
+                    }
+                }
+            }
+            return AjaxResult.success(list);
+        }else {
+            return error("报警频次表没有此报警唯一标识的报警数据");
+        }
     }
 
     @GetMapping(value = "/videoHistoricalAlarm/{cameraCode}")