From 439480489111ecb1863e2ad0ceb2ff18150366ef Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 22 Mar 2021 09:38:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java | 40 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java
index 17f052a..9eeb12f 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java
@@ -24,6 +24,7 @@
import org.springblade.jfpt.alarm.mapper.AlarmMapper;
import org.springblade.jfpt.alarm.service.IAlarmService;
import org.springblade.jfpt.alarm.vo.AlarmVO;
+import org.springblade.jfpt.parcel.vo.ConditionVo;
import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
@@ -97,8 +98,13 @@
}
@Override
- public void updateJtype(String id,String czTime,String bz) {
- baseMapper.updateJtype(id,czTime,bz);
+ public void updateJtype(String id,String jtype,String bz) {
+ baseMapper.updateJtype(id,jtype,bz);
+ }
+
+ @Override
+ public void updatePoliceStatus(String id,String status) {
+ baseMapper.updatePoliceStatus(id,status);
}
/**
@@ -125,4 +131,34 @@
//返回数据
return map;
}
+
+ /**
+ * 主动报警统计 饼图展示
+ * @param conditionVo status 0:本日 1：本月 2：本月
+ * @return
+ */
+ @Override
+ public List<Map<String, Object>> selectAlarmSum(ConditionVo conditionVo) {
+ //status 不为空时
+ if (null!=conditionVo.getStatus()){
+ return baseMapper.selectAlarmSum(conditionVo);
+ }
+ //返回数据
+ return null;
+ }
+
+ @Override
+ public List<Map<String, Object>> queryPolice() {
+ return baseMapper.queryPolice();
+ }
+
+ @Override
+ public List<Map<String, Object>> queryPoliceTime(List policeIdArr) {
+ return baseMapper.queryPoliceTime(policeIdArr);
+ }
+
+ @Override
+ public List<Map<String, Object>> queryBa() {
+ return baseMapper.queryBa();
+ }
}
--
Gitblit v1.9.3