From 8d3e4f4b795f44e6d59facb11d7fc0918376f4f2 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Wed, 11 Nov 2020 15:57:24 +0800
Subject: [PATCH] 点击沧州monitor显示整个沧州设备
---
src/main/java/com/moral/common/util/ReportTimeFormat.java | 40 +++++++++++++++++++++++++++++++++++++---
1 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/common/util/ReportTimeFormat.java b/src/main/java/com/moral/common/util/ReportTimeFormat.java
index 8528d0e..b61944b 100644
--- a/src/main/java/com/moral/common/util/ReportTimeFormat.java
+++ b/src/main/java/com/moral/common/util/ReportTimeFormat.java
@@ -3,6 +3,7 @@
import com.moral.entity.charts.TimePeriod;
import com.moral.entity.charts.TimeUnits;
+import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
@@ -72,7 +73,7 @@
timeList.add(time);
start.add(timeUnit,1);
}
- while (start.getTimeInMillis()<end.getTimeInMillis());
+ while (start.getTimeInMillis()<=end.getTimeInMillis());
return timeList;
}
@@ -88,14 +89,47 @@
rightNow.setTime(date);
rightNow.add(toCalendarTimeUnit(timeUnits), amount);
return rightNow.getTime();
- }
+ }
+
+ /**
+ * ���������������������������
+ * @param format
+ * @return
+ * @throws ParseException
+ */
+ public static Date getFormatDate(String format){
+ Date date = null;
+ try {
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat(format);
+ String dateString = simpleDateFormat.format(new Date());
+ date = simpleDateFormat.parse(dateString);
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ return date;
+ }
+ /**
+ * ������������
+ * @param date
+ * @param timeUnits
+ * @param value
+ * @return
+ */
+ public static Date dateSetValue(Date date,TimeUnits timeUnits,Integer value) {
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(date);
+ cal.set(toCalendarTimeUnit(timeUnits), value);
+ return cal.getTime();
+ }
private static int toCalendarTimeUnit(TimeUnits timeUnits) {
switch (timeUnits) {
case YEAR: return Calendar.YEAR;
case MONTH: return Calendar.MONTH;
case DAY: return Calendar.DAY_OF_YEAR;
case HOUR: return Calendar.HOUR;
- default: return Calendar.MINUTE;
+ case MINUTE: return Calendar.MINUTE;
+ case SECOND: return Calendar.SECOND;
+ default: return Calendar.MILLISECOND;
}
}
/**"yyyy-MM-dd hh:mm:ss"
--
Gitblit v1.8.0