From d803609b8a2e43afcf5921f42f29ce7f6e68fb84 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期三, 08 十一月 2023 17:02:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/alarm/global/service/IGlobalAlarmService.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/global/service/IGlobalAlarmService.java b/ard-work/src/main/java/com/ruoyi/alarm/global/service/IGlobalAlarmService.java
index ecdb659..91ebeb1 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/global/service/IGlobalAlarmService.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/global/service/IGlobalAlarmService.java
@@ -15,8 +15,10 @@
**/
public interface IGlobalAlarmService {
public List<GlobalAlarmData> selectAlarmLogs(GlobalAlarmCondition condition);
+ public List<GlobalAlarmData> selectAlarmLogsAll();
Object updateAlarmViewTime(GlobalAlarmCondition condition);
public void receiveAlarm(String topic,String message);
public Map<String,Object> selectAlarmLogsCount();
Object selectAlarmList(Integer command, String beginTime, String endTime,Integer pageNum,Integer pageSize);
+ public List<GlobalAlarmData> selectThermalMap(GlobalAlarmCondition condition);
}
--
Gitblit v1.9.3