From b39cc2beacc1ec2e37cff349cae42e420105c8a6 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 05 Nov 2021 14:29:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/alarm/controller/AlarmController.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/alarm/controller/AlarmController.java b/src/main/java/org/springblade/modules/alarm/controller/AlarmController.java
index 6230b72..ac50ef9 100644
--- a/src/main/java/org/springblade/modules/alarm/controller/AlarmController.java
+++ b/src/main/java/org/springblade/modules/alarm/controller/AlarmController.java
@@ -860,4 +860,23 @@
return R.status(false);
}
+ /**
+ * 一周警情统计(主动报警+被动报警类型（体温异常，红码，违禁品）) 2021-3-16 arsn 柱状图展示
+ * @param response
+ * @return
+ */
+ @GetMapping("/countAlarm")
+ public R countAlarm(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");
+ //创建类型，时间对象，分别存取类型，时间数据
+ List<String> times = new ArrayList<>();
+ times = DateUtils.pastDay(new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
+ Map<String, Object> alarmData = alarmService.selectAlarmData();
+ alarmData.put("times",times);
+ //返回数据
+ return R.data(alarmData);
+ }
+
}
--
Gitblit v1.9.3