From afda08833e460a40a2d4e509f9df9d809c6f8f31 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 26 Mar 2021 15:38:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java | 20 +++++++++++++++++++-
1 files changed, 19 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 99bf705..215d572 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;
@@ -49,8 +51,11 @@
void deletejj(String id);
void s(Alarm alarm);
- void updateJtype(String id, String czTime, String bz);
+ 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);
@@ -65,4 +70,17 @@
* @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);
+
+ List<Map<String, Object>> queryBa();
}
--
Gitblit v1.9.3