From c4e1404f2e78cde3b807e030cf466f956b0de169 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 08 Apr 2021 17:27:04 +0800
Subject: [PATCH] 接口提供：根据设备编码，查询本年所有月份的报警数量
---
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 8852614..665ba1b 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
@@ -393,7 +393,7 @@
//获取类型集合数据
String [] type = {"一键求助","违禁品","红色健康码","体温异常"};
types = Arrays.asList(type);
- if (null!=conditionVo){
+ if (null!=conditionVo.getStartTime()){
//获取时间集合数据
times = DateUtils.getTimeOverOneDate(conditionVo.getStartTime(), conditionVo.getEndTime());
//1.统计时间段内一键求助警情数量数据 4-7 修改展示紧急求助
@@ -602,4 +602,22 @@
return null;
}
+
+ /**
+ * 查询本年所有月份的警情数量
+ * @param response 跨域配置
+ * @param deviceNumber 条件
+ * @return
+ */
+ @GetMapping("/queryYearAlarm")
+ public List<Map<String, Object>> queryYearAlarm(HttpServletResponse response, String deviceNumber) {
+ response.setHeader("Access-Control-Allow-Origin", "*");
+ response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+ response.setHeader("Access-Control-Allow-Credentials","true");
+
+ List<Map<String,Object>> list = alarmService.queryYearAlarm(deviceNumber);
+
+ return list;
+ }
+
}
--
Gitblit v1.9.3