From 670bc85ba8468dbe9a427abc54f2bca9d4e71749 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 23 Apr 2021 16:32:24 +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, 14 insertions(+), 4 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 86c9f7b..4bdffc2 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
@@ -18,8 +18,9 @@
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.springblade.common.entity.ReportReturnData;
 import org.springblade.jfpt.alarm.entity.Alarm;
-import org.springblade.jfpt.alarm.vo.AlarmExcel;
+import org.springblade.common.entity.AlarmExcel;
 import org.springblade.jfpt.alarm.vo.AlarmVO;
 import org.springblade.jfpt.parcel.vo.ConditionVo;
 
@@ -52,10 +53,10 @@
 	void updateOne(Alarm alarm);
 	List<Map<String, Object>> selectScount(String time);
 	List<AlarmVO> selectListSe(String beginTime, String endTime);
-	void updateJtype(String id, String jtype, String bz);
-	void updateVaddress(String vaddress ,String jid);
+	void updateJtype(String id, String jtype, String bz,String securityArr);
+	void updateVaddress(String vaddress,String uids,String jid);
 	void updatePoliceStatus(String id, String status);
-	void updateAaddress(String aaddress ,String jid);
+	void updateAaddress(String aaddress,String jid);
 	List<Map<String, Object>> selectEq(String time);
 
 	/**
@@ -83,6 +84,8 @@
 	List<Map<String, Object>> queryPoliceTime(List policeIdArr);
 
 	List<Map<String, Object>> queryBa();
+
+	List<Map<String, Object>> getAlarm(AlarmVO alarmVO);
 
 	/**
 	 * 查询当前时间段一键求助报警总次数
@@ -125,4 +128,11 @@
 	 * @param alarmVO 查询条件
 	 */
 	List<AlarmExcel> exportAlarm(AlarmVO alarmVO);
+
+	/**
+	 * 获取实时警情数据集合
+	 * @param alarmVO
+	 * @return
+	 */
+	List<ReportReturnData> getAlarmPie(AlarmVO alarmVO);
 }

--
Gitblit v1.9.3