From 6992aaf0587c09f7c511c1afd12e1519d91363d3 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 14 Dec 2023 15:38:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-api/src/main/java/com/moral/api/service/AlarmInfoService.java | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/AlarmInfoService.java b/screen-api/src/main/java/com/moral/api/service/AlarmInfoService.java
index 5519cf2..3f3e335 100644
--- a/screen-api/src/main/java/com/moral/api/service/AlarmInfoService.java
+++ b/screen-api/src/main/java/com/moral/api/service/AlarmInfoService.java
@@ -26,6 +26,15 @@
Map<String,Object> getDataByCondition(Map<String, Object> parameters);
/**
+ *@Description: ������������������������������������������
+ *@Param: [parameters]
+ *@return: java.util.Map<java.lang.String,java.lang.Object>
+ *@Author: lizijie
+ *@Date: 2021/12/24 13:24
+ **/
+ Map<String,Object> getDataByConditionWithoutPage(Map<String, Object> parameters);
+
+ /**
*@Description: ������������������
*@Param: [parameters]
*@return: java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
@@ -33,5 +42,14 @@
*@Date: 2021/11/12 9:47
**/
Map<String, Object> alarmReminder(Map<String,Object> parameters);
+
+ /**
+ *@Description: ������������������������������������
+ *@Param: [parameters]
+ *@return: java.util.Map<java.lang.String,java.lang.Object>
+ *@Author: lizijie
+ *@Date: 2022/1/4 14:49
+ **/
+ Map<String, Object> alarmReminderByMonitorPointIds(Map<String, Object> parameters);
}
--
Gitblit v1.8.0