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 |   88 ++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 85 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 fd61cc5..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,8 +18,11 @@
 
 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;
 
 import java.util.List;
 import java.util.Map;
@@ -50,12 +53,91 @@
 	void updateOne(Alarm alarm);
 	List<Map<String, Object>> selectScount(String time);
 	List<AlarmVO> selectListSe(String beginTime, String endTime);
-	void updateJtype(String id, String czTime, String bz);
+	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);
+	List<Map<String, Object>> selectEq(String time);
 
 	/**
 	 * 查询警情总数
-	 * @param status  0:本日   1：本周   2：本月
+	 * @param conditionVo status  0:本日   1：本周   2：本月  3:近7天
 	 * @return
 	 */
-    Integer selectAlarmCount(Integer status);
+    Integer selectAlarmCount(ConditionVo conditionVo);
+
+	/**
+	 * 查询7天内主动报警（紧急求助）每天的数量
+	 * @return
+	 */
+	Map<String, Object> selectAlarmData();
+
+	/**
+	 * 主动报警统计   饼图展示
+	 * @param conditionVo status 0:本日   1：本月  2：本月
+	 * @return
+	 */
+	List<Map<String,Object>> selectAlarmSum(ConditionVo conditionVo);
+
+	List<Map<String, Object>> queryPolice();
+
+	List<Map<String, Object>> queryPoliceTime(List policeIdArr);
+
+	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
+	 * @return
+	 */
+	Integer selAlarmTimeCount(ConditionVo conditionVo);
+
+
+	/**
+	 * 一键求助报警确认时间占比
+	 * @param conditionVo 条件
+	 * @return
+	 */
+    Object selConfirmTimePro(ConditionVo conditionVo);
+
+	/**
+	 * 查询当前时间段区间时间一键求助报警个数
+	 * @param conditionVo
+	 * @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