From cd2cfd37366002f790a2ed1435962d4eff7d5cec Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 01 Jun 2021 09:39:30 +0800
Subject: [PATCH] 版本合并

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/IAlarmService.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/IAlarmService.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/IAlarmService.java
index eb9fa7a..918cc02 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/IAlarmService.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/IAlarmService.java
@@ -88,7 +88,7 @@
 
 	List<AlarmVO> getAlarm(AlarmVO alarmVO);
 
-	List<Map<String, Object>> getAlarming(AlarmVO alarmVO);
+	List<AlarmVO> getAlarming(AlarmVO alarmVO);
 
 	boolean setAlarm(AlarmVO alarmVO);
 
@@ -141,4 +141,10 @@
 	 */
 	List<ReportReturnData> getAlarmPie(AlarmVO alarmVO);
 
+	/**
+	 * 查询未处理及处理中的警情总数量
+	 * @param deviceNumber 设备编号
+	 * @return
+	 */
+	Integer selectEqCount(String deviceNumber);
 }

--
Gitblit v1.9.3