From 66e71e5d4cb5bb3706f7c3662bbf7859f690ba84 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sun, 09 May 2021 11:59:38 +0800
Subject: [PATCH] 新增查询当前设备未处理和处理中的警情数量接口，当前设备一个警情处理完成后，如果当前设备还有其他预警未处理完成的，当前设备状态不会修改回正常状态

---
 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