From d5a8a64768db15ff6917e150358a954582e384fd Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 18 Mar 2021 18:18:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 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 99bf705..33df04f 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;
@@ -65,4 +67,15 @@
 	 * @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