From abbaf2374fff7d02ecc3eecd6bf62504fbf27c4b Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 06 Apr 2021 22:33:25 +0800
Subject: [PATCH] 预警数量统计接口修改，预警数量分布接口修改，预警分类占比接口新增

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java |   90 +++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 82 insertions(+), 8 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..7c6aaf3 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,13 @@
 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.util.DateUtils;
+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,21 +99,92 @@
 	}
 
 	@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 updateVaddress(String vaddress, String jid) {
+		baseMapper.updateVaddress(vaddress, jid);
+	}
+
+	@Override
+	public void updatePoliceStatus(String id,String status) {
+		baseMapper.updatePoliceStatus(id,status);
+	}
+
+	@Override
+	public void updateAaddress(String aaddress, String jid) {
+		baseMapper.updateAaddress(aaddress, jid);
+	}
+
+	@Override
+	public List<Map<String, Object>> selectEq(String time) {
+		return baseMapper.selectEq(time);
 	}
 
 	/**
 	 * 查询警情总数
-	 * @param status  0:本日   1：本周   2：本月
+	 * @param conditionVo status  0:本日   1：本周   2：本月
 	 * @return
 	 */
 	@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()));
+	public Integer selectAlarmCount(ConditionVo conditionVo) {
+		return baseMapper.selectAlarmCount(conditionVo);
+	}
+
+	/**
+	 * 查询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();
+	}
+
+	/**
+	 * 查询当前时间段一键求助报警总次数
+	 * @param conditionVo
+	 * @return
+	 */
+	@Override
+	public Integer selAlarmTimeCount(ConditionVo conditionVo) {
+		return baseMapper.selAlarmTimeCount(conditionVo);
 	}
 }

--
Gitblit v1.9.3