From 12ea7330bac0a43818b8ec3a8601119dd609dfb9 Mon Sep 17 00:00:00 2001
From: ustcyc <yincun@163.com>
Date: 星期五, 18 四月 2025 22:43:12 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/zhitan-cloud/zhitan-ems
---
zhitan-system/src/main/java/com/zhitan/alarm/mapper/HistoryAlarmMapper.java | 45 ++++++++++++++++++++++++++-------------------
1 files changed, 26 insertions(+), 19 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..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
@@ -7,6 +7,7 @@
import com.zhitan.alarm.domain.JkHistoryAlarm;
import org.apache.ibatis.annotations.Param;
+import java.util.Date;
import java.util.List;
/**
@@ -17,28 +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);
+ Integer selectCountByTime(@Param("beginTime") DateTime beginTime,
+ @Param("endTime") DateTime endTime,
+ @Param("indexIdList") List<String> indexIdList);
+
+ Page<JkHistoryAlarm> getHistoryAlarmList(@Param("beginTime") Date beginTime,
+ @Param("endTime") Date endTime,
+ @Param("indexIdList") List<String> indexIdList,
+ Page<JkHistoryAlarm> pageInfo);
}
--
Gitblit v1.9.3