From e8401b85ea303e7cb87062dfa918cb59071befb3 Mon Sep 17 00:00:00 2001
From: VVT789 <sdxt_0802@163.com>
Date: 星期五, 18 四月 2025 12:40:02 +0800
Subject: [PATCH] 报警代码优化

---
 zhitan-system/src/main/java/com/zhitan/alarm/mapper/HistoryAlarmMapper.java |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/zhitan-system/src/main/java/com/zhitan/alarm/mapper/HistoryAlarmMapper.java b/zhitan-system/src/main/java/com/zhitan/alarm/mapper/HistoryAlarmMapper.java
index ab16fbd..b0a16c3 100644
--- a/zhitan-system/src/main/java/com/zhitan/alarm/mapper/HistoryAlarmMapper.java
+++ b/zhitan-system/src/main/java/com/zhitan/alarm/mapper/HistoryAlarmMapper.java
@@ -7,6 +7,7 @@
 import com.zhitan.alarm.domain.JkHistoryAlarm;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -35,10 +36,15 @@
    */
   List<JkHistoryAlarm> selectHistoryAlarmNoteList(JkHistoryAlarm jkHistoryAlarm);
 
-  void updateHistoryAlarm(@Param("alarmCode") String alarmCode,
-      @Param("historyAlarm") HistoryAlarm historyAlarm);
+  void updateHistoryAlarm(@Param("alarmCode") String alarmCode, @Param("historyAlarm") HistoryAlarm historyAlarm);
 
   Page<JkHistoryAlarm> selectJkHistoryAlarmPage(@Param("jkHistoryAlarm") JkHistoryAlarm jkHistoryAlarm,@Param("page")Page<?> page);
 
-  Integer selectCountByTime(@Param("beginTime") DateTime beginTime, @Param("endTime") DateTime endTime);
+  Integer selectCountByTime(@Param("beginTime") DateTime beginTime,
+                            @Param("endTime") DateTime endTime,
+                            @Param("nodeIdList") List<String> nodeIdList);
+
+    List<JkHistoryAlarm> getHistoryAlarmList(@Param("indexIdList") List<String> indexIdList,
+                                             @Param("beginTime") Date beginTime,
+                                             @Param("endTime")Date endTime);
 }

--
Gitblit v1.9.3