From 2c2b1ab406d3049a0e69fff01e3daade5cbe90ea Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 08 Apr 2021 19:59:26 +0800
Subject: [PATCH] 预警数量统计接口修改,新增按时间条件查询条件，违禁品统计接口修改
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 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 8940488..bacb942 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,6 +16,7 @@
*/
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;
@@ -54,14 +55,17 @@
void updateJtype(String id, String jtype, String bz);
void updatePoliceStatus(String id, String status);
void updateOne(Alarm alarm);
+ void updateVaddress(String vaddress ,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();
+ Integer selectAlarmCount(@Param("conditionVo") ConditionVo conditionVo);
/**
* 查询7天内主动报警（紧急求助）每天的数量
@@ -79,4 +83,31 @@
List<Map<String, Object>> queryPolice();
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);
+
+ /**
+ * 统计时间段内一键求助警情数量数据
+ * @param conditionVo
+ * @return
+ */
+ @SqlParser(filter = true)
+ List<Integer> selectAlarmTimeData(@Param("conditionVo")ConditionVo conditionVo);
+
+ List<Map<String, Object>> queryYearAlarm(String deviceNumber,List childList);
+
}
--
Gitblit v1.9.3