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 | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 54 insertions(+), 6 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 8703914..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,10 +24,12 @@
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;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -96,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);
}
/**
@@ -107,10 +114,51 @@
*/
@Override
public Integer selectAlarmCount(Integer status) {
- QueryWrapper<Alarm> wrapper = new QueryWrapper<>();
- if (status==0){
- wrapper.eq("alarmTime",new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
+ return baseMapper.selectAlarmCount();
+ }
+
+ /**
+ * 查询7天内主动报警（紧急求助）每天的数量
+ * @return
+ */
+ @Override
+ public Map<String, Object> selectAlarmData() {
+ Map<String, Object> map = new HashMap<>();
+ //查询数据
+ List<Integer> list = baseMapper.selectAlarmData();
+ //封装数据
+ map.put("alarmData",list);
+ //返回数据
+ 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 baseMapper.selectCount(wrapper);
+ //返回数据
+ 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