From 69a3e436bedfc828930e08cbbac7df57f4fd83cb Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Fri, 12 Jun 2020 16:46:03 +0800
Subject: [PATCH] update去除站点层，更改设备图标为站点图标
---
src/main/java/com/moral/service/impl/AlarmServiceImpl.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/AlarmServiceImpl.java b/src/main/java/com/moral/service/impl/AlarmServiceImpl.java
index fb3e494..53ecfba 100644
--- a/src/main/java/com/moral/service/impl/AlarmServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/AlarmServiceImpl.java
@@ -43,13 +43,23 @@
}
if (start == null) {
Calendar cal = Calendar.getInstance();
- String s = cal.get(Calendar.YEAR) + "";
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
- start = sdf.parse(s);
+ cal.setTime(new Date());
+ cal.set(Calendar.DAY_OF_MONTH, 1);
+ cal.set(Calendar.HOUR_OF_DAY,0);
+ cal.set(Calendar.MINUTE,0);
+ cal.set(Calendar.SECOND,0);
+ start = cal.getTime();
}
if (end == null) {
- end = new Date();
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(start);
+ int lastDay = cal.getActualMaximum(Calendar.DATE);
+ cal.set(Calendar.DAY_OF_MONTH, lastDay);
+ cal.set(Calendar.HOUR_OF_DAY,23);
+ cal.set(Calendar.MINUTE,59);
+ cal.set(Calendar.SECOND,59);
+ end = cal.getTime();
}
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
--
Gitblit v1.8.0