From d5b43ef0da42eaf50a08ce17e5fd3351eeb26a5e Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 20 Mar 2021 14:10:19 +0800
Subject: [PATCH] 违禁品筛选条件去除,警情统计接口修改

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java |   29 ++++++++++++++++++++++++++++-
 1 files changed, 28 insertions(+), 1 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 792c3c6..c130880 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
@@ -18,8 +18,10 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.jfpt.alarm.entity.Alarm;
 import org.springblade.jfpt.alarm.vo.AlarmVO;
+import org.springblade.jfpt.parcel.vo.ConditionVo;
 
 import java.util.List;
 import java.util.Map;
@@ -40,16 +42,41 @@
 	 * @return
 	 */
 	List<AlarmVO> selectAlarmPage(IPage page, AlarmVO alarm);
+	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);
 
 	void s(Alarm alarm);
-	void updateJtype(String id, String czTime, String bz);
+	void updateJtype(String id, String jtype, String bz,String jjtime);
+	void updatePoliceStatus(String id, String status);
 	void updateOne(Alarm alarm);
 
 	List<Map<String, Object>> selectScount(String time);
 
+	/**
+	 * 查询警情总数
+	 * @return
+	 */
+    Integer selectAlarmCount();
+
+	/**
+	 * 查询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);
 }

--
Gitblit v1.9.3