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 | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 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 f2d3f12..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,20 +393,20 @@
//获取类型集合数据
String [] type = {"一键求助","违禁品","红色健康码","体温异常"};
types = Arrays.asList(type);
- if (null!=conditionVo){
+ if (null!=conditionVo.getStartTime()){
//获取时间集合数据
times = DateUtils.getTimeOverOneDate(conditionVo.getStartTime(), conditionVo.getEndTime());
- //1.统计时间段内一键求助警情数量数据 3-20 修改展示紧急求助
- Map<String, Object> alarmData = alarmService.selectAlarmData();
+ //1.统计时间段内一键求助警情数量数据 4-7 修改展示紧急求助
+ Map<String, Object> alarmData = alarmService.selectAlarmTimeData(conditionVo);
alarmData.put("name", "一键求助");
//2.统计时间段内违禁品的数量数据
Map<String, Object> parcelData = parcelService.selectParcelData(conditionVo);
parcelData.put("name", "违禁品");
//3.统计时间段内红色健康码人数数量数据
- Map<String, Object> healthcodeData = ihealthcodeService.selectHealthcodeData();
+ Map<String, Object> healthcodeData = ihealthcodeService.selectHealthcodeTimeData(conditionVo);
healthcodeData.put("name", "红色健康码");
//4.统计时间段内体温异常人数数量数据
- Map<String, Object> animalData = animalHeatService.selectAnimalData();
+ Map<String, Object> animalData = animalHeatService.selectAnimalTimeData(conditionVo);
animalData.put("name", "体温异常");
//封装数据
dataList.add(alarmData);
@@ -587,8 +587,7 @@
List<Integer> alarmTimeDis = alarmService.selAlarmTimeDis(conditionVo);
//查询当前时间段区间时间违禁品个数
List<Integer> parcelTimeDis = parcelService.selParcelTimeDis(conditionVo);
-
- //查询当前时间段区间时间红色健康码个数
+ //查询当前时间段区间时间红色健康码个数
List<Integer> healthcodeTimeDis = ihealthcodeService.selHealthcodeTimeDis(conditionVo);
//查询当前时间段区间时间体温异常次数
List<Integer> animalTimeDis = animalHeatService.selAnimalTimeDis(conditionVo);
@@ -603,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