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

---
 zhitan-system/src/main/java/com/zhitan/alarm/mapper/HistoryAlarmMapper.java |   47 ++++++++++++++++++++++++-----------------------
 1 files changed, 24 insertions(+), 23 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 b0a16c3..719be0b 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
@@ -18,33 +18,34 @@
  */
 public interface HistoryAlarmMapper {
 
-  /**
-   * 鑾峰彇鍘嗗彶鎶ヨ闆嗗悎
-   *
-   * @param jkHistoryAlarm 鎶ヨ鍙傛暟
-   * @return 棰勬姤璀﹁缃泦鍚�
-   */
-  List<JkHistoryAlarm> selectJkHistoryAlarmList(JkHistoryAlarm jkHistoryAlarm);
+    /**
+     * 鑾峰彇鍘嗗彶鎶ヨ闆嗗悎
+     *
+     * @param jkHistoryAlarm 鎶ヨ鍙傛暟
+     * @return 棰勬姤璀﹁缃泦鍚�
+     */
+    List<JkHistoryAlarm> selectJkHistoryAlarmList(JkHistoryAlarm jkHistoryAlarm);
 
-  List<JkHistoryAlarm> selectJkHistoryAlarmListExcel(JkHistoryAlarm jkHistoryAlarm);
+    List<JkHistoryAlarm> selectJkHistoryAlarmListExcel(JkHistoryAlarm jkHistoryAlarm);
 
-  /**
-   * 瀹炴椂妫�娴� 鍔熻兘 鐨勫 sheet椤�  灞曠ず 缁勬�佸浘  娴嬬偣 鎶ヨ淇℃伅
-   *
-   * @param jkHistoryAlarm
-   * @return
-   */
-  List<JkHistoryAlarm> selectHistoryAlarmNoteList(JkHistoryAlarm jkHistoryAlarm);
+    /**
+     * 瀹炴椂妫�娴� 鍔熻兘 鐨勫 sheet椤�  灞曠ず 缁勬�佸浘  娴嬬偣 鎶ヨ淇℃伅
+     *
+     * @param jkHistoryAlarm
+     * @return
+     */
+    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);
+    Page<JkHistoryAlarm> selectJkHistoryAlarmPage(@Param("jkHistoryAlarm") JkHistoryAlarm jkHistoryAlarm, @Param("page") Page<?> page);
 
-  Integer selectCountByTime(@Param("beginTime") DateTime beginTime,
-                            @Param("endTime") DateTime endTime,
-                            @Param("nodeIdList") List<String> nodeIdList);
+    Integer selectCountByTime(@Param("beginTime") DateTime beginTime,
+                              @Param("endTime") DateTime endTime,
+                              @Param("indexIdList") List<String> indexIdList);
 
-    List<JkHistoryAlarm> getHistoryAlarmList(@Param("indexIdList") List<String> indexIdList,
-                                             @Param("beginTime") Date beginTime,
-                                             @Param("endTime")Date endTime);
+    Page<JkHistoryAlarm> getHistoryAlarmList(@Param("beginTime") Date beginTime,
+                                             @Param("endTime") Date endTime,
+                                             @Param("indexIdList") List<String> indexIdList,
+                                             Page<JkHistoryAlarm> pageInfo);
 }

--
Gitblit v1.9.3