From 313392104a122f2c0cd2da28cbdf9ee767effe92 Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Tue, 18 Jun 2024 16:26:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=85=E7=94=B5=E6=A1=A9=E9=A2=84=E7=BA=A6?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/jsowell/service/PileService.java     | 7 +++++--
 .../src/main/java/com/jsowell/common/util/DateUtils.java   | 3 +++
 .../java/com/jsowell/pile/domain/PileReservedInfo.java     | 5 +++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/jsowell-admin/src/main/java/com/jsowell/service/PileService.java b/jsowell-admin/src/main/java/com/jsowell/service/PileService.java
index 0fb4b15a3..bea8a1747 100644
--- a/jsowell-admin/src/main/java/com/jsowell/service/PileService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/PileService.java
@@ -41,6 +41,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.sql.Time;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
@@ -572,8 +573,10 @@ public class PileService {
 		reservedInfo.setMemberId(dto.getMemberId());
 		reservedInfo.setPileSn(dto.getPileSn());
 		reservedInfo.setStatus(Constants.ZERO); // 默认未生效
-		reservedInfo.setStartTime(DateUtils.parseDate(dto.getStartTime()));
-		reservedInfo.setEndTime(DateUtils.parseDate(dto.getEndTime()));
+		// reservedInfo.setStartTime(DateUtils.parseDate(dto.getStartTime()));
+		reservedInfo.setStartTime(Time.valueOf(dto.getStartTime()));
+		// reservedInfo.setEndTime(DateUtils.parseDate(dto.getEndTime()));
+		reservedInfo.setEndTime(Time.valueOf(dto.getEndTime()));
 		if (StringUtils.isNotBlank(dto.getFreq())) {
 			reservedInfo.setReservedType("recurring");
 			reservedInfo.setFreq(dto.getFreq());
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 66b10677f..03f233035 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
@@ -10,6 +10,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.lang.management.ManagementFactory;
+import java.sql.Time;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -42,6 +43,8 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
 
     public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
 
+    public static String HH_MM = "HH:mm";
+
     public static String RFC3339 = "yyyy-MM-dd'T'HH:mm:ssXXX";
 
     private static String[] parsePatterns = {
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileReservedInfo.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileReservedInfo.java
index 6b2f69f7b..bd66a98d5 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileReservedInfo.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileReservedInfo.java
@@ -1,5 +1,6 @@
 package com.jsowell.pile.domain;
 
+import java.sql.Time;
 import java.util.Date;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -44,12 +45,12 @@ public class PileReservedInfo {
     /**
      * 预约开始时间
      */
-    private Date startTime;
+    private Time startTime;
 
     /**
      * 预约结束时间
      */
-    private Date endTime;
+    private Time endTime;
 
     /**
      * 周期性预约的频率，对于单次预约，该字段可以为 NULL。可能的值包括 daily, weekly, monthly