From 36afc3a1f1437b8a3283dc0bf6475e96fded05a7 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 12 Apr 2021 22:35:36 +0800
Subject: [PATCH] 新增主动报警alarm,健康码,体温,包裹,违禁品导出数据接口

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/service/impl/AnimalHeatServiceImpl.java |   39 +++++++++++++++++++++++++++++++++++++--
 1 files changed, 37 insertions(+), 2 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 3c96851..176a7af 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
@@ -4,10 +4,13 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springblade.jfpt.alarm.constant.AlarmTimeConstant;
+import org.springblade.jfpt.alarm.vo.AlarmExcel;
+import org.springblade.jfpt.alarm.vo.AlarmVO;
 import org.springblade.jfpt.animalheat.entity.BladeAnimalHeat;
 import org.springblade.jfpt.animalheat.mapper.AnimalHeatMapper;
 import org.springblade.jfpt.animalheat.service.AnimalHeatService;
 import org.springblade.jfpt.animalheat.util.ImageUtil;
+import org.springblade.jfpt.animalheat.vo.AnimalHeatExcel;
 import org.springblade.jfpt.animalheat.vo.AnimalHeatVo;
 import org.springblade.jfpt.animalheat.vo.StatisVo;
 import org.springblade.jfpt.healthcode.entity.Healthcode;
@@ -202,7 +205,8 @@
 		//遍历集合
 		for (BladeAnimalHeat animalHeat:collect) {
 			try {
-				long hours = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(animalHeat.getCreateTime().toString()).getHours();
+				System.out.println("animalHeat.getCreateTime() = " + animalHeat.getCreateTime());
+				long hours = animalHeat.getCreateTime().getHours();
 				if (hours>0 && hours< AlarmTimeConstant.TWO){
 					count02+=1;
 				}
@@ -239,7 +243,7 @@
 				if (hours>=AlarmTimeConstant.TWENTY_TWO && hours<AlarmTimeConstant.TWENTY_FOUR){
 					count2224+=1;
 				}
-			} catch (ParseException e) {
+			} catch (Exception e) {
 				e.printStackTrace();
 			}
 		}
@@ -259,4 +263,35 @@
 		//返回数据
 		return list;
 	}
+
+	/**
+	 * 统计时间段内体温异常人数数量数据
+	 * @param conditionVo
+	 * @return
+	 */
+	@Override
+	public Map<String, Object> selectAnimalTimeData(ConditionVo conditionVo) {
+		conditionVo.setStartTime(conditionVo.getStartTime().substring(0,10));
+		conditionVo.setEndTime(conditionVo.getEndTime().substring(0,10));
+		//创建map对象
+		Map<String, Object> map = new HashMap<>();
+		//查询统计数据
+		List<Integer> list = baseMapper.selectAnimalTimeData(conditionVo);
+		//封装数据
+		map.put("animalData",list);
+		//返回数据
+		return map;
+	}
+
+
+	/**
+	 * 导出体温数据列表
+	 * @param animalHeatVo 条件
+	 */
+	@Override
+	public List<AnimalHeatExcel> exportAnimalHeat(AnimalHeatVo animalHeatVo) {
+		return baseMapper.exportAnimalHeat(animalHeatVo);
+	}
+
+
 }

--
Gitblit v1.9.3