autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-08 20:10:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

充电桩预约功能

Browse Source
This commit is contained in:
Guoqs
2024-06-18 16:26:12 +08:00
parent 7025301d90
commit 313392104a
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
jsowell-admin/src/main/java/com/jsowell/service/PileService.java
View File

@@ -41,6 +41,7 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.sql.Time;
import java.util.*; import java.util.*;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
@@ -572,8 +573,10 @@ public class PileService {
reservedInfo.setMemberId(dto.getMemberId()); reservedInfo.setMemberId(dto.getMemberId());
reservedInfo.setPileSn(dto.getPileSn()); reservedInfo.setPileSn(dto.getPileSn());
reservedInfo.setStatus(Constants.ZERO); // 默认未生效 reservedInfo.setStatus(Constants.ZERO); // 默认未生效
reservedInfo.setStartTime(DateUtils.parseDate(dto.getStartTime())); // reservedInfo.setStartTime(DateUtils.parseDate(dto.getStartTime()));
reservedInfo.setEndTime(DateUtils.parseDate(dto.getEndTime())); reservedInfo.setStartTime(Time.valueOf(dto.getStartTime()));
// reservedInfo.setEndTime(DateUtils.parseDate(dto.getEndTime()));
reservedInfo.setEndTime(Time.valueOf(dto.getEndTime()));
if (StringUtils.isNotBlank(dto.getFreq())) { if (StringUtils.isNotBlank(dto.getFreq())) {
reservedInfo.setReservedType("recurring"); reservedInfo.setReservedType("recurring");
reservedInfo.setFreq(dto.getFreq()); reservedInfo.setFreq(dto.getFreq());

3
jsowell-common/src/main/java/com/jsowell/common/util/DateUtils.java
View File

@@ -10,6 +10,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.lang.management.ManagementFactory; import java.lang.management.ManagementFactory;
import java.sql.Time;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; 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 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"; public static String RFC3339 = "yyyy-MM-dd'T'HH:mm:ssXXX";
private static String[] parsePatterns = { private static String[] parsePatterns = {

5
jsowell-pile/src/main/java/com/jsowell/pile/domain/PileReservedInfo.java
View File

@@ -1,5 +1,6 @@
package com.jsowell.pile.domain; package com.jsowell.pile.domain;
import java.sql.Time;
import java.util.Date; import java.util.Date;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; 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 * 周期性预约的频率，对于单次预约，该字段可以为 NULL。可能的值包括 daily, weekly, monthly