From c0892e033a19c4a481db5d661df542e30cff3ce4 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 06 Apr 2021 14:31:16 +0800
Subject: [PATCH] 设备全查接口
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/service/impl/AnimalHeatServiceImpl.java | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 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..da08853 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;
@@ -72,12 +73,12 @@
float v1 = Float.parseFloat(temRedArr[1]);
int compare = Float.compare(v, v1);
bladeAnimalHeat.setTempRed(compare>=0 ? v:v1);
- //和标志温度比较，大于37度为高温，标记为1，小于则为正常0
- int compare1 = Float.compare(37, compare >= 0 ? v : v1);
+ //和标志温度比较，大于37.2度为高温，标记为1，小于则为正常0
+ int compare1 = Float.compare(37.2f, compare >= 0 ? v : v1);
bladeAnimalHeat.setStatus(compare1>0 ?0:1);
}else {
bladeAnimalHeat.setTempRed(Float.parseFloat(temRedArr[0]));
- int compare1 = Float.compare(37, Float.parseFloat(temRedArr[0]));
+ int compare1 = Float.compare(37.2f, Float.parseFloat(temRedArr[0]));
bladeAnimalHeat.setStatus(compare1>0 ?0:1);
}
String person_rects = data.get("person_rect").toString();
@@ -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