From dd6687b118561100e1677e88a9c2f5842a54c531 Mon Sep 17 00:00:00 2001
From: jialh <1972868360@qq.com>
Date: 星期四, 16 四月 2026 18:14:14 +0800
Subject: [PATCH] 水电话费

---
 java110-utils/src/main/java/com/java110/utils/util/DateUtil.java |  144 +++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 136 insertions(+), 8 deletions(-)

diff --git a/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java b/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java
index bf59984..b615608 100755
--- a/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java
+++ b/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java
@@ -5,21 +5,51 @@
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.Duration;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.Period;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
 import java.util.*;
 
 /**
  * Created by wuxw on 2017/7/24.
  */
 public class DateUtil {
+    public static final String DATE_FORMATE_STRING_MILLI = "yyyyMMddHHmmssSSS"; // 17浣嶏細骞存湀鏃ユ椂鍒嗙姣
 
     private static DateFormat dateFormat = new SimpleDateFormat("yyyyMMddhhmmss");
 
     public static final String LAST_TIME = "2050-01-01 00:00:00";
 
+    public static int getTotalDaysInMonth(int year, int month) {
+        LocalDate date = LocalDate.of(year, month, 1); // 鍒涘缓涓�涓棩鏈熷璞★紝骞翠唤鍜屾湀浠戒负鎸囧畾鍊硷紝鏃ユ湡涓�1鍙�
+        return date.lengthOfMonth(); // 杩斿洖璇ユ湀鐨勫ぉ鏁�
+    }
+    private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+
+    public static boolean isValidDate(String dateStr) {
+        // 鉁� 鍏抽敭淇锛氬厛褰诲簳鍘婚櫎鍓嶅悗绌虹櫧锛堝寘鎷┖鏍笺�佸埗琛ㄧ銆佹崲琛岋級
+        if (dateStr == null || dateStr.isEmpty()) {
+            return true;
+        }
+
+        // 鍘绘帀鎵�鏈夌┖鐧藉悗鍐嶆牎楠�
+        String cleanDate = dateStr.trim();
+
+        try {
+            LocalDate.parse(cleanDate, DATE_FORMATTER);
+            return true;
+        } catch (DateTimeParseException e) {
+            return false;
+        }
+    }
     private static Map<String, SimpleDateFormat> formats = new HashMap();
     public static final String DATE_FORMATE_STRING_DEFAULT = "yyyyMMddHHmmss";
     public static final String DATE_FORMATE_STRING_A = "yyyy-MM-dd HH:mm:ss";
     public static final String DATE_FORMATE_STRING_B = "yyyy-MM-dd";
+    public static final String DATE_FORMATE_STRING_SLASH_NON_ZERO = "yyyy/M/d";
     public static final String DATE_FORMATE_STRING_C = "MM/dd/yyyy HH:mm:ss a";
     public static final String DATE_FORMATE_STRING_D = "yyyy-MM-dd HH:mm:ss a";
     public static final String DATE_FORMATE_STRING_E = "yyyy-MM-dd'T'HH:mm:ss'Z'";
@@ -34,12 +64,14 @@
     public static final String DATE_FORMATE_STRING_N = "HHmmss";
     public static final String DATE_FORMATE_STRING_O = "yyyyMMddHHmm";
     public static final String DATE_FORMATE_STRING_Q = "yyyy-MM";
+    private static final DateTimeFormatter DEFAULT_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
 
 
     static {
         formats.put("yyyyMMddHHmmss", new SimpleDateFormat("yyyyMMddHHmmss"));
         formats.put("yyyy-MM-dd HH:mm:ss", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
         formats.put("yyyy-MM-dd", new SimpleDateFormat("yyyy-MM-dd"));
+        formats.put("yyyy/MM/dd", new SimpleDateFormat("yyyy/M/d"));
         formats.put("MM/dd/yyyy HH:mm:ss a", new SimpleDateFormat("MM/dd/yyyy HH:mm:ss a"));
         formats.put("yyyy-MM-dd HH:mm:ss a", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss a"));
         formats.put("yyyy-MM-dd'T'HH:mm:ss'Z'", new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'"));
@@ -510,15 +542,7 @@
         return a.getActualMaximum(Calendar.DAY_OF_MONTH);
     }
 
-    public static void main(String[] args) throws ParseException {
 
-//        SimpleDateFormat sf = new SimpleDateFormat(DateUtil.DATE_FORMATE_STRING_A);
-//        Calendar c = Calendar.getInstance();
-//        c.setTime(DateUtil.getDateFromString("2021-12-03",DateUtil.DATE_FORMATE_STRING_A));
-//        c.add(Calendar.DAY_OF_MONTH, 125);
-//        System.out.println("澧炲姞涓�澶╁悗鏃ユ湡:"+sf.format(c.getTime()));
-        System.out.println("2021-12-07".compareTo(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_B)));
-    }
 
     public static String getAddDayString(Date date, String pattern, int days) {
         SimpleDateFormat sf = new SimpleDateFormat(pattern);
@@ -817,6 +841,22 @@
         return calendar.getTime();
     }
 
+    /**
+     * 闄ゅ幓 灏忔椂 鍒� 绉�
+     *
+     * deadtime 鏈潵灏卞皯浜嗕竴绉�
+     *
+     * @param time
+     * @return
+     */
+    public static Date deadTimeToDate(Date time) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(time);
+        calendar.add(Calendar.SECOND,1);
+        setTimeToMidnight(calendar);
+        return calendar.getTime();
+    }
+
     public static boolean sameMonthDay(Date startDate, Date endDate) {
         Calendar startCalendar = Calendar.getInstance();
         startCalendar.setTime(startDate);
@@ -939,6 +979,13 @@
         return getNextSecTime(tTime);
     }
 
+    public static Date getNextSecDateTime(Date time) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(time);
+        calendar.add(Calendar.SECOND, 1);
+        return calendar.getTime();
+    }
+
     public static String getNextSecTime(Date time) {
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(time);
@@ -957,4 +1004,85 @@
         calendar.add(Calendar.SECOND, -1);
         return getFormatTimeStringA(calendar.getTime());
     }
+    public static Date getPreSecTime(Date time,int month) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(time);
+        calendar.add(Calendar.MONTH,month);
+        calendar.add(Calendar.SECOND, -1);
+        return calendar.getTime();
+    }
+    public static String getPreSecTimeStr(Date time,int month) {
+        return getFormatTimeStringB(getPreSecTime(time,month));
+    }
+    public static String calculateTimeDifference(Date start, Date end) {
+        Duration duration = Duration.between(start.toInstant(), end.toInstant());
+
+        long days = duration.toDays();
+        long hours = duration.toHours() % 24;
+        long minutes = duration.toMinutes() % 60;
+
+        StringBuilder result = new StringBuilder();
+
+        if (days > 0) {
+            result.append(days).append("澶�");
+        }
+
+        if (hours > 0) {
+            result.append(hours).append("鏃�");
+        }
+
+        if (minutes > 0 || (days == 0 && hours == 0 && minutes == 0)) {
+            result.append(minutes).append("鍒�");
+        }
+
+        return result.toString();
+    }
+
+    /**
+     * 璁$畻涓や釜瀛楃涓叉棩鏈熶箣闂寸殑鏈堟暟锛堣秴杩囦竴涓暣鏈堝垯+1锛�
+     * @param startDateStr 寮�濮嬫棩鏈熷瓧绗︿覆
+     * @param endDateStr 缁撴潫鏃ユ湡瀛楃涓�
+     * @return 鏈堟暟宸�
+     */
+    public static int calculateMonths(String startDateStr, String endDateStr) {
+        startDateStr = dateTimeToDate(startDateStr);
+        endDateStr = dateTimeToDate(endDateStr);
+        // 瑙f瀽鏃堕棿瀛楃涓蹭负LocalDateTime
+        LocalDateTime start = LocalDateTime.parse(startDateStr + " 00:00:00", DEFAULT_FORMATTER);
+        LocalDateTime end = LocalDateTime.parse(endDateStr + " 23:59:59", DEFAULT_FORMATTER);
+
+        // 纭繚寮�濮嬫椂闂村湪缁撴潫鏃堕棿涔嬪墠
+        if (start.isAfter(end)) {
+            LocalDateTime temp = start;
+            start = end;
+            end = temp;
+        }
+
+        // 鎻愬彇鏃ユ湡閮ㄥ垎璁$畻瀹屾暣鏈堟暟
+        Period period = Period.between(start.toLocalDate(), end.toLocalDate());
+        int fullMonths = period.getYears() * 12 + period.getMonths();
+
+        // 璁$畻瀹屾暣鏈堟暟鍚庣殑鐩爣鏃堕棿锛堢敤浜庡垽鏂槸鍚﹀垰濂芥暣鏈堬級
+        LocalDateTime targetTime = start.plusYears(period.getYears()).plusMonths(period.getMonths());
+
+        // 鍒ゆ柇瀹為檯缁撴潫鏃堕棿鏄惁瓒呰繃鐩爣鏃堕棿锛堝嵆瀛樺湪棰濆鏃堕棿锛�
+        boolean hasExtraTime = end.isAfter(targetTime);
+
+        // 鏈夐澶栨椂闂村垯鍔�1涓湀
+        if (hasExtraTime) {
+            fullMonths++;
+        }
+        return fullMonths;
+    }
+
+    public static void main(String[] args) throws ParseException {
+
+//        SimpleDateFormat sf = new SimpleDateFormat(DateUtil.DATE_FORMATE_STRING_A);
+//        Calendar c = Calendar.getInstance();
+//        c.setTime(DateUtil.getDateFromString("2021-12-03",DateUtil.DATE_FORMATE_STRING_A));
+//        c.add(Calendar.DAY_OF_MONTH, 125);
+//        System.out.println("澧炲姞涓�澶╁悗鏃ユ湡:"+sf.format(c.getTime()));
+        System.out.println(calculateMonths("2025-02-01 00:00:00", "2025-02-28"));
+    }
+
 }

--
Gitblit v1.8.0