From 2c2b1ab406d3049a0e69fff01e3daade5cbe90ea Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 08 Apr 2021 19:59:26 +0800
Subject: [PATCH] 预警数量统计接口修改,新增按时间条件查询条件，违禁品统计接口修改
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java | 47 ++++++++++++++++++++++++-----------------------
1 files changed, 24 insertions(+), 23 deletions(-)
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 59b2acf..1ddf045 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
@@ -228,30 +228,31 @@
} catch (ParseException e) {
e.printStackTrace();
}
- }else {
- long nowTime = new Date().getTime();
- try {
- long alarmTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(alarm.getAlarmTime()).getTime();
- //0-5分钟
- if (nowTime-alarmTime>0 && nowTime-alarmTime<AlarmTimeConstant.FIVE_TIME){
- count05+=1;
- }
- //5-10分钟
- if (nowTime-alarmTime>=AlarmTimeConstant.FIVE_TIME && nowTime-alarmTime<AlarmTimeConstant.TEN_TIME){
- count0510+=1;
- }
- //10-30分钟
- if (nowTime-alarmTime>=AlarmTimeConstant.TEN_TIME && nowTime-alarmTime<AlarmTimeConstant.THIRTY_TIME){
- count1030+=1;
- }
- //30分钟以上
- if (nowTime-alarmTime>=AlarmTimeConstant.THIRTY_TIME){
- count30+=1;
- }
- } catch (ParseException e) {
- e.printStackTrace();
- }
}
+// else {
+// long nowTime = new Date().getTime();
+// try {
+// long alarmTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(alarm.getAlarmTime()).getTime();
+// //0-5分钟
+// if (nowTime-alarmTime>0 && nowTime-alarmTime<AlarmTimeConstant.FIVE_TIME){
+// count05+=1;
+// }
+// //5-10分钟
+// if (nowTime-alarmTime>=AlarmTimeConstant.FIVE_TIME && nowTime-alarmTime<AlarmTimeConstant.TEN_TIME){
+// count0510+=1;
+// }
+// //10-30分钟
+// if (nowTime-alarmTime>=AlarmTimeConstant.TEN_TIME && nowTime-alarmTime<AlarmTimeConstant.THIRTY_TIME){
+// count1030+=1;
+// }
+// //30分钟以上
+// if (nowTime-alarmTime>=AlarmTimeConstant.THIRTY_TIME){
+// count30+=1;
+// }
+// } catch (ParseException e) {
+// e.printStackTrace();
+// }
+// }
}
//封装数据
list.add(count05);
--
Gitblit v1.9.3