autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-25 01:29:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 预约

Browse Source
This commit is contained in:
Guoqs
2026-06-18 15:53:59 +08:00
parent c13301a1f8
commit 69ca35a26a
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/YKCPushCommandServiceImpl.java
View File

@@ -850,8 +850,13 @@ public class YKCPushCommandServiceImpl implements YKCPushCommandService {
byte[] chargingStrategyByteArr = BytesUtil.intToBytes(0x00, 1); byte[] chargingStrategyByteArr = BytesUtil.intToBytes(0x00, 1);
byte[] chargingParamByteArr = YKCUtils.getPriceByte(BigDecimal.ZERO.toString(), 2); byte[] chargingParamByteArr = YKCUtils.getPriceByte(BigDecimal.ZERO.toString(), 2);
byte[] systemTimeByteArr = Cp56Time2aUtil.date2Hbyte(new Date()); byte[] systemTimeByteArr = Cp56Time2aUtil.date2Hbyte(new Date());
byte[] reservedStartTimeByteArr = Cp56Time2aUtil.date2Hbyte(getYuxinReservedStartDate(command.getReservedStartTime())); Date reservedStartDate = getYuxinReservedStartDate(command);
byte[] reservedStartTimeByteArr = Cp56Time2aUtil.date2Hbyte(reservedStartDate);
byte[] reservationTimeoutByteArr = BytesUtil.intToBytes(getYuxinReservationTimeout(command), 1); byte[] reservationTimeoutByteArr = BytesUtil.intToBytes(getYuxinReservationTimeout(command), 1);
log.info("羽信预约充电组包, pileSn:{}, connectorCode:{}, operation:{}, reservationType:{}, reservedStartTime:{}, reservedStartDate:{}, reservationTimeout:{}",
command.getPileSn(), command.getConnectorCode(), command.getOperation(),
BytesUtil.bin2HexStr(reservationTypeByteArr), command.getReservedStartTime(),
DateUtils.formatDateTime(reservedStartDate), getYuxinReservationTimeout(command));
return Bytes.concat(transactionCodeArr, pileSnByteArr, connectorCodeByteArr, accountBalanceByteArr, return Bytes.concat(transactionCodeArr, pileSnByteArr, connectorCodeByteArr, accountBalanceByteArr,
reservationTypeByteArr, chargingStrategyByteArr, chargingParamByteArr, systemTimeByteArr, reservationTypeByteArr, chargingStrategyByteArr, chargingParamByteArr, systemTimeByteArr,
@@ -862,9 +867,13 @@ public class YKCPushCommandServiceImpl implements YKCPushCommandService {
return command.getAmount() == null ? BigDecimal.ZERO : command.getAmount(); return command.getAmount() == null ? BigDecimal.ZERO : command.getAmount();
} }
private Date getYuxinReservedStartDate(LocalTime reservedStartTime) { private Date getYuxinReservedStartDate(ReservationChargingCommand command) {
LocalDateTime now = LocalDateTime.now(); LocalDateTime now = LocalDateTime.now();
LocalTime reservedStartTime = command.getReservedStartTime();
LocalDateTime reservedStartDateTime = now.toLocalDate().atTime(reservedStartTime); LocalDateTime reservedStartDateTime = now.toLocalDate().atTime(reservedStartTime);
if (StringUtils.equals(command.getOperation(), "02")) {
return DateUtils.localDateTime2Date(reservedStartDateTime);
}
if (!reservedStartDateTime.isAfter(now)) { if (!reservedStartDateTime.isAfter(now)) {
reservedStartDateTime = reservedStartDateTime.plusDays(1); reservedStartDateTime = reservedStartDateTime.plusDays(1);
} }