From dae6e068207ad1bff32dafd8c71f12d8a2a59aa2 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期一, 15 四月 2024 16:21:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/java/com/ruoyi/alarm/global/service/IGlobalAlarmService.java | 4 +++-
1 files changed, 3 insertions(+), 1 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..aade189 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);
+ Object selectAlarmList(String name,Integer command, String beginTime, String endTime,Integer pageNum,Integer pageSize);
+ public List<GlobalAlarmData> selectThermalMap(GlobalAlarmCondition condition);
}
--
Gitblit v1.9.3