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/service/IAlarmService.java | 7 +++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml | 22 +++++++++++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java | 3 +
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java | 11 +++++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java | 18 +++++++++
5 files changed, 61 insertions(+), 0 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 7770ffa..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
@@ -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;
+ }
+
}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java
index 908bc07..bacb942 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java
@@ -107,4 +107,7 @@
*/
@SqlParser(filter = true)
List<Integer> selectAlarmTimeData(@Param("conditionVo")ConditionVo conditionVo);
+
+ List<Map<String, Object>> queryYearAlarm(String deviceNumber,List childList);
+
}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
index c13c9d9..b645eeb 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
@@ -494,4 +494,26 @@
on
a.days = b.datetime
</select>
+
+
+ <!--查询本年所有月份的预警数量-->
+ <select id="queryYearAlarm" resultType="java.util.HashMap">
+
+
+
+ <if test="childList!=null and childList.size>0">
+
+ <foreach collection="childList" index="index" item="item" open="" separator="union all" close="">
+ SELECT
+ #{item} as month,count(ce.id) as count
+ FROM
+ sys_alarm as ce
+ WHERE
+ YEAR ( alarmTime ) = date_format(now(),'%Y%')
+ AND MONTH ( alarmTime ) = #{item}
+
+ </foreach>
+ </if>
+
+ </select>
</mapper>
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/IAlarmService.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/IAlarmService.java
index ca5b64b..3de8d5b 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/IAlarmService.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/IAlarmService.java
@@ -111,4 +111,11 @@
* @return
*/
Map<String, Object> selectAlarmTimeData(ConditionVo conditionVo);
+
+ /**
+ * 根据编号查询本年所有月份的报警数
+ * @param deviceNumber
+ * @return
+ */
+ List<Map<String, Object>> queryYearAlarm(String deviceNumber);
}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java
index 5859a5f..59b2acf 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java
@@ -365,4 +365,15 @@
//返回数据
return map;
}
+
+ @Override
+ public List<Map<String, Object>> queryYearAlarm(String deviceNumber) {
+ List childList = new ArrayList();
+ for (int i = 1; i <= 12; i++) {
+ childList.add(i);
+ }
+
+ return baseMapper.queryYearAlarm(deviceNumber,childList);
+ }
+
}
--
Gitblit v1.9.3