From 1ceb6ae074bc40a687852ce0fcef1ff2aa9c5840 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 26 Apr 2021 17:29:37 +0800
Subject: [PATCH] 1.客户列表接口修改，新增返回字段 deptName 2.删除 system.out... 以往语句
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/service/impl/AnimalHeatServiceImpl.java | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 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 176a7af..5093554 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
@@ -3,25 +3,18 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.common.entity.ReportReturnData;
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.common.entity.AnimalHeatExcel;
import org.springblade.jfpt.animalheat.vo.AnimalHeatVo;
-import org.springblade.jfpt.animalheat.vo.StatisVo;
-import org.springblade.jfpt.healthcode.entity.Healthcode;
import org.springblade.jfpt.parcel.vo.ConditionVo;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-
-import javax.validation.Valid;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
import java.util.*;
import static org.springblade.core.tool.utils.DateUtil.now;
@@ -55,7 +48,6 @@
int length = body.length();
//3.截取,由于获取数据时，｝ 被去除，需要加上
String dataBody = body.substring(i, length)+"}";
- System.out.println("dataBody = " + dataBody);
//4.数据转换
Map<String,Object> data = (Map<String, Object>) JSONObject.parse(dataBody);
//5.创建体温数据对象
@@ -205,7 +197,6 @@
//遍历集合
for (BladeAnimalHeat animalHeat:collect) {
try {
- System.out.println("animalHeat.getCreateTime() = " + animalHeat.getCreateTime());
long hours = animalHeat.getCreateTime().getHours();
if (hours>0 && hours< AlarmTimeConstant.TWO){
count02+=1;
@@ -293,5 +284,12 @@
return baseMapper.exportAnimalHeat(animalHeatVo);
}
-
+ /**
+ * 导出体温数据列表
+ * @param animalHeatVo 条件
+ */
+ @Override
+ public List<ReportReturnData> getAnimalHeatPie(AnimalHeatVo animalHeatVo) {
+ return baseMapper.getAnimalHeatPie(animalHeatVo);
+ }
}
--
Gitblit v1.9.3