From 6e88d32c8fe09152a326adf4961691373fcfda87 Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期五, 23 八月 2024 16:17:48 +0800 Subject: [PATCH] update --- jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/Utils.java | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-) diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/Utils.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/Utils.java index 57a0132..4b40db7 100644 --- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/Utils.java +++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/Utils.java @@ -3,12 +3,14 @@ import jodd.typeconverter.impl.LocalTimeConverter; import java.time.LocalTime; +import java.util.ArrayList; +import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; public class Utils { - public static LocalTime parseOpeningTime(String strOpeningTime) { - String regex = "(\\d+)[:锛歖(\\d+)"; + public static List<LocalTime> parseOpeningTime(String strOpeningTime) { + String regex = "(\\d+)[:锛歖(\\d+)~(\\d+)[:锛歖(\\d+)"; Pattern pattern = Pattern.compile(regex); Matcher matcher = pattern.matcher(strOpeningTime); @@ -19,12 +21,23 @@ String fullMatch = matcher.group(); // 鑾峰彇绗竴涓崟鑾风粍锛堝皬鏃讹級 - String strHour = matcher.group(1); + String strOpenHour = matcher.group(1); // 鑾峰彇绗簩涓崟鑾风粍锛堝垎閽燂級 - String strMinute = matcher.group(2); + String strOpenMinute = matcher.group(2); - LocalTime localTime = LocalTime.of(Integer.valueOf(strHour), Integer.valueOf(strMinute)); - return localTime; + // 鑾峰彇绗竴涓崟鑾风粍锛堝皬鏃讹級 + String strCloseHour = matcher.group(3); + + // 鑾峰彇绗簩涓崟鑾风粍锛堝垎閽燂級 + String strCloseMinute = matcher.group(4); + + LocalTime localOpenTime = LocalTime.of(Integer.valueOf(strOpenHour), Integer.valueOf(strOpenMinute)); + LocalTime localCloseTime = LocalTime.of(Integer.valueOf(strCloseHour), Integer.valueOf(strCloseMinute)); + List openCloseTime = new ArrayList<LocalTime>(); + openCloseTime.add(localOpenTime); + openCloseTime.add(localCloseTime); + return openCloseTime; } } + -- Gitblit v1.9.3