From e40eac7fe61668a81048fb1ca5f2f5a9c8423438 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 17 Mar 2021 15:22:27 +0800
Subject: [PATCH] 主动报警统计接口OK,用户数量统计颜色修改

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java
index b097ea1..82e8aec 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java
@@ -35,6 +35,7 @@
 import org.springblade.jfpt.healthcode.service.IhealthcodeService;
 import org.springblade.jfpt.parcel.service.ParcelService;
 import org.springblade.jfpt.parcel.util.DateUtils;
+import org.springblade.jfpt.parcel.vo.ConditionVo;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
@@ -343,7 +344,24 @@
 
 
 	/**
-	 * 一周警情统计  2021-3-16 arsn
+	 * 主动报警统计   饼图展示
+	 * @param response
+	 * @param conditionVo status 0:本日   1:本月  2:本月
+	 * @return
+	 */
+	@GetMapping("/selectAlarmSum")
+	public R selectAlarmSum(HttpServletResponse response, ConditionVo conditionVo) {
+		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(alarmService.selectAlarmSum(conditionVo));
+	}
+
+
+
+	/**
+	 * 一周警情统计(主动报警+被动报警类型(体温异常,红码,违禁品))  2021-3-16 arsn  柱状图展示
 	 * @param response
 	 * @return
 	 */

--
Gitblit v1.9.3