From f14966e7c0338b4c749fee51c73470ca0230f163 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 07 Apr 2021 17:39:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java | 16 +++++++++++++++-
1 files changed, 15 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 8f12aad..d6fd45e 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
@@ -64,7 +64,7 @@
* 查询警情总数
* @return
*/
- Integer selectAlarmCount();
+ Integer selectAlarmCount(@Param("conditionVo") ConditionVo conditionVo);
/**
* 查询7天内主动报警（紧急求助）每天的数量
@@ -84,4 +84,18 @@
List<Map<String, Object>> queryPoliceTime(List policeIdArr);
List<Map<String, Object>> queryBa();
+
+ /**
+ * 查询当前时间段一键求助报警总次数
+ * @param conditionVo
+ * @return
+ */
+ Integer selAlarmTimeCount(@Param("conditionVo") ConditionVo conditionVo);
+
+ /**
+ * 查询当前时间段内一键求助报警的数据集合
+ * @param conditionVo
+ * @return
+ */
+ List<Alarm> selectAlarmList(@Param("conditionVo")ConditionVo conditionVo);
}
--
Gitblit v1.9.3