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

新增协议0x65预约充电启动结果上传

Browse Source
This commit is contained in:
Guoqs
2024-07-24 14:55:04 +08:00
parent 5a58d6e22c
commit ad31f21549
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
jsowell-common/src/main/java/com/jsowell/common/core/domain/ykc/YKCFrameTypeCode.java
View File

@@ -71,8 +71,11 @@ public enum YKCFrameTypeCode {
BILLING_TEMPLATE_SETTING_CODE(0x58, "计费模型设置"), BILLING_TEMPLATE_SETTING_CODE(0x58, "计费模型设置"),
BILLING_TEMPLATE_SETTING_ANSWER_CODE(0x57, "计费模型设置应答"), BILLING_TEMPLATE_SETTING_ANSWER_CODE(0x57, "计费模型设置应答"),
RESERVE_CHARGING_CODE(0x60, "预约充电设置"), RESERVATION_CHARGING_CODE(0x60, "预约充电设置"),
RESERVE_CHARGING_ANSWER_CODE(0x59, "预约充电设置响应"), RESERVATION_CHARGING_ANSWER_CODE(0x59, "预约充电设置响应"), // RESERVATION
RESERVATION_CHARGING_START_RESULT_ANSWER_CODE(0x64, "预约充电启动结果上传响应"),
RESERVATION_CHARGING_START_RESULT_CODE(0x65, "预约充电启动结果上传"),
GROUND_LOCK_DATA_UPLOAD_CODE(0x61, "地锁数据上送"), GROUND_LOCK_DATA_UPLOAD_CODE(0x61, "地锁数据上送"),
REMOTE_CONTROL_GROUND_LOCK_LIFTING_CODE(0x62, "遥控地锁升降"), REMOTE_CONTROL_GROUND_LOCK_LIFTING_CODE(0x62, "遥控地锁升降"),

2
jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ReserveChargingHandler.java
View File

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Component;
@Component @Component
public class ReserveChargingHandler extends AbstractHandler{ public class ReserveChargingHandler extends AbstractHandler{
private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.RESERVE_CHARGING_CODE.getBytes()); private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.RESERVATION_CHARGING_CODE.getBytes());
@Override @Override
public void afterPropertiesSet() throws Exception { public void afterPropertiesSet() throws Exception {

2
jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ReserveChargingResponseHandler.java
View File

@@ -13,7 +13,7 @@ import org.springframework.stereotype.Component;
@Component @Component
public class ReserveChargingResponseHandler extends AbstractHandler{ public class ReserveChargingResponseHandler extends AbstractHandler{
private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.RESERVE_CHARGING_ANSWER_CODE.getBytes()); private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.RESERVATION_CHARGING_ANSWER_CODE.getBytes());
@Override @Override
public void afterPropertiesSet() throws Exception { public void afterPropertiesSet() throws Exception {

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

@@ -20,7 +20,6 @@ import io.netty.channel.ChannelFuture;
import io.netty.channel.ChannelFutureListener; import io.netty.channel.ChannelFutureListener;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.aspectj.weaver.ast.Var;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@@ -59,7 +58,7 @@ public class YKCPushCommandServiceImpl implements YKCPushCommandService {
YKCUtils.frameType2Str(YKCFrameTypeCode.REMOTE_RESTART_CODE.getBytes()), YKCUtils.frameType2Str(YKCFrameTypeCode.REMOTE_RESTART_CODE.getBytes()),
YKCUtils.frameType2Str(YKCFrameTypeCode.REMOTE_CONTROL_START_CODE.getBytes()), YKCUtils.frameType2Str(YKCFrameTypeCode.REMOTE_CONTROL_START_CODE.getBytes()),
YKCUtils.frameType2Str(YKCFrameTypeCode.REMOTE_STOP_CHARGING_CODE.getBytes()), YKCUtils.frameType2Str(YKCFrameTypeCode.REMOTE_STOP_CHARGING_CODE.getBytes()),
YKCUtils.frameType2Str(YKCFrameTypeCode.RESERVE_CHARGING_CODE.getBytes()) YKCUtils.frameType2Str(YKCFrameTypeCode.RESERVATION_CHARGING_CODE.getBytes())
); );
/** /**
@@ -536,7 +535,7 @@ public class YKCPushCommandServiceImpl implements YKCPushCommandService {
reservationTypeByteArr, vin1ByteArr, vin2ByteArr, vin3ByteArr, reservationTypeByteArr, vin1ByteArr, vin2ByteArr, vin3ByteArr,
reservedStartTimeByteArr, reservedEndTimeByteArr, amountByteArr); reservedStartTimeByteArr, reservedEndTimeByteArr, amountByteArr);
this.push(msg, pileSn, YKCFrameTypeCode.RESERVE_CHARGING_CODE); this.push(msg, pileSn, YKCFrameTypeCode.RESERVATION_CHARGING_CODE);
log.info("=====平台下发指令=====: 预约充电指令, 交易流水号:{}, 桩编号:{}, 枪口号:{}, 操作:{}, 开始时间:{}, 结束时间:{}, 启动金额:{}", log.info("=====平台下发指令=====: 预约充电指令, 交易流水号:{}, 桩编号:{}, 枪口号:{}, 操作:{}, 开始时间:{}, 结束时间:{}, 启动金额:{}",
transactionCode, pileSn, connectorCode, operation, DateUtils.formatDateTime(reservedStartTime), DateUtils.formatDateTime(reservedEndTime), amount); transactionCode, pileSn, connectorCode, operation, DateUtils.formatDateTime(reservedStartTime), DateUtils.formatDateTime(reservedEndTime), amount);