From d5b43ef0da42eaf50a08ce17e5fd3351eeb26a5e Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 20 Mar 2021 14:10:19 +0800
Subject: [PATCH] 违禁品筛选条件去除,警情统计接口修改

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/service/impl/AnimalHeatServiceImpl.java |   26 +++++++++++++++++++++-----
 1 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/service/impl/AnimalHeatServiceImpl.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/service/impl/AnimalHeatServiceImpl.java
index c0dcd31..d00e195 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/service/impl/AnimalHeatServiceImpl.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/service/impl/AnimalHeatServiceImpl.java
@@ -14,6 +14,7 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.validation.Valid;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import static org.springblade.core.tool.utils.DateUtil.now;
@@ -95,17 +96,17 @@
 	 */
 	@Override
 	public List<Map<String, Object>> getAnimalStatis(AnimalHeatVo animalHeatVo) {
-		if(null!= animalHeatVo.getStatus()){
+		if(null!= animalHeatVo.getType()){
 			//查询当天的统计数据
-			if (animalHeatVo.getStatus()==0){
+			if (animalHeatVo.getType()==0){
 				return baseMapper.getAnimalStatis();
 			}
 			//查询本周的统计数据
-			if (animalHeatVo.getStatus()==1){
+			if (animalHeatVo.getType()==1){
 				return baseMapper.getAnimalStatisWeek();
 			}
 			//查询本月的统计数据
-			if (animalHeatVo.getStatus()==2){
+			if (animalHeatVo.getType()==2){
 				return baseMapper.getAnimalStatisMonth();
 			}
 		}
@@ -131,7 +132,22 @@
 	 */
 	@Override
 	public List<Map<String, Integer>> selWeekDayAnimalStatis() {
-		List<Map<String,Integer>> selWeekDayAnimalStatis;
 		return baseMapper.selWeekDayAnimalStatis();
 	}
+
+	/**
+	 * 统计7天内每天体温异常的的总人数
+	 * @return
+	 */
+	@Override
+	public Map<String, Object> selectAnimalData() {
+		//创建map对象
+		Map<String, Object> map = new HashMap<>();
+		//查询统计数据
+		List<Integer> list = baseMapper.selectAnimalHeatDataStatis();
+		//封装数据
+		map.put("animalData",list);
+		//返回数据
+		return map;
+	}
 }

--
Gitblit v1.9.3