From a4ff2b571be305e2641c9dd67797f4102e795ebb Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sun, 25 Apr 2021 10:47:56 +0800
Subject: [PATCH] 1.App警情反馈接口调整 2.租户接口新增

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/IAlarmService.java |   42 +++++++++++++++++++++++++++++++++++++++---
 1 files changed, 39 insertions(+), 3 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 2d1c49c..c9cf51e 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,7 +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.common.entity.AlarmExcel;
 import org.springblade.jfpt.alarm.vo.AlarmVO;
 import org.springblade.jfpt.parcel.vo.ConditionVo;
 
@@ -51,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 +85,12 @@
 
 	List<Map<String, Object>> queryBa();
 
+	List<Map<String, Object>> getAlarm(AlarmVO alarmVO);
+
+	List<Map<String, Object>> getAlarming(AlarmVO alarmVO);
+
+	boolean setAlarm(AlarmVO alarmVO);
+
 	/**
 	 * 查询当前时间段一键求助报警总次数
 	 * @param conditionVo
@@ -104,4 +112,32 @@
 	 * @return
 	 */
 	List<Integer> selAlarmTimeDis(ConditionVo conditionVo);
+
+	/**
+	 * 统计时间段内一键求助警情数量数据
+	 * @param conditionVo
+	 * @return
+	 */
+	Map<String, Object> selectAlarmTimeData(ConditionVo conditionVo);
+
+	/**
+	 * 根据编号查询本年所有月份的报警数
+	 * @param deviceNumber
+	 * @return
+	 */
+	List<Map<String, Object>> queryYearAlarm(String deviceNumber);
+
+	/**
+	 * 导出主动报警数据表格
+	 * @param alarmVO 查询条件
+	 */
+	List<AlarmExcel> exportAlarm(AlarmVO alarmVO);
+
+	/**
+	 * 获取实时警情数据集合
+	 * @param alarmVO
+	 * @return
+	 */
+	List<ReportReturnData> getAlarmPie(AlarmVO alarmVO);
+
 }

--
Gitblit v1.9.3