From 6971c195601ecc91b2b7b52af83efed9956dcfe0 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 09 Apr 2021 09:22:49 +0800
Subject: [PATCH] 接口提供：根据设备编码
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/controller/AnimalHeatController.java | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/controller/AnimalHeatController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/controller/AnimalHeatController.java
index 87478af..31c806f 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/controller/AnimalHeatController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/controller/AnimalHeatController.java
@@ -9,12 +9,11 @@
import org.springblade.jfpt.animalheat.entity.BladeAnimalHeat;
import org.springblade.jfpt.animalheat.service.AnimalHeatService;
import org.springblade.jfpt.animalheat.vo.AnimalHeatVo;
-import org.springblade.jfpt.animalheat.vo.StatisVo;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import java.util.List;
+import javax.servlet.http.HttpServletResponse;
/**
* 体温监测控制层
@@ -34,21 +33,39 @@
* @return
*/
@GetMapping("/getAnimalStatis")
- public List<StatisVo> getAnimalStatis(AnimalHeatVo animalHeatVo){
- return animalHeatService.getAnimalStatis(animalHeatVo);
+ public R getAnimalStatis(AnimalHeatVo animalHeatVo,HttpServletResponse response){
+ response.setHeader("Access-Control-Allow-Origin", "*");
+ response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+ response.setHeader("Access-Control-Allow-Credentials","true");
+ return R.data(animalHeatService.getAnimalStatis(animalHeatVo));
}
/**
- * 体温数据的分页数据
- * @param animalHeatVo 查询条件
+ * 体温数据的分页数据--图表的点击事件
+ * @param animalHeatVo 查询条件 包含时间状态type 0:本日 1：本周 2：本月
* @param query 查询页码
* @return
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
- public R<IPage<BladeAnimalHeat>> page(AnimalHeatVo animalHeatVo, Query query) {
+ public R<IPage<BladeAnimalHeat>> page(AnimalHeatVo animalHeatVo, Query query,HttpServletResponse response) {
+ response.setHeader("Access-Control-Allow-Origin", "*");
+ response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+ response.setHeader("Access-Control-Allow-Credentials","true");
return R.data(animalHeatService.selectAnimalHeatPage(Condition.getPage(query), animalHeatVo));
}
+ /**
+ * 查询本周每天的体温数据数量
+ * @return
+ */
+ @GetMapping("/selWeekDayAnimalStatis")
+ public R selWeekDayAnimalStatis(HttpServletResponse response){
+ response.setHeader("Access-Control-Allow-Origin", "*");
+ response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+ response.setHeader("Access-Control-Allow-Credentials","true");
+ return R.data(animalHeatService.selWeekDayAnimalStatis());
+ }
+
}
--
Gitblit v1.9.3