From 296d509996b9500c35be0b81860fa14c1d275048 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 01 Dec 2020 10:47:51 +0800
Subject: [PATCH] 更改五分钟数据接口，添加界面左侧站点设备信息接口
---
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