From 0d667ba939460c3dc6cdb0c974841bd0be5dc432 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 16 Dec 2020 13:41:56 +0800
Subject: [PATCH] report_avg_datas接口更新
---
src/main/java/com/moral/util/DatesUtil.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 51 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/util/DatesUtil.java b/src/main/java/com/moral/util/DatesUtil.java
index 2c73f85..1d20667 100644
--- a/src/main/java/com/moral/util/DatesUtil.java
+++ b/src/main/java/com/moral/util/DatesUtil.java
@@ -1,5 +1,6 @@
package com.moral.util;
+import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
@@ -67,4 +68,54 @@
}}
}
+ public static List<String> findDaysStr(String beginTime,String endTime){
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ Date dBegin = null;
+ Date dEnd = null;
+ try {
+ dBegin = sdf.parse(beginTime);
+ dEnd = sdf.parse(endTime);
+ }catch (ParseException e){
+ e.printStackTrace();
+ }
+ List<String> daysStrList = new ArrayList<>();
+ daysStrList.add(sdf.format(dBegin));
+ Calendar calBegin = Calendar.getInstance();
+ calBegin.setTime(dBegin);
+ Calendar calEnd = Calendar.getInstance();
+ calEnd.setTime(dEnd);
+ while (dEnd.after(calBegin.getTime())) {
+ calBegin.add(Calendar.DAY_OF_MONTH,1);
+ String dayStar = sdf.format(calBegin.getTime());
+ daysStrList.add(dayStar);
+ }
+
+ return daysStrList;
+ }
+
+ public static List<String> findHoursStr(String beginTime,String endTime){
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Date dBegin = null;
+ Date dEnd = null;
+ try {
+ dBegin = sdf.parse(beginTime);
+ dEnd = sdf.parse(endTime);
+ }catch (ParseException e){
+ e.printStackTrace();
+ }
+ List<String> daysStrList = new ArrayList<>();
+ daysStrList.add(sdf.format(dBegin));
+ Calendar calBegin = Calendar.getInstance();
+ calBegin.setTime(dBegin);
+ Calendar calEnd = Calendar.getInstance();
+ calEnd.setTime(dEnd);
+ while (dEnd.after(calBegin.getTime())) {
+ calBegin.add(Calendar.HOUR,1);
+ String dayStar = sdf.format(calBegin.getTime());
+ daysStrList.add(dayStar);
+ }
+
+ return daysStrList;
+ }
+
}
--
Gitblit v1.8.0