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/mapper/AlarmMapper.java | 82 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 80 insertions(+), 2 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java
index 213a92b..afe844e 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java
@@ -16,10 +16,15 @@
*/
package org.springblade.jfpt.alarm.mapper;
+import com.baomidou.mybatisplus.annotation.SqlParser;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+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;
@@ -43,15 +48,88 @@
List<AlarmVO> listAll();
List<AlarmVO> selectList(String jtype, String district, String waringType, String beginTime, String endTime);
List<AlarmVO> getLimit();
- List<AlarmVO> selectListSe(String beginTime, String endTime);
List<AlarmVO> selectInfo(String id);
List<AlarmVO> selecttx(String id);
void deletejj(String id);
+ /**
+ * 查询近7天的警情数据
+ * @param beginTime 开始时间
+ * @param endTime 结束时间
+ * @return
+ */
+ List<AlarmVO> selectListSe(String beginTime, String endTime);
void s(Alarm alarm);
- void updateJtype(String id, String czTime, String bz);
+ void updateJtype(String id, String jtype, String bz,String securityArr);
+ void updatePoliceStatus(String id, String status);
void updateOne(Alarm alarm);
+ void updateVaddress(String vaddress,String uids ,String jid);
+ void updateAaddress(String aaddress ,String jid);
List<Map<String, Object>> selectScount(String time);
+ List<Map<String, Object>> selectEq(String time);
+ /**
+ * 查询警情总数
+ * @return
+ */
+ Integer selectAlarmCount(@Param("conditionVo") ConditionVo conditionVo);
+
+ /**
+ * 查询7天内主动报警（紧急求助）每天的数量
+ * @return
+ */
+ List<Integer> selectAlarmData();
+
+ /**
+ * 主动报警统计 饼图展示
+ * @param conditionVo status 0:本日 1：本月 2：本月
+ * @return
+ */
+ List<Map<String, Object>> selectAlarmSum(@Param("conditionVo") 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 alarm);
+
+ /**
+ * 查询当前时间段一键求助报警总次数
+ * @param conditionVo
+ * @return
+ */
+ Integer selAlarmTimeCount(@Param("conditionVo") ConditionVo conditionVo);
+
+ /**
+ * 查询当前时间段内一键求助报警的数据集合
+ * @param conditionVo
+ * @return
+ */
+ List<Alarm> selectAlarmList(@Param("conditionVo")ConditionVo conditionVo);
+
+ /**
+ * 统计时间段内一键求助警情数量数据
+ * @param conditionVo
+ * @return
+ */
+ @SqlParser(filter = true)
+ List<Integer> selectAlarmTimeData(@Param("conditionVo")ConditionVo conditionVo);
+
+ List<Map<String, Object>> queryYearAlarm(String deviceNumber,List childList);
+
+ /**
+ * 导出主动报警数据表格
+ * @param alarmVO 查询条件
+ */
+ List<AlarmExcel> exportAlarm(@Param("alarm")AlarmVO alarmVO);
+
+ /**
+ * 获取实时警情图表统计数据
+ * @param alarmVO
+ * @return
+ */
+ List<ReportReturnData> getAlarmPie(@Param("alarm")AlarmVO alarmVO);
}
--
Gitblit v1.9.3