diff --git a/jcpp-app/src/main/java/sanbing/jcpp/app/service/PileProtocolService.java b/jcpp-app/src/main/java/sanbing/jcpp/app/service/PileProtocolService.java index d7f4be2..9f37b12 100644 --- a/jcpp-app/src/main/java/sanbing/jcpp/app/service/PileProtocolService.java +++ b/jcpp-app/src/main/java/sanbing/jcpp/app/service/PileProtocolService.java @@ -97,6 +97,6 @@ public interface PileProtocolService { /** * 充电阶段BMS中止 */ - void bmsAbortDuringCharging(UplinkQueueMessage uplinkQueueMessage, Callback callback); + void onBmsAbort(UplinkQueueMessage uplinkQueueMessage, Callback callback); } \ No newline at end of file diff --git a/jcpp-app/src/main/java/sanbing/jcpp/app/service/impl/DefaultPileProtocolService.java b/jcpp-app/src/main/java/sanbing/jcpp/app/service/impl/DefaultPileProtocolService.java index 988d357..56480b1 100644 --- a/jcpp-app/src/main/java/sanbing/jcpp/app/service/impl/DefaultPileProtocolService.java +++ b/jcpp-app/src/main/java/sanbing/jcpp/app/service/impl/DefaultPileProtocolService.java @@ -6,8 +6,6 @@ */ package sanbing.jcpp.app.service.impl; -import com.google.gson.JsonObject; -import com.google.gson.JsonParser; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -322,7 +320,7 @@ public class DefaultPileProtocolService implements PileProtocolService { log.info("充电桩与 BMS 充电错误上报 {}", uplinkQueueMessage); } - public void bmsAbortDuringCharging(UplinkQueueMessage uplinkQueueMessage, Callback callback) { + public void onBmsAbort(UplinkQueueMessage uplinkQueueMessage, Callback callback) { log.info("接收到充电阶段BMS中止报文 {}", uplinkQueueMessage); // TODO 处理相关业务逻辑 callback.onSuccess(); diff --git a/jcpp-app/src/main/java/sanbing/jcpp/app/service/queue/consumer/ProtocolUplinkConsumerService.java b/jcpp-app/src/main/java/sanbing/jcpp/app/service/queue/consumer/ProtocolUplinkConsumerService.java index 95ab83c..0d89adb 100644 --- a/jcpp-app/src/main/java/sanbing/jcpp/app/service/queue/consumer/ProtocolUplinkConsumerService.java +++ b/jcpp-app/src/main/java/sanbing/jcpp/app/service/queue/consumer/ProtocolUplinkConsumerService.java @@ -204,9 +204,9 @@ public class ProtocolUplinkConsumerService extends AbstractConsumerService imple pileProtocolService.onBmsCharingInfo(uplinkQueueMsg, callback); - } else if (uplinkQueueMsg.hasBmsAbortDuringChargingRequest()) { + } else if (uplinkQueueMsg.hasBmsAbortProto()) { - pileProtocolService.bmsAbortDuringCharging(uplinkQueueMsg, callback); + pileProtocolService.onBmsAbort(uplinkQueueMsg, callback); } else { diff --git a/jcpp-infrastructure-proto/src/main/proto/protocol.proto b/jcpp-infrastructure-proto/src/main/proto/protocol.proto index 7d143ce..050f83c 100644 --- a/jcpp-infrastructure-proto/src/main/proto/protocol.proto +++ b/jcpp-infrastructure-proto/src/main/proto/protocol.proto @@ -69,7 +69,7 @@ message UplinkQueueMessage { BmsChargingErrorProto bmsChargingErrorProto = 31; BmsParamConfigReport bmsParamConfigReport = 33; BmsChargingInfoProto bmsChargingInfoProto = 34; - BmsAbortDuringChargingRequest bmsAbortDuringChargingRequest = 35; + BmsAbortProto bmsAbortProto = 35; } message DownlinkRequestMessage { @@ -327,7 +327,7 @@ message BmsChargingInfoProto { optional string additionalInfo = 4; } -message BmsAbortDuringChargingRequest { +message BmsAbortProto { string pileCode = 4; string gunCode = 5; string tradeNo = 6; diff --git a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150BmsAbortDuringChargingULCmd.java b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150BmsAbortULCmd.java similarity index 94% rename from jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150BmsAbortDuringChargingULCmd.java rename to jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150BmsAbortULCmd.java index be43264..7deed17 100644 --- a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150BmsAbortDuringChargingULCmd.java +++ b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150BmsAbortULCmd.java @@ -10,10 +10,11 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import com.google.common.base.Joiner; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; +import lombok.Getter; import lombok.extern.slf4j.Slf4j; import sanbing.jcpp.infrastructure.util.codec.BCDUtil; import sanbing.jcpp.infrastructure.util.jackson.JacksonUtil; -import sanbing.jcpp.proto.gen.ProtocolProto.BmsAbortDuringChargingRequest; +import sanbing.jcpp.proto.gen.ProtocolProto.BmsAbortProto; import sanbing.jcpp.proto.gen.ProtocolProto.UplinkQueueMessage; import sanbing.jcpp.protocol.ProtocolContext; import sanbing.jcpp.protocol.listener.tcp.TcpSession; @@ -29,7 +30,7 @@ import java.util.List; */ @Slf4j @YunKuaiChongCmd(0x1D) -public class YunKuaiChongV150BmsAbortDuringChargingULCmd extends YunKuaiChongUplinkCmdExe { +public class YunKuaiChongV150BmsAbortULCmd extends YunKuaiChongUplinkCmdExe { @Override public void execute(TcpSession tcpSession, YunKuaiChongUplinkMessage yunKuaiChongUplinkMessage, ProtocolContext ctx) { @@ -66,7 +67,7 @@ public class YunKuaiChongV150BmsAbortDuringChargingULCmd extends YunKuaiChongUpl byte errorReasonByte = byteBuf.readByte(); additionalInfo.put("BMS中止充电错误原因", parseErrorReasons(errorReasonByte)); - BmsAbortDuringChargingRequest request = BmsAbortDuringChargingRequest.newBuilder() + BmsAbortProto proto = BmsAbortProto.newBuilder() .setPileCode(pileCode) .setGunCode(gunCode) .setTradeNo(tradeNo) @@ -75,7 +76,7 @@ public class YunKuaiChongV150BmsAbortDuringChargingULCmd extends YunKuaiChongUpl // 转发到后端 UplinkQueueMessage uplinkQueueMessage = uplinkMessageBuilder(pileCode, tcpSession, yunKuaiChongUplinkMessage) - .setBmsAbortDuringChargingRequest(request) + .setBmsAbortProto(proto) .build(); tcpSession.getForwarder().sendMessage(uplinkQueueMessage); @@ -181,6 +182,7 @@ public class YunKuaiChongV150BmsAbortDuringChargingULCmd extends YunKuaiChongUpl /** * BMS中止充电错误原因枚举 */ + @Getter public enum ErrorReasonsEnum { CURRENT_OVERFLOW("电流过大"), VOLTAGE_ABNORMAL("电压异常"); @@ -191,9 +193,6 @@ public class YunKuaiChongV150BmsAbortDuringChargingULCmd extends YunKuaiChongUpl this.description = description; } - public String getDescription() { - return description; - } } /**