Merge remote-tracking branch 'origin/master'

pom.xml

@@ -11,7 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>wangxiaolu-sfa-common-core</artifactId>
-    
+
     <description>
         wangxiaolu-sfa-common-core核心模块
     </description>
@@ -123,6 +123,11 @@
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-extension</artifactId>
         </dependency>
+        <!-- hutool -->
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+        </dependency>
 
     </dependencies>
 

src/main/java/com/sfa/common/core/constant/Constants.java

@@ -2,7 +2,7 @@ package com.sfa.common.core.constant;
 
 /**
  * 通用常量信息
- * 
+ *
  * @author ruoyi
  */
 public class Constants
@@ -132,4 +132,8 @@ public class Constants
      */
     public static final String[] JOB_ERROR_STR = { "java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml",
             "org.springframework", "org.apache", "com.sfa.common.core.utils.file" };
+    /**
+     * 采集数据方式
+     */
+    public static final String SYNC_TYPE_XXL_JOB = "xxl-job";
 }

src/main/java/com/sfa/common/core/utils/DateUtils.java

@@ -6,8 +6,10 @@ import java.lang.management.ManagementFactory;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.*;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 时间工具类
@@ -198,4 +200,28 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
         // 计算给定日期所在周数（从 1 开始）
         return (daysSinceFirstDay + firstDayWeekday) / 7 + 1;
     }
+
+    /**
+     * 计算时间间隔，如果时间间隔大于4天，就拆分成4天的时间间隔
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    public static List<Date[]> splitTimeInterval(Date startDate, Date endDate) {
+        List<Date[]> intervals = new ArrayList<>();
+        if (startDate == null || endDate == null) {
+            return intervals;
+        }
+        long daysBetween = (endDate.getTime() - startDate.getTime()) / (1000 * 60 * 60 * 24);
+
+        if (daysBetween <= 4) {
+            intervals.add(new Date[]{startDate, endDate});
+        } else {
+            Date midDate = new Date(startDate.getTime() + 4 * 24 * 60 * 60 * 1000);
+            intervals.add(new Date[]{startDate, midDate});
+            intervals.addAll(splitTimeInterval(new Date(midDate.getTime() + 1000), endDate));
+        }
+
+        return intervals;
+    }
 }