From 15ae09fcadf155a8fe582eb6600f83e92f262aeb Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Tue, 24 Oct 2023 11:09:04 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=97=B6=E9=97=B4=E5=B7=A5=E5=85=B7?=
 =?UTF-8?q?=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsowell/common/util/DateUtils.java    | 92 +++++--------------
 1 file changed, 25 insertions(+), 67 deletions(-)

diff --git a/jsowell-common/src/main/java/com/jsowell/common/util/DateUtils.java b/jsowell-common/src/main/java/com/jsowell/common/util/DateUtils.java
index dec13e17f..8a60791cc 100644
--- a/jsowell-common/src/main/java/com/jsowell/common/util/DateUtils.java
+++ b/jsowell-common/src/main/java/com/jsowell/common/util/DateUtils.java
@@ -169,71 +169,6 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
         }
     }
 
-    public static void main(String[] args) throws ParseException {
-
-        String s = convertMinutesToTime(75);
-        System.out.println(s);
-
-
-        String startDate = "2023-07-01";
-        String endDate = "2023-07-20";
-        LocalDate of = LocalDate.of(2023, 07, 20);
-        System.out.println(of);
-
-        List<String> list = getAllDatesInTheDateRange(startDate, endDate);
-        System.out.println(list);
-
-        // String str = "2023-01-07 11:17:12";
-        // Date date = parseDate(str);
-        // String str1 = parseDateToStr(YYYY_MM_DD_HH_MM_SS, date);
-        // System.out.println(str1);
-        //
-        //
-        // Date date1 = addMinute(new Date(), -15);
-        // String s = parseDateToStr(YYYY_MM_DD_HH_MM_SS, date1);
-        // System.out.println(s);
-        //
-        // String time = getDate();
-        // System.out.println(time);
-        //
-        // System.out.println(dateTimeNow("yyyy-MM-dd HH:mm"));
-
-        // String s2 = formatDateTime(new Date());
-        // System.out.println(s2);
-
-        String time = DateUtils.getDateTime();
-        System.out.println(time);
-
-        System.out.println(DateUtils.getDate());
-        // String s = date2HexStr(new Date());
-        // String s = BytesUtil.binary(bytes, 16);
-        // System.out.println(s);
-
-        String hexString = "9401270a1b0217";
-        byte[] bytes1 = BytesUtil.hexStringToByteArray(hexString);
-        // String s1 = toDateString(bytes1);
-        // Date date = CP56Time2aToDate(bytes1);
-        // System.out.println(s1);
-
-        // String encodeCP56Time2a = DateUtils.encodeCP56Time2a(new Date());
-        // byte[] bytes = BytesUtil.hexString2Bytes(encodeCP56Time2a);
-        // String s4 = CP56Time2aToDateStr(bytes);
-        // // byte[] msg = BytesUtil.str2Bcd("88000000000021" + encodeCP56Time2a);
-        // // Date date1 = toDate(bytes);
-        // // String s3 = formatDateTime(date1);
-        // // System.out.println(s3);
-        // System.out.println(s4);
-        long chargingTime = DateUtils.intervalTime("2023-02-24 16:00:00", "2023-02-24 17:03:06");
-        System.out.println(chargingTime);
-
-
-        String dateToStr = DateUtils.parseDateToStr(DateUtils.YYYYMMDDHHMMSS, new Date());
-        System.out.println(dateToStr);
-
-        String poorDays = getPoorDays(addDay(new Date(), -7), new Date());
-        System.out.println(poorDays);
-    }
-
     /**
      * 获取服务器启动时间
      */
@@ -1029,11 +964,34 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
         return LocalDateTime.ofInstant(instant, ZoneId.systemDefault());
     }
 
+    /**
+     * LocalDateTime转时间戳
+     * @param localDateTime
+     * @return
+     */
     public static long datetimeToTimestamp(LocalDateTime localDateTime){
-        long timestamp = localDateTime.toInstant(ZoneOffset.of("+8")).toEpochMilli();
-        return timestamp;
+        return localDateTime.toInstant(ZoneOffset.of("+8")).toEpochMilli();
     }
 
+    /**
+     * date转时间戳
+     */
+    public static long dateToTimestamp(Date date){
+        LocalDateTime localDateTime = LocalDateTime.ofInstant(date.toInstant(), ZoneId.systemDefault());
+        return datetimeToTimestamp(localDateTime);
+    }
+
+    /**
+     * date字符串转时间戳
+     * @param dateStr
+     * @return
+     */
+    public static long dateStrToTimestamp(String dateStr) {
+        Date date = parseDate(dateStr);
+        return dateToTimestamp(date);
+    }
+
+
     /**
      * 将 YYYY-MM-DD HH:mm:ss 转换为 YYYY-MM-DD
      * @param dateTimeString