From 284a9a6b482347a9fe65223a3280421d6a65e2e4 Mon Sep 17 00:00:00 2001 From: Administrator <admin> Date: Sat, 08 May 2021 11:37:17 +0800 Subject: [PATCH] 1.处警队伍列表接口修改 2.近一周警情接口修改,返回一键求助 3.报警设备报警时bug修复,新增判断接警员的在线状态和工作状态是否为空 --- blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/service/AnimalHeatService.java | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/service/AnimalHeatService.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/service/AnimalHeatService.java index cca3f9e..d34643a 100644 --- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/service/AnimalHeatService.java +++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/service/AnimalHeatService.java @@ -2,12 +2,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import org.springblade.jfpt.alarm.vo.AlarmExcel; -import org.springblade.jfpt.alarm.vo.AlarmVO; +import org.springblade.common.entity.ReportReturnData; import org.springblade.jfpt.animalheat.entity.BladeAnimalHeat; -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.parcel.vo.ConditionVo; import java.util.List; @@ -78,4 +76,9 @@ List<AnimalHeatExcel> exportAnimalHeat(AnimalHeatVo animalHeatVo); + /** + * 导出体温数据列表 + * @param animalHeatVo 条件 + */ + List<ReportReturnData> getAnimalHeatPie(AnimalHeatVo animalHeatVo); } -- Gitblit v1.9.3