From 3f28569194b49383d0ab39620de344fb42ccab3f Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 06 Nov 2017 13:38:01 +0800
Subject: [PATCH] 警报值 更新
---
src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java b/src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java
index a5f32bf..b2e4123 100644
--- a/src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java
+++ b/src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java
@@ -50,20 +50,16 @@
// 1.0 ���������������
resultMap.put("standard", ResourceUtil.getValue(parameters.get("macKey") + "-standard"));
- //resultMap.put("average", 90.0384 + Calendar.getInstance().get(Calendar.DAY_OF_MONTH) / 5);
-
- //resultMap.put("AQI", 236.71 + Calendar.getInstance().get(Calendar.DAY_OF_MONTH) / 5);
-
-
// 2.0 ���������������
Date date = new Date();
// ���������������������������������������
if (1 == Calendar.getInstance().get(Calendar.DAY_OF_MONTH)) {
// ���������1���00:00:00
parameters.put("start", DateUtils.truncate(DateUtils.addMonths(date, -1), Calendar.MONTH));
+ } else {
+ // ���������1���00:00:00
+ parameters.put("start", DateUtils.truncate(date, Calendar.MONTH));
}
- // ���������1���00:00:00
- parameters.put("start", DateUtils.truncate(date, Calendar.MONTH));
// ������00:00:00
parameters.put("end", DateUtils.truncate(date, Calendar.DATE));
@@ -117,12 +113,12 @@
}
}
- double AQI = Collections.max(IAQIs);
- // ������������������
- if (AQI == 0.0) {
- AQI = 60.670;
- }
if (!resultMap.containsKey("AQI")) {
+ double AQI = Collections.max(IAQIs);
+ // ������������������
+ if (AQI == 0.0) {
+ AQI = 60.670;
+ }
resultMap.put("AQI", String.format("%.0f", AQI));
}
--
Gitblit v1.8.0