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/service/IAlarmService.java |   25 +++++++++++++++++++++++--
 1 files changed, 23 insertions(+), 2 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 7ef93d4..2d1c49c 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
@@ -59,10 +59,10 @@
 
 	/**
 	 * 查询警情总数
-	 * @param status  0:本日   1：本周   2：本月  3:近7天
+	 * @param conditionVo status  0:本日   1：本周   2：本月  3:近7天
 	 * @return
 	 */
-    Integer selectAlarmCount(Integer status);
+    Integer selectAlarmCount(ConditionVo conditionVo);
 
 	/**
 	 * 查询7天内主动报警（紧急求助）每天的数量
@@ -83,4 +83,25 @@
 
 	List<Map<String, Object>> queryBa();
 
+	/**
+	 * 查询当前时间段一键求助报警总次数
+	 * @param conditionVo
+	 * @return
+	 */
+	Integer selAlarmTimeCount(ConditionVo conditionVo);
+
+
+	/**
+	 * 一键求助报警确认时间占比
+	 * @param conditionVo 条件
+	 * @return
+	 */
+    Object selConfirmTimePro(ConditionVo conditionVo);
+
+	/**
+	 * 查询当前时间段区间时间一键求助报警个数
+	 * @param conditionVo
+	 * @return
+	 */
+	List<Integer> selAlarmTimeDis(ConditionVo conditionVo);
 }

--
Gitblit v1.9.3