From 09ac94dec8713cde58cc88e477355a5484e230bb Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 02 Apr 2021 11:11:32 +0800
Subject: [PATCH] 1.统计报警设备数量
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/IAlarmService.java | 1 +
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml | 5 +++++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java | 1 +
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java | 5 +++++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java | 26 ++++++++++++++++++++++++++
5 files changed, 38 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 f406854..673024f 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
@@ -461,4 +461,30 @@
return R.data(alarmService.queryBa());
}
+
+ /**
+ * 统计预警设备数量
+ * @param response
+ * @return
+ */
+ @GetMapping("/selectEq")
+ public R selectEq(HttpServletResponse response) {
+ 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>> lists = new ArrayList<>();
+ SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");//设置日期格式
+ String time = df.format(new Date());// new Date()为获取当前系统时间
+ ArrayList<String> strings = pastDay(time);
+ Map<String, Object> maps = new HashMap<String, Object>();
+ for (int j=0;j<strings.size();j++){
+ Map<String, Object> map = new HashMap<String, Object>();
+ List<Map<String, Object>> list = alarmService.selectEq(strings.get(j));
+ map.put("time",strings.get(j));
+ map.put("Coun",list.size());
+ lists.add(map);
+ }
+ return R.data(lists);
+ }
+
}
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 215d572..8f12aad 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
@@ -58,6 +58,7 @@
void updateAaddress(String aaddress ,String jid);
List<Map<String, Object>> selectScount(String time);
+ List<Map<String, Object>> selectEq(String time);
/**
* 查询警情总数
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 dd78132..0a5e246 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
@@ -434,4 +434,9 @@
<update id="updateVaddress">
update sys_alarm SET vaddress=#{vaddress} where id=#{jid}
</update>
+
+
+ <select id="selectEq" resultType="java.util.HashMap">
+ SELECT COUNT(deviceNumber) as cou,deviceNumber FROM `sys_alarm` WHERE alarmTime like concat(concat('%', #{time}), '%') and waringType NOT IN("系统测试","主机重新上电") group by deviceNumber
+ </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 02bd069..7ef93d4 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
@@ -55,6 +55,7 @@
void updateVaddress(String vaddress ,String jid);
void updatePoliceStatus(String id, String status);
void updateAaddress(String aaddress ,String jid);
+ List<Map<String, Object>> selectEq(String time);
/**
* 查询警情总数
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 4c476f7..7dffae4 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
@@ -117,6 +117,11 @@
baseMapper.updateAaddress(aaddress, jid);
}
+ @Override
+ public List<Map<String, Object>> selectEq(String time) {
+ return baseMapper.selectEq(time);
+ }
+
/**
* 查询警情总数
* @param status 0:本日 1：本周 2：本月
--
Gitblit v1.9.3