From 49ed5f218a6695930fac7d3fe71bda1d7f4a611b Mon Sep 17 00:00:00 2001
From: dashixiong <zztect_a1@163.com>
Date: Mon, 16 Feb 2026 14:46:27 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ems/EmsAlarmRecordsController.java        | 17 +++++++++++++++
 .../ems/service/IEmsAlarmRecordsService.java  |  9 ++++++++
 .../impl/EmsAlarmRecordsServiceImpl.java      | 21 +++++++++++++++++++
 3 files changed, 47 insertions(+)

diff --git a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsAlarmRecordsController.java b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsAlarmRecordsController.java
index e3fc301..5ac7ffa 100644
--- a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsAlarmRecordsController.java
+++ b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsAlarmRecordsController.java
@@ -55,4 +55,21 @@ public class EmsAlarmRecordsController extends BaseController
         }
     }
 
+    /**
+     * 关闭告警
+     */
+    @PostMapping("/closeAlarm")
+    public AjaxResult closeAlarm(@RequestBody EmsAlarmRecords emsAlarmRecords)
+    {
+        Long id = emsAlarmRecords.getId();
+        if (id == null) {
+            return error("告警id不能为空");
+        }
+        String result = iEmsAlarmRecordsService.closeAlarm(id, getUserId());
+        if ("success".equals(result) || "告警已关闭".equals(result)) {
+            return AjaxResult.success("操作成功");
+        }
+        return error(result);
+    }
+
 }
diff --git a/ems-system/src/main/java/com/xzzn/ems/service/IEmsAlarmRecordsService.java b/ems-system/src/main/java/com/xzzn/ems/service/IEmsAlarmRecordsService.java
index ba7d36f..c44d15b 100644
--- a/ems-system/src/main/java/com/xzzn/ems/service/IEmsAlarmRecordsService.java
+++ b/ems-system/src/main/java/com/xzzn/ems/service/IEmsAlarmRecordsService.java
@@ -77,6 +77,15 @@ public interface IEmsAlarmRecordsService
      * @return
      */
     public String createTicketNo(Long id, Long userId);
+
+    /**
+     * 关闭告警并设置为已处理
+     *
+     * @param id 告警ID
+     * @param userId 用户ID
+     * @return 处理结果
+     */
+    public String closeAlarm(Long id, Long userId);
     // 订阅失败-增加告警
     public void addSubFailedAlarmRecord(String topic);
     // 订阅成功-处理告警
diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsAlarmRecordsServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsAlarmRecordsServiceImpl.java
index a679c7e..c3a4acd 100644
--- a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsAlarmRecordsServiceImpl.java
+++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsAlarmRecordsServiceImpl.java
@@ -174,6 +174,27 @@ public class EmsAlarmRecordsServiceImpl implements IEmsAlarmRecordsService
         return ticketNo;
     }
 
+    @Override
+    public String closeAlarm(Long id, Long userId) {
+        EmsAlarmRecords emsAlarmRecords = emsAlarmRecordsMapper.selectEmsAlarmRecordsById(id);
+        if (emsAlarmRecords == null) {
+            return "告警记录不存在";
+        }
+        if (AlarmStatus.DONE.getCode().equals(emsAlarmRecords.getStatus())) {
+            return "告警已关闭";
+        }
+        emsAlarmRecords.setStatus(AlarmStatus.DONE.getCode());
+        emsAlarmRecords.setAlarmEndTime(DateUtils.getNowDate());
+        emsAlarmRecords.setUpdateTime(DateUtils.getNowDate());
+        if (userId == null) {
+            userId = 1L;
+        }
+        SysUser user = sysUserMapper.selectUserById(userId);
+        emsAlarmRecords.setUpdateBy(user != null ? user.getUserName() : "system");
+        emsAlarmRecordsMapper.updateEmsAlarmRecords(emsAlarmRecords);
+        return "success";
+    }
+
     // 订阅失败-增加告警
     @Override
     public void addSubFailedAlarmRecord(String topic) {