From 54362e29d0a5aa2f33f5e7ed1f37c5d7beba428c Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期三, 18 九月 2024 14:36:28 +0800
Subject: [PATCH] typo
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/Utils.java | 44 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 39 insertions(+), 5 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..09727ea 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,35 @@
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) {
+ public static LocalTime parseTime(String strTime) {
String regex = "(\\d+)[:锛歖(\\d+)";
+ Pattern pattern = Pattern.compile(regex);
+ Matcher matcher = pattern.matcher(strTime);
+
+ if (!matcher.find())
+ return null;
+
+ // 鑾峰彇鏁翠釜鍖归厤鐨勫瓧绗︿覆
+ String fullMatch = matcher.group();
+
+ // 鑾峰彇绗竴涓崟鑾风粍锛堝皬鏃讹級
+ String strOpenHour = matcher.group(1);
+
+ // 鑾峰彇绗簩涓崟鑾风粍锛堝垎閽燂級
+ String strOpenMinute = matcher.group(2);
+
+ LocalTime localTime = LocalTime.of(Integer.valueOf(strOpenHour), Integer.valueOf(strOpenMinute));
+ return localTime;
+ }
+
+ 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 +42,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