From 16abd944c4331a31e99c28564c9b8a31bfbbfefc Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 27 Aug 2021 21:14:15 +0800
Subject: [PATCH] 海康设备接口调用工具类修改

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/IAlarmService.java |   65 +++++++++++++++++++++++++++++---
 1 files changed, 59 insertions(+), 6 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 837497d..799a5bb 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,9 +18,12 @@
 
 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 org.springblade.system.user.entity.User;
 
 import java.util.List;
 import java.util.Map;
@@ -41,6 +44,10 @@
 	 * @return
 	 */
 	IPage<AlarmVO> selectAlarmPage(IPage<AlarmVO> page, AlarmVO alarm);
+	IPage<AlarmVO> selectazPage(IPage<AlarmVO> page, AlarmVO alarm);
+	List<Map<String,Object>> getChartData(AlarmVO alarm);
+	List<Map<String,Object>> getChartDataAlarm(AlarmVO alarm);
+	List<Map<String,Object>> getChartDataAlarmBs(AlarmVO alarm);
 	List<AlarmVO> listAll();
 	List<AlarmVO> selectList(String jtype, String district, String waringType, String beginTime, String endTime);
 	List<AlarmVO> getLimit();
@@ -51,10 +58,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,String bs);
+	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);
 
 	/**
@@ -77,11 +84,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<AlarmVO> getAlarming(AlarmVO alarmVO);
+
+	boolean setAlarm(AlarmVO alarmVO);
 
 	/**
 	 * 查询当前时间段一键求助报警总次数
@@ -93,9 +106,49 @@
 
 	/**
 	 * 一键求助报警确认时间占比
-	 * @param response 跨域配置
 	 * @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);
+
+	/**
+	 * 查询未处理及处理中的警情总数量
+	 * @param deviceNumber 设备编号
+	 * @return
+	 */
+	Integer selectEqCount(String deviceNumber);
 }

--
Gitblit v1.9.3