diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileReservationInfo.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileReservationInfo.java index 2cc088337..f4300726b 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileReservationInfo.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileReservationInfo.java @@ -47,6 +47,11 @@ public class PileReservationInfo { */ private String reservationType; + /** + * 验证身份(1-是; 0-否) + */ + private String verifyIdentity; + /** * 预约开始时间 */ diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/ReservationChargingCommand.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/ReservationChargingCommand.java index 95bef6804..078557ede 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/ReservationChargingCommand.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/ReservationChargingCommand.java @@ -46,6 +46,11 @@ public class ReservationChargingCommand { */ private String reservationType; + /** + * 身份验证 + */ + private String verifyIdentity; + /** * vin1 */ diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/CreateReservedDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/CreateReservedDTO.java index 64a96d440..d13ae5ec5 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/CreateReservedDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/CreateReservedDTO.java @@ -40,6 +40,11 @@ public class CreateReservedDTO { */ private String freq; + /** + * 验证身份(1-是; 0-否) + */ + private String verifyIdentity; + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.JSON_STYLE) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/PileReservationDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/PileReservationDTO.java index 7c0695cf1..7e28dbab9 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/PileReservationDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/PileReservationDTO.java @@ -23,6 +23,11 @@ public class PileReservationDTO { */ private String status; + /** + * 验证身份(1-是; 0-否) + */ + private String verifyIdentity; + /** * 桩编号 */ diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileReservationInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileReservationInfoServiceImpl.java index 73b4ff009..5e3f622f1 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileReservationInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileReservationInfoServiceImpl.java @@ -176,6 +176,7 @@ public class PileReservationInfoServiceImpl implements PileReservationInfoServic .connectorCode(pileReservationInfo.getPileConnectorCode().replace(pileReservationInfo.getPileSn(), "")) .operation("01") .reservationType(type) + .verifyIdentity(dto.getVerifyIdentity()) .vin1(vinCodes.get(0)) .vin2(vinCodes.get(1)) .vin3(vinCodes.get(2)) @@ -226,6 +227,7 @@ public class PileReservationInfoServiceImpl implements PileReservationInfoServic .connectorCode(pileReservationInfo.getPileConnectorCode().replace(pileReservationInfo.getPileSn(), "")) .operation("02") .reservationType(type) + .verifyIdentity(dto.getVerifyIdentity()) .vin1(vinCodes.get(0)) .vin2(vinCodes.get(1)) .vin3(vinCodes.get(2)) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/YKCPushCommandServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/YKCPushCommandServiceImpl.java index 0aa433c97..081934c7a 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/YKCPushCommandServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/YKCPushCommandServiceImpl.java @@ -505,6 +505,10 @@ public class YKCPushCommandServiceImpl implements YKCPushCommandService { String reservationType = command.getReservationType(); byte[] reservationTypeByteArr = BytesUtil.str2Bcd(reservationType); + // 身份验证 + String verifyIdentity = command.getVerifyIdentity(); + byte[] verifyIdentityByteArr = BytesUtil.str2Bcd(verifyIdentity); + // VIN1 String vin1 = command.getVin1(); byte[] vin1ByteArr = BytesUtil.str2Asc(vin1); @@ -532,7 +536,7 @@ public class YKCPushCommandServiceImpl implements YKCPushCommandService { // 拼装msg信息 byte[] msg = Bytes.concat(transactionCodeArr, pileSnByteArr, connectorCodeByteArr, operateByteArr, - reservationTypeByteArr, vin1ByteArr, vin2ByteArr, vin3ByteArr, + reservationTypeByteArr, verifyIdentityByteArr, vin1ByteArr, vin2ByteArr, vin3ByteArr, reservedStartTimeByteArr, reservedEndTimeByteArr, amountByteArr); this.push(msg, pileSn, YKCFrameTypeCode.RESERVATION_CHARGING_CODE); diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileReservationInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileReservationInfoMapper.xml index 5081f35b7..67186bdbb 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileReservationInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileReservationInfoMapper.xml @@ -10,6 +10,7 @@ + @@ -21,7 +22,7 @@ - id, member_id, pile_sn, pile_connector_code, `status`, reservation_type, start_time, + id, member_id, pile_sn, pile_connector_code, `status`, reservation_type, verify_identity, start_time, end_time, freq, create_by, create_time, update_by, update_time, del_flag