From b7bb5daa5f4ffe1764a363a051a5d6f868168cf9 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 11 五月 2026 20:56:31 +0800
Subject: [PATCH] Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.1

---
 xp-robotaxi-common/xp-common-core/src/main/java/com/xiaopeng/common/core/utils/DateUtils.java |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/xp-robotaxi-common/xp-common-core/src/main/java/com/xiaopeng/common/core/utils/DateUtils.java b/xp-robotaxi-common/xp-common-core/src/main/java/com/xiaopeng/common/core/utils/DateUtils.java
index 10bf35b..f3df459 100644
--- a/xp-robotaxi-common/xp-common-core/src/main/java/com/xiaopeng/common/core/utils/DateUtils.java
+++ b/xp-robotaxi-common/xp-common-core/src/main/java/com/xiaopeng/common/core/utils/DateUtils.java
@@ -63,6 +63,22 @@
 
         return !now.isBefore(startTime) && now.isBefore(endTime);
     }
+
+    public static boolean isCurrentTimeInRangeEq(LocalTime localTime,String startTimeStr, String endTimeStr) {
+        LocalTime startTime = LocalTime.parse(fixTimeFormat(startTimeStr));
+        LocalTime endTime = LocalTime.parse(fixTimeFormat(endTimeStr));
+
+        // 判断 localTime 是否在 startTime 和 endTime 之间(包含边界)
+        // 正常情况:开始时间早于结束时间
+        return !localTime.isBefore(startTime) && !localTime.isAfter(endTime);
+//        if (startTime.isBefore(endTime)) {
+//        } else {
+//            // 跨天情况:开始时间晚于或等于结束时间(例如 22:00 到 02:00)
+//            return !localTime.isBefore(startTime) || !localTime.isAfter(endTime);
+//        }
+    }
+
+
     private static String fixTimeFormat(String timeStr) {
         // 如果只有小时和分钟,添加秒部分
         if (timeStr.length() == 5 && timeStr.contains(":")) {

--
Gitblit v1.7.1