From fae9f094ec141128482783cd5735540d1d3b84f4 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 30 十二月 2024 16:06:44 +0800
Subject: [PATCH] t_st_schedule_model_out

---
 iailab-framework/iailab-common/src/main/java/com/iailab/framework/common/util/date/DateUtils.java |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/iailab-framework/iailab-common/src/main/java/com/iailab/framework/common/util/date/DateUtils.java b/iailab-framework/iailab-common/src/main/java/com/iailab/framework/common/util/date/DateUtils.java
index cb47d49..39f8a7e 100644
--- a/iailab-framework/iailab-common/src/main/java/com/iailab/framework/common/util/date/DateUtils.java
+++ b/iailab-framework/iailab-common/src/main/java/com/iailab/framework/common/util/date/DateUtils.java
@@ -36,6 +36,8 @@
 
     public final static String DATE_TIME_PATTERN_STRING = "yyyyMMddHHmmss";
 
+    public static final String FORMAT_SIMPLE_TIME = "HH:mm";
+
     /**
      * 日期格式化 日期格式为:yyyy-MM-dd
      * @param date  日期
@@ -198,7 +200,18 @@
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(startDate);
         while (calendar.getTime().compareTo(endDate) <= 0) {
-            days.add(DateUtils.format(calendar.getTime(), FORMAT_YEAR_MONTH_DAY));
+            days.add(DateUtils.format(calendar.getTime(), FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
+            calendar.add(Calendar.SECOND, seconds);
+        }
+        return days;
+    }
+
+    public static List<String> getTimeScale(Date startDate, Date endDate, int seconds, String timeFormat) {
+        List<String> days = new ArrayList<String>();
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(startDate);
+        while (calendar.getTime().compareTo(endDate) <= 0) {
+            days.add(DateUtils.format(calendar.getTime(), timeFormat));
             calendar.add(Calendar.SECOND, seconds);
         }
         return days;

--
Gitblit v1.9.3