From 49c12cd602a111eb417f3024b9ed965bcb0f69fc Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 11 May 2021 15:54:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/IAlarmService.java |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 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 91f1a58..5081805 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
@@ -23,6 +23,7 @@
 import org.springblade.common.entity.AlarmExcel;
 import org.springblade.jfpt.alarm.vo.AlarmVO;
 import org.springblade.jfpt.parcel.vo.ConditionVo;
+import org.springblade.system.user.entity.User;
 
 import java.util.List;
 import java.util.Map;
@@ -79,11 +80,17 @@
 	 */
 	List<Map<String,Object>> selectAlarmSum(ConditionVo conditionVo);
 
-	List<Map<String, Object>> queryPolice();
+	List<User> queryPolice();
 
-	List<Map<String, Object>> queryPoliceTime(List policeIdArr);
+	List<AlarmVO> queryPoliceTime(List policeIdArr);
 
 	List<Map<String, Object>> queryBa();
+
+	List<AlarmVO> getAlarm(AlarmVO alarmVO);
+
+	List<Map<String, Object>> getAlarming(AlarmVO alarmVO);
+
+	boolean setAlarm(AlarmVO alarmVO);
 
 	/**
 	 * 查询当前时间段一键求助报警总次数
@@ -133,4 +140,11 @@
 	 * @return
 	 */
 	List<ReportReturnData> getAlarmPie(AlarmVO alarmVO);
+
+	/**
+	 * 查询未处理及处理中的警情总数量
+	 * @param deviceNumber 设备编号
+	 * @return
+	 */
+	Integer selectEqCount(String deviceNumber);
 }

--
Gitblit v1.9.3