From 38548b523063b40b11df99667b9c5808dfbee6be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=89=E4=B8=99?= <10604541+sanbing-os@user.noreply.gitee.com> Date: Fri, 12 Sep 2025 14:40:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E5=88=86protobuf?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProtocolController.java | 2 + .../adapter/controller/StationController.java | 11 - .../adapter/controller/TestController.java | 2 +- .../jcpp/app/adapter/response/ErrorCode.java | 2 + .../jcpp/app/service/DownlinkCallService.java | 6 +- .../sanbing/jcpp/app/service/GunService.java | 2 +- .../jcpp/app/service/PileProtocolService.java | 6 +- .../jcpp/app/service/PileSessionService.java | 2 +- .../app/service/grpc/DownlinkGrpcClient.java | 3 +- .../app/service/impl/DefaultGunService.java | 2 +- .../impl/DefaultPileProtocolService.java | 9 +- .../impl/DefaultPileSessionService.java | 2 +- .../service/impl/GrpcDownlinkCallService.java | 4 +- .../service/impl/RestDownlinkCallService.java | 2 +- .../app/service/queue/AppConsumerStats.java | 2 +- .../ProtocolUplinkConsumerService.java | 2 +- .../infrastructure/proto/ProtoConverter.java | 3 +- .../proto/model/PricingModel.java | 6 +- .../src/main/proto/downlink.proto | 248 +++++++++++++++ .../src/main/proto/grpc.proto | 58 ++++ .../proto/{protocol.proto => uplink.proto} | 301 +++--------------- .../queue/provider/AppQueueFactory.java | 2 +- .../provider/InMemoryAppQueueFactory.java | 2 +- .../queue/provider/KafkaAppQueueFactory.java | 2 +- .../protocol/adapter/DownlinkController.java | 2 +- .../protocol/adapter/DownlinkGrpcService.java | 3 +- .../jcpp/protocol/domain/ProtocolSession.java | 14 +- .../protocol/domain/SessionToHandlerMsg.java | 2 +- .../jcpp/protocol/forwarder/Forwarder.java | 2 +- .../protocol/forwarder/KafkaForwarder.java | 2 +- .../protocol/forwarder/MemoryForwarder.java | 2 +- .../listener/tcp/TcpChannelHandler.java | 4 +- .../protocol/listener/tcp/TcpSession.java | 7 +- ...efaultProtocolSessionRegistryProvider.java | 2 +- .../adapter/DownlinkControllerIT.java | 4 +- .../lvneng/LvnengDwonlinkMessage.java | 2 +- .../LvnengProtocolMessageProcessor.java | 2 +- .../protocol/lvneng/LvnengUplinkCmdExe.java | 2 +- .../v340/cmd/LvnengV340HeartbeatULCmd.java | 4 +- .../v340/cmd/LvnengV340LoginAckDLCmd.java | 4 +- .../lvneng/v340/cmd/LvnengV340LoginULCmd.java | 4 +- .../v340/cmd/LvnengV340RealTimeDataULCmd.java | 8 +- .../LvnengV340TransactionRecordAckDLCmd.java | 2 +- .../cmd/LvnengV340TransactionRecordULCmd.java | 4 +- .../AbstractYunKuaiChongCmdExe.java | 2 +- .../YunKuaiChongDwonlinkMessage.java | 2 +- .../YunKuaiChongProtocolMessageProcessor.java | 2 +- .../YunKuaiChongUplinkCmdExe.java | 2 +- .../cmd/YunKuaiChongV150BmsAbortULCmd.java | 4 +- ...YunKuaiChongV150BmsChargingErrorULCmd.java | 4 +- .../YunKuaiChongV150BmsChargingInfoULCmd.java | 4 +- ...iChongV150BmsDemandChargerOutputULCmd.java | 4 +- .../YunKuaiChongV150BmsHandshakeULCmd.java | 4 +- ...uaiChongV150BmsParamConfigReportULCmd.java | 4 +- .../cmd/YunKuaiChongV150HeartbeatULCmd.java | 4 +- .../cmd/YunKuaiChongV150LockStatusULCmd.java | 4 +- .../cmd/YunKuaiChongV150LoginAckDLCmd.java | 4 +- .../v150/cmd/YunKuaiChongV150LoginULCmd.java | 4 +- ...0OfflineCardBalanceUpdateRequestDLCmd.java | 2 +- ...OfflineCardBalanceUpdateResponseULCmd.java | 4 +- ...iChongV150OfflineCardSyncRequestDLCmd.java | 2 +- ...ChongV150OfflineCardSyncResponseULCmd.java | 4 +- .../cmd/YunKuaiChongV150OtaRequestDLCmd.java | 2 +- .../cmd/YunKuaiChongV150OtaResponseULCmd.java | 4 +- ...uaiChongV150QueryPricingModelAckDLCmd.java | 4 +- ...unKuaiChongV150QueryPricingModelULCmd.java | 4 +- .../YunKuaiChongV150RealTimeDataULCmd.java | 8 +- .../cmd/YunKuaiChongV150RemoteStartDLCmd.java | 2 +- ...unKuaiChongV150RemoteStartResultULCmd.java | 4 +- .../cmd/YunKuaiChongV150RemoteStopDLCmd.java | 2 +- ...YunKuaiChongV150RemoteStopResultULCmd.java | 4 +- .../YunKuaiChongV150RestartPileAckULCmd.java | 4 +- .../cmd/YunKuaiChongV150RestartPileDLCmd.java | 2 +- ...nKuaiChongV150SetPricingModelAckULCmd.java | 4 +- .../YunKuaiChongV150SetPricingModelDLCmd.java | 4 +- .../YunKuaiChongV150StartChargeAckDLCmd.java | 4 +- .../cmd/YunKuaiChongV150StartChargeULCmd.java | 9 +- .../cmd/YunKuaiChongV150TimeSyncDLCmd.java | 2 +- .../YunKuaiChongV150TimeSyncResultULCmd.java | 4 +- ...uaiChongV150TransactionRecordAckDLCmd.java | 2 +- ...unKuaiChongV150TransactionRecordULCmd.java | 2 +- ...aiChongV150VerifyPricingModelAckDLCmd.java | 2 +- ...nKuaiChongV150VerifyPricingModelULCmd.java | 4 +- ...KuaiChongV160RemoteParallelStartDLCmd.java | 4 +- ...ongV160RemoteParallelStartResultULCmd.java | 4 +- ...unKuaiChongV170TransactionRecordULCmd.java | 2 +- jcpp-web-ui/src/components/GunManagement.tsx | 121 +++---- 87 files changed, 558 insertions(+), 467 deletions(-) create mode 100644 jcpp-infrastructure-proto/src/main/proto/downlink.proto create mode 100644 jcpp-infrastructure-proto/src/main/proto/grpc.proto rename jcpp-infrastructure-proto/src/main/proto/{protocol.proto => uplink.proto} (58%) diff --git a/jcpp-app/src/main/java/sanbing/jcpp/app/adapter/controller/ProtocolController.java b/jcpp-app/src/main/java/sanbing/jcpp/app/adapter/controller/ProtocolController.java index 3d943ec..2e16edc 100644 --- a/jcpp-app/src/main/java/sanbing/jcpp/app/adapter/controller/ProtocolController.java +++ b/jcpp-app/src/main/java/sanbing/jcpp/app/adapter/controller/ProtocolController.java @@ -39,3 +39,5 @@ public class ProtocolController extends BaseController { return ResponseEntity.ok(ApiResponse.success("查询成功", protocols)); } } + + diff --git a/jcpp-app/src/main/java/sanbing/jcpp/app/adapter/controller/StationController.java b/jcpp-app/src/main/java/sanbing/jcpp/app/adapter/controller/StationController.java index 1b0e1a9..6e170f7 100644 --- a/jcpp-app/src/main/java/sanbing/jcpp/app/adapter/controller/StationController.java +++ b/jcpp-app/src/main/java/sanbing/jcpp/app/adapter/controller/StationController.java @@ -16,7 +16,6 @@ import sanbing.jcpp.app.adapter.request.StationUpdateRequest; import sanbing.jcpp.app.adapter.response.ApiResponse; import sanbing.jcpp.app.adapter.response.PageResponse; import sanbing.jcpp.app.adapter.response.StationOption; -import sanbing.jcpp.app.adapter.response.StationPileCascaderOption; import sanbing.jcpp.app.dal.entity.Station; import sanbing.jcpp.app.exception.JCPPException; import sanbing.jcpp.app.service.StationService; @@ -105,14 +104,4 @@ public class StationController extends BaseController { List options = stationService.searchStationOptions(keyword, page, size); return ResponseEntity.ok(ApiResponse.success("查询成功", options)); } - - /** - * 获取充电站-充电桩级联选择器数据（用于级联选择组件） - */ - @GetMapping("/pile-cascader") - public ResponseEntity>> getStationPileCascaderOptions( - @RequestParam(required = false) String keyword) { - List options = stationService.getStationPileCascaderOptions(keyword); - return ResponseEntity.ok(ApiResponse.success("查询成功", options)); - } } diff --git a/jcpp-app/src/main/java/sanbing/jcpp/app/adapter/controller/TestController.java b/jcpp-app/src/main/java/sanbing/jcpp/app/adapter/controller/TestController.java index d0eb589..15d4710 100644 --- a/jcpp-app/src/main/java/sanbing/jcpp/app/adapter/controller/TestController.java +++ b/jcpp-app/src/main/java/sanbing/jcpp/app/adapter/controller/TestController.java @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import sanbing.jcpp.app.service.PileProtocolService; -import sanbing.jcpp.proto.gen.ProtocolProto.*; +import sanbing.jcpp.proto.gen.DownlinkProto.*; import java.math.BigDecimal; import java.time.LocalDateTime; diff --git a/jcpp-app/src/main/java/sanbing/jcpp/app/adapter/response/ErrorCode.java b/jcpp-app/src/main/java/sanbing/jcpp/app/adapter/response/ErrorCode.java index 13a0715..3d3227b 100644 --- a/jcpp-app/src/main/java/sanbing/jcpp/app/adapter/response/ErrorCode.java +++ b/jcpp-app/src/main/java/sanbing/jcpp/app/adapter/response/ErrorCode.java @@ -165,3 +165,5 @@ public enum ErrorCode { + + diff --git a/jcpp-app/src/main/java/sanbing/jcpp/app/service/DownlinkCallService.java b/jcpp-app/src/main/java/sanbing/jcpp/app/service/DownlinkCallService.java index b3e78ee..4aed8f8 100644 --- a/jcpp-app/src/main/java/sanbing/jcpp/app/service/DownlinkCallService.java +++ b/jcpp-app/src/main/java/sanbing/jcpp/app/service/DownlinkCallService.java @@ -14,9 +14,9 @@ import sanbing.jcpp.app.service.cache.session.PileSessionCacheKey; import sanbing.jcpp.infrastructure.cache.CacheValueWrapper; import sanbing.jcpp.infrastructure.cache.TransactionalCache; import sanbing.jcpp.infrastructure.queue.discovery.ServiceInfoProvider; -import sanbing.jcpp.proto.gen.ProtocolProto.DownlinkRequestMessage; -import sanbing.jcpp.proto.gen.ProtocolProto.LoginRequest; -import sanbing.jcpp.proto.gen.ProtocolProto.UplinkQueueMessage; +import sanbing.jcpp.proto.gen.DownlinkProto.DownlinkRequestMessage; +import sanbing.jcpp.proto.gen.UplinkProto.LoginRequest; +import sanbing.jcpp.proto.gen.UplinkProto.UplinkQueueMessage; import sanbing.jcpp.protocol.adapter.DownlinkController; import java.util.UUID; diff --git a/jcpp-app/src/main/java/sanbing/jcpp/app/service/GunService.java b/jcpp-app/src/main/java/sanbing/jcpp/app/service/GunService.java index 215859c..e9abade 100644 --- a/jcpp-app/src/main/java/sanbing/jcpp/app/service/GunService.java +++ b/jcpp-app/src/main/java/sanbing/jcpp/app/service/GunService.java @@ -12,7 +12,7 @@ import sanbing.jcpp.app.adapter.request.GunUpdateRequest; import sanbing.jcpp.app.adapter.response.GunWithStatusResponse; import sanbing.jcpp.app.adapter.response.PageResponse; import sanbing.jcpp.app.dal.entity.Gun; -import sanbing.jcpp.proto.gen.ProtocolProto.GunRunStatus; +import sanbing.jcpp.proto.gen.UplinkProto.GunRunStatus; import java.util.UUID; 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 f8c2590..485be10 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 @@ -7,7 +7,11 @@ package sanbing.jcpp.app.service; import sanbing.jcpp.infrastructure.queue.Callback; -import sanbing.jcpp.proto.gen.ProtocolProto.*; +import sanbing.jcpp.proto.gen.DownlinkProto.OfflineCardBalanceUpdateRequest; +import sanbing.jcpp.proto.gen.DownlinkProto.OfflineCardSyncRequest; +import sanbing.jcpp.proto.gen.DownlinkProto.OtaRequest; +import sanbing.jcpp.proto.gen.DownlinkProto.SetPricingRequest; +import sanbing.jcpp.proto.gen.UplinkProto.UplinkQueueMessage; import java.math.BigDecimal; import java.time.LocalDateTime; diff --git a/jcpp-app/src/main/java/sanbing/jcpp/app/service/PileSessionService.java b/jcpp-app/src/main/java/sanbing/jcpp/app/service/PileSessionService.java index b34e8f7..2e381a7 100644 --- a/jcpp-app/src/main/java/sanbing/jcpp/app/service/PileSessionService.java +++ b/jcpp-app/src/main/java/sanbing/jcpp/app/service/PileSessionService.java @@ -8,7 +8,7 @@ package sanbing.jcpp.app.service; import sanbing.jcpp.app.dal.entity.Pile; import sanbing.jcpp.app.data.PileSession; -import sanbing.jcpp.proto.gen.ProtocolProto.UplinkQueueMessage; +import sanbing.jcpp.proto.gen.UplinkProto.UplinkQueueMessage; import java.util.List; import java.util.Optional; diff --git a/jcpp-app/src/main/java/sanbing/jcpp/app/service/grpc/DownlinkGrpcClient.java b/jcpp-app/src/main/java/sanbing/jcpp/app/service/grpc/DownlinkGrpcClient.java index c8f321e..5fd4314 100644 --- a/jcpp-app/src/main/java/sanbing/jcpp/app/service/grpc/DownlinkGrpcClient.java +++ b/jcpp-app/src/main/java/sanbing/jcpp/app/service/grpc/DownlinkGrpcClient.java @@ -26,9 +26,10 @@ import sanbing.jcpp.infrastructure.util.async.JCPPThreadFactory; import sanbing.jcpp.infrastructure.util.mdc.MDCUtils; import sanbing.jcpp.infrastructure.util.trace.TracerContextUtil; import sanbing.jcpp.infrastructure.util.trace.TracerRunnable; +import sanbing.jcpp.proto.gen.DownlinkProto.DownlinkResponseMessage; +import sanbing.jcpp.proto.gen.GrpcProto.*; import sanbing.jcpp.proto.gen.ProtocolInterfaceGrpc; import sanbing.jcpp.proto.gen.ProtocolInterfaceGrpc.ProtocolInterfaceStub; -import sanbing.jcpp.proto.gen.ProtocolProto.*; import java.util.ArrayList; import java.util.List; diff --git a/jcpp-app/src/main/java/sanbing/jcpp/app/service/impl/DefaultGunService.java b/jcpp-app/src/main/java/sanbing/jcpp/app/service/impl/DefaultGunService.java index 0ba04b7..d7c241d 100644 --- a/jcpp-app/src/main/java/sanbing/jcpp/app/service/impl/DefaultGunService.java +++ b/jcpp-app/src/main/java/sanbing/jcpp/app/service/impl/DefaultGunService.java @@ -29,7 +29,7 @@ import sanbing.jcpp.app.data.kv.StringDataEntry; import sanbing.jcpp.app.service.AttributeService; import sanbing.jcpp.app.service.GunService; import sanbing.jcpp.infrastructure.util.jackson.JacksonUtil; -import sanbing.jcpp.proto.gen.ProtocolProto.GunRunStatus; +import sanbing.jcpp.proto.gen.UplinkProto.GunRunStatus; import java.time.LocalDateTime; import java.util.Optional; 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 b34ba84..8c52d6d 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 @@ -26,7 +26,8 @@ import sanbing.jcpp.infrastructure.proto.model.PricingModel.Period; import sanbing.jcpp.infrastructure.queue.Callback; import sanbing.jcpp.infrastructure.util.async.JCPPAsynchron; import sanbing.jcpp.infrastructure.util.jackson.JacksonUtil; -import sanbing.jcpp.proto.gen.ProtocolProto.*; +import sanbing.jcpp.proto.gen.DownlinkProto.*; +import sanbing.jcpp.proto.gen.UplinkProto.*; import sanbing.jcpp.protocol.domain.DownlinkCmdEnum; import java.math.BigDecimal; @@ -34,9 +35,9 @@ import java.time.LocalDateTime; import java.time.LocalTime; import java.util.*; -import static sanbing.jcpp.proto.gen.ProtocolProto.PricingModelFlag.*; -import static sanbing.jcpp.proto.gen.ProtocolProto.PricingModelRule.PEAK_VALLEY_PRICING; -import static sanbing.jcpp.proto.gen.ProtocolProto.PricingModelType.CHARGE; +import static sanbing.jcpp.proto.gen.DownlinkProto.PricingModelFlag.*; +import static sanbing.jcpp.proto.gen.DownlinkProto.PricingModelRule.PEAK_VALLEY_PRICING; +import static sanbing.jcpp.proto.gen.DownlinkProto.PricingModelType.CHARGE; /** * @author 九筒 diff --git a/jcpp-app/src/main/java/sanbing/jcpp/app/service/impl/DefaultPileSessionService.java b/jcpp-app/src/main/java/sanbing/jcpp/app/service/impl/DefaultPileSessionService.java index cd14dfb..05e46e4 100644 --- a/jcpp-app/src/main/java/sanbing/jcpp/app/service/impl/DefaultPileSessionService.java +++ b/jcpp-app/src/main/java/sanbing/jcpp/app/service/impl/DefaultPileSessionService.java @@ -25,7 +25,7 @@ import sanbing.jcpp.infrastructure.cache.TransactionalCache; import sanbing.jcpp.infrastructure.queue.common.TopicPartitionInfo; import sanbing.jcpp.infrastructure.queue.discovery.PartitionProvider; import sanbing.jcpp.infrastructure.queue.discovery.ServiceType; -import sanbing.jcpp.proto.gen.ProtocolProto.UplinkQueueMessage; +import sanbing.jcpp.proto.gen.UplinkProto.UplinkQueueMessage; import java.util.ArrayList; import java.util.List; diff --git a/jcpp-app/src/main/java/sanbing/jcpp/app/service/impl/GrpcDownlinkCallService.java b/jcpp-app/src/main/java/sanbing/jcpp/app/service/impl/GrpcDownlinkCallService.java index 715b18e..e9ea4f3 100644 --- a/jcpp-app/src/main/java/sanbing/jcpp/app/service/impl/GrpcDownlinkCallService.java +++ b/jcpp-app/src/main/java/sanbing/jcpp/app/service/impl/GrpcDownlinkCallService.java @@ -13,8 +13,8 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.stereotype.Service; import sanbing.jcpp.app.service.DownlinkCallService; import sanbing.jcpp.app.service.grpc.DownlinkGrpcClient; -import sanbing.jcpp.proto.gen.ProtocolProto.DownlinkRequestMessage; -import sanbing.jcpp.proto.gen.ProtocolProto.RequestMsg; +import sanbing.jcpp.proto.gen.DownlinkProto.DownlinkRequestMessage; +import sanbing.jcpp.proto.gen.GrpcProto.RequestMsg; import static sanbing.jcpp.infrastructure.proto.ProtoConverter.toTracerProto; diff --git a/jcpp-app/src/main/java/sanbing/jcpp/app/service/impl/RestDownlinkCallService.java b/jcpp-app/src/main/java/sanbing/jcpp/app/service/impl/RestDownlinkCallService.java index 0343001..af198c6 100644 --- a/jcpp-app/src/main/java/sanbing/jcpp/app/service/impl/RestDownlinkCallService.java +++ b/jcpp-app/src/main/java/sanbing/jcpp/app/service/impl/RestDownlinkCallService.java @@ -18,7 +18,7 @@ import org.springframework.web.client.RestClientException; import org.springframework.web.client.RestTemplate; import sanbing.jcpp.app.service.DownlinkCallService; import sanbing.jcpp.infrastructure.util.trace.TracerContextUtil; -import sanbing.jcpp.proto.gen.ProtocolProto.DownlinkRequestMessage; +import sanbing.jcpp.proto.gen.DownlinkProto.DownlinkRequestMessage; import static sanbing.jcpp.infrastructure.util.trace.TracerContextUtil.*; diff --git a/jcpp-app/src/main/java/sanbing/jcpp/app/service/queue/AppConsumerStats.java b/jcpp-app/src/main/java/sanbing/jcpp/app/service/queue/AppConsumerStats.java index 358a1d1..33c52a0 100644 --- a/jcpp-app/src/main/java/sanbing/jcpp/app/service/queue/AppConsumerStats.java +++ b/jcpp-app/src/main/java/sanbing/jcpp/app/service/queue/AppConsumerStats.java @@ -12,7 +12,7 @@ import lombok.extern.slf4j.Slf4j; import sanbing.jcpp.infrastructure.stats.StatsCounter; import sanbing.jcpp.infrastructure.stats.StatsFactory; import sanbing.jcpp.infrastructure.util.trace.TracerContextUtil; -import sanbing.jcpp.proto.gen.ProtocolProto.UplinkQueueMessage; +import sanbing.jcpp.proto.gen.UplinkProto.UplinkQueueMessage; import java.time.Duration; import java.util.*; 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 564a063..e7b9c05 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 @@ -33,7 +33,7 @@ import sanbing.jcpp.infrastructure.util.codec.ByteUtil; import sanbing.jcpp.infrastructure.util.mdc.MDCUtils; import sanbing.jcpp.infrastructure.util.trace.TracerContextUtil; import sanbing.jcpp.infrastructure.util.trace.TracerRunnable; -import sanbing.jcpp.proto.gen.ProtocolProto.UplinkQueueMessage; +import sanbing.jcpp.proto.gen.UplinkProto.UplinkQueueMessage; import java.util.List; import java.util.Set; diff --git a/jcpp-infrastructure-proto/src/main/java/sanbing/jcpp/infrastructure/proto/ProtoConverter.java b/jcpp-infrastructure-proto/src/main/java/sanbing/jcpp/infrastructure/proto/ProtoConverter.java index f1d3c76..424a945 100644 --- a/jcpp-infrastructure-proto/src/main/java/sanbing/jcpp/infrastructure/proto/ProtoConverter.java +++ b/jcpp-infrastructure-proto/src/main/java/sanbing/jcpp/infrastructure/proto/ProtoConverter.java @@ -13,7 +13,8 @@ import sanbing.jcpp.infrastructure.proto.model.PricingModel.Period; import sanbing.jcpp.infrastructure.proto.model.PricingModel.TimePeriodItem; import sanbing.jcpp.infrastructure.util.trace.Tracer; import sanbing.jcpp.infrastructure.util.trace.TracerContextUtil; -import sanbing.jcpp.proto.gen.ProtocolProto.*; +import sanbing.jcpp.proto.gen.DownlinkProto.*; +import sanbing.jcpp.proto.gen.GrpcProto.TracerProto; import java.util.Map; diff --git a/jcpp-infrastructure-proto/src/main/java/sanbing/jcpp/infrastructure/proto/model/PricingModel.java b/jcpp-infrastructure-proto/src/main/java/sanbing/jcpp/infrastructure/proto/model/PricingModel.java index 5e4cfd7..8bccef5 100644 --- a/jcpp-infrastructure-proto/src/main/java/sanbing/jcpp/infrastructure/proto/model/PricingModel.java +++ b/jcpp-infrastructure-proto/src/main/java/sanbing/jcpp/infrastructure/proto/model/PricingModel.java @@ -7,9 +7,9 @@ package sanbing.jcpp.infrastructure.proto.model; import lombok.*; -import sanbing.jcpp.proto.gen.ProtocolProto.PricingModelFlag; -import sanbing.jcpp.proto.gen.ProtocolProto.PricingModelRule; -import sanbing.jcpp.proto.gen.ProtocolProto.PricingModelType; +import sanbing.jcpp.proto.gen.DownlinkProto.PricingModelFlag; +import sanbing.jcpp.proto.gen.DownlinkProto.PricingModelRule; +import sanbing.jcpp.proto.gen.DownlinkProto.PricingModelType; import java.math.BigDecimal; import java.time.LocalTime; diff --git a/jcpp-infrastructure-proto/src/main/proto/downlink.proto b/jcpp-infrastructure-proto/src/main/proto/downlink.proto new file mode 100644 index 0000000..14cd479 --- /dev/null +++ b/jcpp-infrastructure-proto/src/main/proto/downlink.proto @@ -0,0 +1,248 @@ +/** + * 开源代码，仅供学习和交流研究使用，商用请联系三丙 + * 微信：mohan_88888 + * 抖音：程序员三丙 + * 付费课程知识星球：https://t.zsxq.com/aKtXo + */ +syntax = "proto3"; + +package infrastructureProto; + +option java_package = "sanbing.jcpp.proto.gen"; +option java_outer_classname = "DownlinkProto"; + +// 下行请求消息（从服务器到充电桩） +message DownlinkRequestMessage { + int64 messageIdMSB = 1; + int64 messageIdLSB = 2; + int64 sessionIdMSB = 3; + int64 sessionIdLSB = 4; + string protocolName = 6; + string pileCode = 7; + optional int64 requestIdMSB = 8; + optional int64 requestIdLSB = 9; + optional bytes requestData = 10; + string downlinkCmd = 20; + LoginResponse loginResponse = 21; + VerifyPricingResponse verifyPricingResponse = 22; + QueryPricingResponse queryPricingResponse = 23; + SetPricingRequest setPricingRequest = 24; + RemoteStartChargingRequest remoteStartChargingRequest = 25; + RemoteStopChargingRequest remoteStopChargingRequest = 26; + TransactionRecordResponse transactionRecordResponse = 27; + RestartPileRequest restartPileRequest = 28; + OtaRequest otaRequest = 29; + OfflineCardBalanceUpdateRequest offlineCardBalanceUpdateRequest = 30; + OfflineCardSyncRequest offlineCardSyncRequest = 31; + TimeSyncRequest timeSyncRequest = 32; + StartChargeResponse startChargeResponse = 33; +} + +// 下行响应消息 +message DownlinkResponseMessage { + bool success = 1; + optional string error = 2; +} + +// 登录响应 +message LoginResponse { + bool success = 1; + string pileCode = 2; +} + +// 启动充电响应 +message StartChargeResponse { + string tradeNo = 1; // 交易流水号 + string pileCode = 2; // 桩编号 + string gunCode = 3; // 枪编号 + string logicalCardNo = 4; // 逻辑卡号 + string limitYuan = 5; // 账户余额 + bool authSuccess = 6; // 鉴权成功标志 + string failReason = 7; // 失败原因 +} + +// 失败原因枚举 +enum FailReason { + SUCCESS = 0; // 成功 + ACCOUNT_NOT_EXISTS = 1; // 账户不存在 + ACCOUNT_FROZEN = 2; // 账户冻结 + INSUFFICIENT_BALANCE = 3; // 账户余额不足 + CARD_HAS_UNPAID_RECORD = 4; // 该卡存在未结账记录 + PILE_DISABLED = 5; // 桩停用 + ACCOUNT_NOT_ALLOWED_ON_PILE = 6; // 该账户不能在此桩上充电 + PASSWORD_ERROR = 7; // 密码错误 + INSUFFICIENT_STATION_CAPACITY = 8; // 电站电容不足 + VIN_CODE_NOT_EXISTS = 9; // 系统中vin码不存在 + PILE_HAS_UNPAID_RECORD = 10; // 该桩存在未结账记录 + PILE_NOT_SUPPORT_CARD = 11; // 该桩不支持该卡 +} + +// 校验计费响应 +message VerifyPricingResponse { + bool success = 1; + int64 pricingId = 30; +} + +// 查询计费响应 +message QueryPricingResponse { + string pileCode = 4; + int64 pricingId = 30; + PricingModelProto pricingModel = 1; +} + +// 计费模型配置 - 支持三种计费方式 +message PricingModelProto { + PricingModelType type = 3; // 计费类型：充电/放电 + PricingModelRule rule = 4; // 计费规则：标准/峰谷/时段 + + // 计费配置：根据rule字段确定使用哪种配置 + oneof pricing_config { + StandardPricingProto standardPricing = 5; // 标准计费：固定价格 + PeakValleyPricingProto peakValleyPricing = 6; // 峰谷计价：按尖峰平谷分时段 + TimePeriodPricingProto timePeriodPricing = 7; // 时段计价：自定义时段价格 + } +} + +// 时段定义 +message PeriodProto { + int32 sn = 1; + string begin = 2; + string end = 3; + PricingModelFlag flag = 4; +} + +// 标识价格 +message FlagPriceProto { + PricingModelFlag flag = 1; + string elec = 2; + string serv = 3; +} + +// 标准计费配置 - 全天统一价格 +message StandardPricingProto { + string elecPrice = 1; // 电费价格（元/度） + string servPrice = 2; // 服务费价格（元/度） +} + +// 峰谷计价配置 - 按电网峰谷政策分时计费 +message PeakValleyPricingProto { + map flagPrice = 1; // 各时段价格映射表 + repeated PeriodProto period = 2; // 时段划分配置 +} + +// 时段计价配置 - 运营商自定义时段计费 +message TimePeriodPricingProto { + repeated TimePeriodItemProto periods = 1; // 自定义时段列表 +} + +// 时段计价单个时段定义 +message TimePeriodItemProto { + int32 periodNo = 1; // 时段编号（从1开始） + string startTime = 2; // 开始时间（HH:mm:ss格式） + string endTime = 3; // 结束时间（HH:mm:ss格式） + string elecPrice = 4; // 该时段电费（元/度） + string servPrice = 5; // 该时段服务费（元/度） + optional string description = 6; // 时段名称（如"早高峰"） +} + +// 计费模型类型 +enum PricingModelType { + CHARGE = 0; // 充电费率模型 + DISCHARGE = 1; // 放电费率模型 +} + +// 计费模型规则 +enum PricingModelRule { + STANDARD = 0; // 标准计费：全天统一价格 + PEAK_VALLEY_PRICING = 1; // 峰谷计费：按电网峰谷政策 + TIME_PERIOD_PRICING = 2; // 时段计费：运营商自定义 +} + +// 计费模型标识 +enum PricingModelFlag { + TOP = 0; // 尖峰 + PEAK = 1; // 峰 + FLAT = 2; // 平 + VALLEY = 3; // 谷 + DEEP = 4; // 深谷 +} + +// 设置计费请求 +message SetPricingRequest { + string pileCode = 4; + int64 pricingId = 30; + PricingModelProto pricingModel = 1; +} + +// 远程启动充电请求 +message RemoteStartChargingRequest { + string pileCode = 4; + string gunCode = 5; + string tradeNo = 6; + string limitYuan = 7; + optional string logicalCardNo = 8; // 逻辑卡号 + optional string physicalCardNo = 9; // 物理卡号 + optional string parallelNo = 10; // 并充序号 + optional string additionalInfo = 20; +} + +// 远程停止充电请求 +message RemoteStopChargingRequest { + string pileCode = 4; + string gunCode = 5; +} + +// 交易记录响应 +message TransactionRecordResponse { + string tradeNo = 6; + bool success = 7; + optional string additionalInfo = 20; +} + +// 重启充电桩请求 +message RestartPileRequest { + string pileCode = 4; + int32 type = 7; + optional string additionalInfo = 20; +} + +// OTA升级请求 +message OtaRequest { + string pileCode = 1; // 桩编号 + int32 pileModel = 2; // 桩型号 + int32 pilePower = 3; // 桩功率 + string address = 4; // 升级服务器地址 + int32 port = 5; // 升级服务器端口 + string username = 6; // 用户名 + string password = 7; // 密码 + string filePath = 8; // 文件路径 + int32 executionControl = 9; // 执行控制 + int32 downloadTimeout = 10; // 下载超时时间 +} + +// 离线卡余额更新请求 +message OfflineCardBalanceUpdateRequest { + string pileCode = 1; // 充电桩编码 + string gunCode = 2; // 枪编号 + string cardNo = 3; // 物理卡号 + string limitYuan = 4; // 余额 +} + +// 离线卡同步请求 +message OfflineCardSyncRequest { + string pileCode = 1; // 充电桩编码 + int32 total = 2; // 下发卡个数 + repeated CardInfo cardInfo = 3; // 卡号集合 +} + +// 卡信息 +message CardInfo { + string cardNo = 1; // 物理卡号 + string logicCardNo = 2; // 逻辑卡号 +} + +// 时间同步请求 +message TimeSyncRequest { + string pileCode = 1; + string time = 2; +} diff --git a/jcpp-infrastructure-proto/src/main/proto/grpc.proto b/jcpp-infrastructure-proto/src/main/proto/grpc.proto new file mode 100644 index 0000000..d18e42c --- /dev/null +++ b/jcpp-infrastructure-proto/src/main/proto/grpc.proto @@ -0,0 +1,58 @@ +/** + * 开源代码，仅供学习和交流研究使用，商用请联系三丙 + * 微信：mohan_88888 + * 抖音：程序员三丙 + * 付费课程知识星球：https://t.zsxq.com/aKtXo + */ +syntax = "proto3"; + +package infrastructureProto; + +import "downlink.proto"; + +option java_package = "sanbing.jcpp.proto.gen"; +option java_outer_classname = "GrpcProto"; + +// gRPC 服务定义 +service ProtocolInterface { + rpc onDownlink(stream RequestMsg) returns (stream ResponseMsg) {} +} + +// gRPC 请求消息 +message RequestMsg { + int64 ts = 1; + TracerProto tracer = 2; + ConnectRequestMsg connectRequestMsg = 10; + DownlinkRequestMessage downlinkRequestMessage = 11; +} + +// gRPC 响应消息 +message ResponseMsg { + TracerProto tracer = 2; + ConnectResponseMsg connectResponseMsg = 12; + DownlinkResponseMessage downlinkResponseMsg = 13; +} + +// 连接请求消息 +message ConnectRequestMsg { + string nodeId = 1; +} + +// 连接响应消息 +message ConnectResponseMsg { + ConnectResponseCode responseCode = 1; + string errorMsg = 2; +} + +// 连接响应状态码 +enum ConnectResponseCode { + ACCEPTED = 0; + REFUSE = 1; +} + +// 追踪信息 +message TracerProto { + string id = 1; + string origin = 2; + int64 ts = 3; +} diff --git a/jcpp-infrastructure-proto/src/main/proto/protocol.proto b/jcpp-infrastructure-proto/src/main/proto/uplink.proto similarity index 58% rename from jcpp-infrastructure-proto/src/main/proto/protocol.proto rename to jcpp-infrastructure-proto/src/main/proto/uplink.proto index 0a434f6..262d957 100644 --- a/jcpp-infrastructure-proto/src/main/proto/protocol.proto +++ b/jcpp-infrastructure-proto/src/main/proto/uplink.proto @@ -9,45 +9,9 @@ syntax = "proto3"; package infrastructureProto; option java_package = "sanbing.jcpp.proto.gen"; -option java_outer_classname = "ProtocolProto"; - -service ProtocolInterface { - rpc onDownlink(stream RequestMsg) returns (stream ResponseMsg) {} -} - -message RequestMsg { - int64 ts = 1; - TracerProto tracer = 2; - ConnectRequestMsg connectRequestMsg = 10; - DownlinkRequestMessage downlinkRequestMessage = 11; -} - -message ResponseMsg { - TracerProto tracer = 2; - ConnectResponseMsg connectResponseMsg = 12; - DownlinkResponseMessage downlinkResponseMsg = 13; -} - -message ConnectResponseMsg { - ConnectResponseCode responseCode = 1; - string errorMsg = 2; -} - -message ConnectRequestMsg { - string nodeId = 1; -} - -enum ConnectResponseCode { - ACCEPTED = 0; - REFUSE = 1; -} - -message TracerProto { - string id = 1; - string origin = 2; - int64 ts = 3; -} +option java_outer_classname = "UplinkProto"; +// 上行队列消息（从充电桩到服务器） message UplinkQueueMessage { int64 messageIdMSB = 1; int64 messageIdLSB = 2; @@ -83,43 +47,14 @@ message UplinkQueueMessage { StartChargeRequest startChargeRequest = 44; } -message DownlinkRequestMessage { - int64 messageIdMSB = 1; - int64 messageIdLSB = 2; - int64 sessionIdMSB = 3; - int64 sessionIdLSB = 4; - string protocolName = 6; - string pileCode = 7; - optional int64 requestIdMSB = 8; - optional int64 requestIdLSB = 9; - optional bytes requestData = 10; - string downlinkCmd = 20; - LoginResponse loginResponse = 21; - VerifyPricingResponse verifyPricingResponse = 22; - QueryPricingResponse queryPricingResponse = 23; - SetPricingRequest setPricingRequest = 24; - RemoteStartChargingRequest remoteStartChargingRequest = 25; - RemoteStopChargingRequest remoteStopChargingRequest = 26; - TransactionRecordResponse transactionRecordResponse = 27; - RestartPileRequest restartPileRequest = 28; - OtaRequest otaRequest = 29; - OfflineCardBalanceUpdateRequest offlineCardBalanceUpdateRequest = 30; - OfflineCardSyncRequest offlineCardSyncRequest = 31; - TimeSyncRequest timeSyncRequest = 32; - StartChargeResponse startChargeResponse = 33; -} - -message DownlinkResponseMessage { - bool success = 1; - optional string error = 2; -} - +// 会话关闭事件 message SessionCloseEventProto { string pileCode = 2; // 充电桩编码 SessionCloseReason reason = 3; // 会话关闭原因 optional string additionalInfo = 20; // 附加信息 } +// 会话关闭原因枚举 enum SessionCloseReason { SESSION_CLOSE_UNKNOWN = 0; // 未知原因 SESSION_CLOSE_DESTRUCTION = 1; // 自然销毁（空闲超时） @@ -127,6 +62,7 @@ enum SessionCloseReason { SESSION_CLOSE_MANUALLY = 3; // 手动关闭 } +// 登录请求 message LoginRequest { string pileCode = 2; string credential = 3; @@ -138,6 +74,7 @@ message LoginRequest { optional string additionalInfo = 20; } +// 启动充电请求 message StartChargeRequest { int64 ts = 1; string pileCode = 2; // 桩编号 @@ -150,36 +87,7 @@ message StartChargeRequest { optional string additionalInfo = 20; // 附加信息 } -message StartChargeResponse { - string tradeNo = 1; // 交易流水号 - string pileCode = 2; // 桩编号 - string gunCode = 3; // 枪编号 - string logicalCardNo = 4; // 逻辑卡号 - string limitYuan = 5; // 账户余额 - bool authSuccess = 6; // 鉴权成功标志 - string failReason = 7; // 失败原因 -} - -enum FailReason { - SUCCESS = 0; // 成功 - ACCOUNT_NOT_EXISTS = 1; // 账户不存在 - ACCOUNT_FROZEN = 2; // 账户冻结 - INSUFFICIENT_BALANCE = 3; // 账户余额不足 - CARD_HAS_UNPAID_RECORD = 4; // 该卡存在未结账记录 - PILE_DISABLED = 5; // 桩停用 - ACCOUNT_NOT_ALLOWED_ON_PILE = 6; // 该账户不能在此桩上充电 - PASSWORD_ERROR = 7; // 密码错误 - INSUFFICIENT_STATION_CAPACITY = 8; // 电站电容不足 - VIN_CODE_NOT_EXISTS = 9; // 系统中vin码不存在 - PILE_HAS_UNPAID_RECORD = 10; // 该桩存在未结账记录 - PILE_NOT_SUPPORT_CARD = 11; // 该桩不支持该卡 -} - -message LoginResponse { - bool success = 1; - string pileCode = 2; -} - +// 心跳请求 message HeartBeatRequest { string pileCode = 3; string remoteAddress = 4; @@ -190,6 +98,7 @@ message HeartBeatRequest { optional string additionalInfo = 20; } +// 校验计费请求 message VerifyPricingRequest { string pileCode = 4; int64 pricingId = 30; @@ -197,94 +106,13 @@ message VerifyPricingRequest { optional string additionalInfo = 20; } -message VerifyPricingResponse { - bool success = 1; - int64 pricingId = 30; -} - +// 查询计费请求 message QueryPricingRequest { string pileCode = 4; optional string additionalInfo = 20; } -message QueryPricingResponse { - string pileCode = 4; - int64 pricingId = 30; - PricingModelProto pricingModel = 1; -} - -// 计费模型配置 - 支持三种计费方式 -message PricingModelProto { - PricingModelType type = 3; // 计费类型：充电/放电 - PricingModelRule rule = 4; // 计费规则：标准/峰谷/时段 - - // 计费配置：根据rule字段确定使用哪种配置 - oneof pricing_config { - StandardPricingProto standardPricing = 5; // 标准计费：固定价格 - PeakValleyPricingProto peakValleyPricing = 6; // 峰谷计价：按尖峰平谷分时段 - TimePeriodPricingProto timePeriodPricing = 7; // 时段计价：自定义时段价格 - } -} - -message PeriodProto { - int32 sn = 1; - string begin = 2; - string end = 3; - PricingModelFlag flag = 4; -} - -message FlagPriceProto { - PricingModelFlag flag = 1; - string elec = 2; - string serv = 3; -} - -// 标准计费配置 - 全天统一价格 -message StandardPricingProto { - string elecPrice = 1; // 电费价格（元/度） - string servPrice = 2; // 服务费价格（元/度） -} - -// 峰谷计价配置 - 按电网峰谷政策分时计费 -message PeakValleyPricingProto { - map flagPrice = 1; // 各时段价格映射表 - repeated PeriodProto period = 2; // 时段划分配置 -} - -// 时段计价配置 - 运营商自定义时段计费 -message TimePeriodPricingProto { - repeated TimePeriodItemProto periods = 1; // 自定义时段列表 -} - -// 时段计价单个时段定义 -message TimePeriodItemProto { - int32 periodNo = 1; // 时段编号（从1开始） - string startTime = 2; // 开始时间（HH:mm:ss格式） - string endTime = 3; // 结束时间（HH:mm:ss格式） - string elecPrice = 4; // 该时段电费（元/度） - string servPrice = 5; // 该时段服务费（元/度） - optional string description = 6; // 时段名称（如"早高峰"） -} - -enum PricingModelType { - CHARGE = 0; // 充电费率模型 - DISCHARGE = 1; // 放电费率模型 -} - -enum PricingModelRule { - STANDARD = 0; // 标准计费：全天统一价格 - PEAK_VALLEY_PRICING = 1; // 峰谷计费：按电网峰谷政策 - TIME_PERIOD_PRICING = 2; // 时段计费：运营商自定义 -} - -enum PricingModelFlag { - TOP = 0; // 尖峰 - PEAK = 1; // 峰 - FLAT = 2; // 平 - VALLEY = 3; // 谷 - DEEP = 4; // 深谷 -} - +// 枪运行状态枚举 enum GunRunStatus { IDLE = 0; // 空闲 INSERTED = 1; // 已插枪 @@ -298,6 +126,7 @@ enum GunRunStatus { UNKNOWN = 9; // 未知 } +// 枪运行状态消息 message GunRunStatusProto { string pileCode = 4; string gunCode = 5; @@ -306,6 +135,7 @@ message GunRunStatusProto { optional string additionalInfo = 20; } +// 充电进度消息 message ChargingProgressProto { string pileCode = 4; string gunCode = 5; @@ -319,35 +149,14 @@ message ChargingProgressProto { optional string additionalInfo = 20; } -message SetPricingRequest { - string pileCode = 4; - int64 pricingId = 30; - PricingModelProto pricingModel = 1; -} - +// 设置计费响应 message SetPricingResponse { bool success = 1; string pileCode = 4; int64 pricingId = 30; } -message RemoteStartChargingRequest { - string pileCode = 4; - string gunCode = 5; - string tradeNo = 6; - string limitYuan = 7; - optional string logicalCardNo = 8; // 逻辑卡号 - optional string physicalCardNo = 9; // 物理卡号 - optional string parallelNo = 10; // 并充序号 - optional string additionalInfo = 20; -} - -message RestartPileRequest { - string pileCode = 4; - int32 type = 7; - optional string additionalInfo = 20; -} - +// 远程启动充电响应 message RemoteStartChargingResponse { string pileCode = 4; string gunCode = 5; @@ -356,16 +165,14 @@ message RemoteStartChargingResponse { string failReason = 8; optional string additionalInfo = 20; } + +// 重启充电桩响应 message RestartPileResponse { string pileCode = 4; bool success = 7; } -message RemoteStopChargingRequest { - string pileCode = 4; - string gunCode = 5; -} - +// 远程停止充电响应 message RemoteStopChargingResponse { string pileCode = 4; string gunCode = 5; @@ -374,11 +181,13 @@ message RemoteStopChargingResponse { optional string additionalInfo = 20; } +// 明细类型枚举 enum DetailType { PEAK_VALLEY = 0; // 峰谷电量明细 TIME_PERIOD = 1; // 时段电量明细 } +// 峰谷电量明细 message PeakValleyDetail { string topEnergyKWh = 1; // 尖峰电量 string topAmountYuan = 2; // 尖峰电费 @@ -392,6 +201,7 @@ message PeakValleyDetail { string deepAmountYuan = 10; // 深谷电费 } +// 时段电量明细 message TimePeriodDetail { message PeriodItem { int32 periodNo = 1; // 时段序号，从1开始 @@ -403,12 +213,14 @@ message TimePeriodDetail { repeated PeriodItem periods = 1; // 时段列表 } +// 交易明细 message TransactionDetail { DetailType type = 1; // 明细类型 optional PeakValleyDetail peakValley = 2; // 峰谷电量明细 optional TimePeriodDetail timePeriod = 3; // 时段电量明细 } +// 交易记录请求 message TransactionRecordRequest { string pileCode = 4; // 充电桩编码 string gunCode = 5; // 枪编号 @@ -424,6 +236,7 @@ message TransactionRecordRequest { optional string additionalInfo = 20; // 附加信息 } +// BMS充电错误消息 message BmsChargingErrorProto { string pileCode = 4; string gunCode = 5; @@ -431,12 +244,7 @@ message BmsChargingErrorProto { optional string additionalInfo = 20; } -message TransactionRecordResponse { - string tradeNo = 6; - bool success = 7; - optional string additionalInfo = 20; -} - +// BMS参数配置上报 message BmsParamConfigReportProto { string pileCode = 2; // 桩编码 string gunCode = 3; // 枪编码 @@ -454,6 +262,7 @@ message BmsParamConfigReportProto { string pileMinOutputCurrent = 15; // 电桩最小输出电流 (A) } +// BMS充电信息 message BmsChargingInfoProto { string pileCode = 4; string gunCode = 5; @@ -461,26 +270,7 @@ message BmsChargingInfoProto { optional string additionalInfo = 20; } -message OtaRequest { - string pileCode = 1; // 桩编号 - int32 pileModel = 2; // 桩型号 - int32 pilePower = 3; // 桩功率 - string address = 4; // 升级服务器地址 - int32 port = 5; // 升级服务器端口 - string username = 6; // 用户名 - string password = 7; // 密码 - string filePath = 8; // 文件路径 - int32 executionControl = 9; // 执行控制 - int32 downloadTimeout = 10; // 下载超时时间 - -} - -message OtaResponse { - string pileCode = 1; // 桩编号 - bool success = 2; - optional string errorMsg = 3; -} - +// BMS中止充电 message BmsAbortProto { string pileCode = 4; string gunCode = 5; @@ -488,6 +278,7 @@ message BmsAbortProto { optional string additionalInfo = 20; } +// BMS握手信息 message BmsHandshakeProto { string pileCode = 2; // 桩编码 string gunCode = 3; // 枪编码 @@ -508,6 +299,14 @@ message BmsHandshakeProto { optional string additionalInfo = 20; // 附加信息 } +// OTA响应 +message OtaResponse { + string pileCode = 1; // 桩编号 + bool success = 2; + optional string errorMsg = 3; +} + +// 地锁状态上报 message GroundLockStatusProto { string pileCode = 2; // 桩编号 string gunCode = 3; // 枪号 @@ -519,13 +318,7 @@ message GroundLockStatusProto { optional string additionalInfo = 20; // 附加信息 } -message OfflineCardBalanceUpdateRequest { - string pileCode = 1; // 充电桩编码 - string gunCode = 2; // 枪编号 - string cardNo = 3; // 物理卡号 - string limitYuan = 4; // 余额 -} - +// 离线卡余额更新响应 message OfflineCardBalanceUpdateResponse { string pileCode = 1; // 充电桩编码 string cardNo = 2; // 物理卡号 @@ -533,37 +326,23 @@ message OfflineCardBalanceUpdateResponse { optional string errorMsg = 4; } -message OfflineCardSyncRequest { - string pileCode = 1; // 充电桩编码 - int32 total = 2; // 下发卡个数 - repeated CardInfo cardInfo = 3; // 卡号集合 -} - -message CardInfo { - string cardNo = 1; // 物理卡号 - string logicCardNo = 2; // 逻辑卡号 -} - - +// 离线卡同步响应 message OfflineCardSyncResponse { string pileCode = 1; // 充电桩编码 bool success = 3; optional string errorMsg = 4; } -message TimeSyncRequest { - string pileCode = 1; - string time = 2; -} - +// 时间同步响应 message TimeSyncResponse { string pileCode = 1; string time = 2; } +// BMS需求充电机输出 message BmsDemandChargerOutputProto { string pileCode = 4; string gunCode = 5; string tradeNo = 6; optional string additionalInfo = 20; -} \ No newline at end of file +} diff --git a/jcpp-infrastructure-queue/src/main/java/sanbing/jcpp/infrastructure/queue/provider/AppQueueFactory.java b/jcpp-infrastructure-queue/src/main/java/sanbing/jcpp/infrastructure/queue/provider/AppQueueFactory.java index 8f7799d..b22b6f9 100644 --- a/jcpp-infrastructure-queue/src/main/java/sanbing/jcpp/infrastructure/queue/provider/AppQueueFactory.java +++ b/jcpp-infrastructure-queue/src/main/java/sanbing/jcpp/infrastructure/queue/provider/AppQueueFactory.java @@ -10,7 +10,7 @@ package sanbing.jcpp.infrastructure.queue.provider; import sanbing.jcpp.infrastructure.queue.ProtoQueueMsg; import sanbing.jcpp.infrastructure.queue.QueueConsumer; import sanbing.jcpp.infrastructure.queue.QueueProducer; -import sanbing.jcpp.proto.gen.ProtocolProto.UplinkQueueMessage; +import sanbing.jcpp.proto.gen.UplinkProto.UplinkQueueMessage; public interface AppQueueFactory { diff --git a/jcpp-infrastructure-queue/src/main/java/sanbing/jcpp/infrastructure/queue/provider/InMemoryAppQueueFactory.java b/jcpp-infrastructure-queue/src/main/java/sanbing/jcpp/infrastructure/queue/provider/InMemoryAppQueueFactory.java index 1b04a7f..bbf3347 100644 --- a/jcpp-infrastructure-queue/src/main/java/sanbing/jcpp/infrastructure/queue/provider/InMemoryAppQueueFactory.java +++ b/jcpp-infrastructure-queue/src/main/java/sanbing/jcpp/infrastructure/queue/provider/InMemoryAppQueueFactory.java @@ -17,7 +17,7 @@ import sanbing.jcpp.infrastructure.queue.memory.InMemoryQueueConsumer; import sanbing.jcpp.infrastructure.queue.memory.InMemoryQueueProducer; import sanbing.jcpp.infrastructure.queue.memory.InMemoryStorage; import sanbing.jcpp.infrastructure.queue.settings.QueueAppSettings; -import sanbing.jcpp.proto.gen.ProtocolProto.UplinkQueueMessage; +import sanbing.jcpp.proto.gen.UplinkProto.UplinkQueueMessage; @Slf4j @Component diff --git a/jcpp-infrastructure-queue/src/main/java/sanbing/jcpp/infrastructure/queue/provider/KafkaAppQueueFactory.java b/jcpp-infrastructure-queue/src/main/java/sanbing/jcpp/infrastructure/queue/provider/KafkaAppQueueFactory.java index d270e34..a15890d 100644 --- a/jcpp-infrastructure-queue/src/main/java/sanbing/jcpp/infrastructure/queue/provider/KafkaAppQueueFactory.java +++ b/jcpp-infrastructure-queue/src/main/java/sanbing/jcpp/infrastructure/queue/provider/KafkaAppQueueFactory.java @@ -17,7 +17,7 @@ import sanbing.jcpp.infrastructure.queue.QueueProducer; import sanbing.jcpp.infrastructure.queue.discovery.ServiceInfoProvider; import sanbing.jcpp.infrastructure.queue.kafka.*; import sanbing.jcpp.infrastructure.queue.settings.QueueAppSettings; -import sanbing.jcpp.proto.gen.ProtocolProto.UplinkQueueMessage; +import sanbing.jcpp.proto.gen.UplinkProto.UplinkQueueMessage; @Component @ConditionalOnExpression("'${queue.type:null}'=='kafka'") diff --git a/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/adapter/DownlinkController.java b/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/adapter/DownlinkController.java index f9c04e9..1ea4dff 100644 --- a/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/adapter/DownlinkController.java +++ b/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/adapter/DownlinkController.java @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.context.request.async.DeferredResult; -import sanbing.jcpp.proto.gen.ProtocolProto.DownlinkRequestMessage; +import sanbing.jcpp.proto.gen.DownlinkProto.DownlinkRequestMessage; import sanbing.jcpp.protocol.domain.ProtocolSession; import sanbing.jcpp.protocol.provider.ProtocolSessionRegistryProvider; diff --git a/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/adapter/DownlinkGrpcService.java b/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/adapter/DownlinkGrpcService.java index 1b49348..39758ba 100644 --- a/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/adapter/DownlinkGrpcService.java +++ b/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/adapter/DownlinkGrpcService.java @@ -24,8 +24,9 @@ import org.springframework.stereotype.Service; import sanbing.jcpp.infrastructure.util.mdc.MDCUtils; import sanbing.jcpp.infrastructure.util.trace.TracerContextUtil; import sanbing.jcpp.infrastructure.util.trace.TracerRunnable; +import sanbing.jcpp.proto.gen.DownlinkProto.DownlinkRequestMessage; +import sanbing.jcpp.proto.gen.GrpcProto.*; import sanbing.jcpp.proto.gen.ProtocolInterfaceGrpc.ProtocolInterfaceImplBase; -import sanbing.jcpp.proto.gen.ProtocolProto.*; import sanbing.jcpp.protocol.domain.ProtocolSession; import sanbing.jcpp.protocol.provider.ProtocolSessionRegistryProvider; diff --git a/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/domain/ProtocolSession.java b/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/domain/ProtocolSession.java index 996988c..c818961 100644 --- a/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/domain/ProtocolSession.java +++ b/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/domain/ProtocolSession.java @@ -11,8 +11,10 @@ import com.github.benmanes.caffeine.cache.Caffeine; import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; -import sanbing.jcpp.proto.gen.ProtocolProto; -import sanbing.jcpp.proto.gen.ProtocolProto.DownlinkRequestMessage; +import sanbing.jcpp.proto.gen.DownlinkProto.DownlinkRequestMessage; +import sanbing.jcpp.proto.gen.UplinkProto.SessionCloseEventProto; +import sanbing.jcpp.proto.gen.UplinkProto.SessionCloseReason; +import sanbing.jcpp.proto.gen.UplinkProto.UplinkQueueMessage; import sanbing.jcpp.protocol.forwarder.Forwarder; import java.io.Closeable; @@ -66,10 +68,10 @@ public abstract class ProtocolSession implements Closeable { @Override public void close() { - close(ProtocolProto.SessionCloseReason.SESSION_CLOSE_DESTRUCTION); + close(SessionCloseReason.SESSION_CLOSE_DESTRUCTION); } - public void close(ProtocolProto.SessionCloseReason reason) { + public void close(SessionCloseReason reason) { log.info("[{}] Protocol会话关闭，原因: {}", this, reason); scheduledFutures.values().forEach(scheduledFuture -> scheduledFuture.cancel(true)); @@ -79,13 +81,13 @@ public abstract class ProtocolSession implements Closeable { if (forwarder != null && !pileCodeSet.isEmpty()) { for (String pileCode : pileCodeSet) { - ProtocolProto.SessionCloseEventProto sessionCloseEvent = ProtocolProto.SessionCloseEventProto.newBuilder() + SessionCloseEventProto sessionCloseEvent = SessionCloseEventProto.newBuilder() .setPileCode(pileCode) .setReason(reason) .setAdditionalInfo("Session closed: " + reason) .build(); - ProtocolProto.UplinkQueueMessage uplinkQueueMessage = ProtocolProto.UplinkQueueMessage.newBuilder() + UplinkQueueMessage uplinkQueueMessage = UplinkQueueMessage.newBuilder() .setMessageIdMSB(UUID.randomUUID().getMostSignificantBits()) .setMessageIdLSB(UUID.randomUUID().getLeastSignificantBits()) .setSessionIdMSB(id.getMostSignificantBits()) diff --git a/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/domain/SessionToHandlerMsg.java b/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/domain/SessionToHandlerMsg.java index 6e4784f..97d4a69 100644 --- a/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/domain/SessionToHandlerMsg.java +++ b/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/domain/SessionToHandlerMsg.java @@ -6,7 +6,7 @@ */ package sanbing.jcpp.protocol.domain; -import sanbing.jcpp.proto.gen.ProtocolProto.DownlinkRequestMessage; +import sanbing.jcpp.proto.gen.DownlinkProto.DownlinkRequestMessage; /** * @author 九筒 diff --git a/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/forwarder/Forwarder.java b/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/forwarder/Forwarder.java index c6dca70..82ef552 100644 --- a/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/forwarder/Forwarder.java +++ b/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/forwarder/Forwarder.java @@ -22,7 +22,7 @@ import sanbing.jcpp.infrastructure.util.jackson.JacksonUtil; import sanbing.jcpp.infrastructure.util.mdc.MDCUtils; import sanbing.jcpp.infrastructure.util.trace.Tracer; import sanbing.jcpp.infrastructure.util.trace.TracerContextUtil; -import sanbing.jcpp.proto.gen.ProtocolProto.UplinkQueueMessage; +import sanbing.jcpp.proto.gen.UplinkProto.UplinkQueueMessage; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.BiConsumer; diff --git a/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/forwarder/KafkaForwarder.java b/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/forwarder/KafkaForwarder.java index bd40723..f62f6d3 100644 --- a/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/forwarder/KafkaForwarder.java +++ b/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/forwarder/KafkaForwarder.java @@ -30,7 +30,7 @@ import sanbing.jcpp.infrastructure.util.jackson.JacksonUtil; import sanbing.jcpp.infrastructure.util.mdc.MDCUtils; import sanbing.jcpp.infrastructure.util.trace.Tracer; import sanbing.jcpp.infrastructure.util.trace.TracerContextUtil; -import sanbing.jcpp.proto.gen.ProtocolProto.UplinkQueueMessage; +import sanbing.jcpp.proto.gen.UplinkProto.UplinkQueueMessage; import sanbing.jcpp.protocol.cfg.ForwarderCfg; import sanbing.jcpp.protocol.cfg.KafkaCfg; diff --git a/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/forwarder/MemoryForwarder.java b/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/forwarder/MemoryForwarder.java index 19a72ae..9e1eb99 100644 --- a/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/forwarder/MemoryForwarder.java +++ b/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/forwarder/MemoryForwarder.java @@ -13,7 +13,7 @@ import sanbing.jcpp.infrastructure.queue.discovery.PartitionProvider; import sanbing.jcpp.infrastructure.queue.discovery.ServiceInfoProvider; import sanbing.jcpp.infrastructure.queue.provider.AppQueueFactory; import sanbing.jcpp.infrastructure.stats.StatsFactory; -import sanbing.jcpp.proto.gen.ProtocolProto.UplinkQueueMessage; +import sanbing.jcpp.proto.gen.UplinkProto.UplinkQueueMessage; import sanbing.jcpp.protocol.cfg.ForwarderCfg; import sanbing.jcpp.protocol.cfg.MemoryCfg; diff --git a/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/listener/tcp/TcpChannelHandler.java b/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/listener/tcp/TcpChannelHandler.java index a05a5db..0e0289f 100644 --- a/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/listener/tcp/TcpChannelHandler.java +++ b/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/listener/tcp/TcpChannelHandler.java @@ -20,8 +20,8 @@ import sanbing.jcpp.infrastructure.stats.MessagesStats; import sanbing.jcpp.infrastructure.util.exception.DownlinkException; import sanbing.jcpp.infrastructure.util.jackson.JacksonUtil; import sanbing.jcpp.infrastructure.util.trace.TracerContextUtil; -import sanbing.jcpp.proto.gen.ProtocolProto.DownlinkRequestMessage; -import sanbing.jcpp.proto.gen.ProtocolProto.SessionCloseReason; +import sanbing.jcpp.proto.gen.DownlinkProto.DownlinkRequestMessage; +import sanbing.jcpp.proto.gen.UplinkProto.SessionCloseReason; import sanbing.jcpp.protocol.ProtocolMessageProcessor; import sanbing.jcpp.protocol.domain.ListenerToHandlerMsg; import sanbing.jcpp.protocol.domain.ProtocolUplinkMsg; diff --git a/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/listener/tcp/TcpSession.java b/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/listener/tcp/TcpSession.java index 1320c2d..6a881e9 100644 --- a/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/listener/tcp/TcpSession.java +++ b/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/listener/tcp/TcpSession.java @@ -11,9 +11,8 @@ import io.netty.channel.ChannelHandlerContext; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; -import sanbing.jcpp.proto.gen.ProtocolProto; -import sanbing.jcpp.proto.gen.ProtocolProto.DownlinkRequestMessage; -import sanbing.jcpp.proto.gen.ProtocolProto.SessionCloseReason; +import sanbing.jcpp.proto.gen.DownlinkProto.DownlinkRequestMessage; +import sanbing.jcpp.proto.gen.UplinkProto.SessionCloseReason; import sanbing.jcpp.protocol.domain.ProtocolSession; import sanbing.jcpp.protocol.listener.tcp.enums.SequenceNumberLength; @@ -83,7 +82,7 @@ public class TcpSession extends ProtocolSession { } @Override - public void close(ProtocolProto.SessionCloseReason reason) { + public void close(SessionCloseReason reason) { super.close(reason); ctx.flush(); diff --git a/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/provider/impl/DefaultProtocolSessionRegistryProvider.java b/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/provider/impl/DefaultProtocolSessionRegistryProvider.java index 80eacd3..55e2226 100644 --- a/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/provider/impl/DefaultProtocolSessionRegistryProvider.java +++ b/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/provider/impl/DefaultProtocolSessionRegistryProvider.java @@ -16,7 +16,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import sanbing.jcpp.infrastructure.util.async.JCPPThreadFactory; import sanbing.jcpp.infrastructure.util.config.ThreadPoolConfiguration; -import sanbing.jcpp.proto.gen.ProtocolProto.SessionCloseReason; +import sanbing.jcpp.proto.gen.UplinkProto.SessionCloseReason; import sanbing.jcpp.protocol.domain.ProtocolSession; import sanbing.jcpp.protocol.provider.ProtocolSessionRegistryProvider; diff --git a/jcpp-protocol-bootstrap/src/test/java/sanbing/jcpp/protocol/adapter/DownlinkControllerIT.java b/jcpp-protocol-bootstrap/src/test/java/sanbing/jcpp/protocol/adapter/DownlinkControllerIT.java index e2223e7..730d70b 100644 --- a/jcpp-protocol-bootstrap/src/test/java/sanbing/jcpp/protocol/adapter/DownlinkControllerIT.java +++ b/jcpp-protocol-bootstrap/src/test/java/sanbing/jcpp/protocol/adapter/DownlinkControllerIT.java @@ -22,8 +22,8 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatus; import sanbing.jcpp.infrastructure.util.jackson.JacksonUtil; import sanbing.jcpp.infrastructure.util.property.PropertyUtils; -import sanbing.jcpp.proto.gen.ProtocolProto.DownlinkRequestMessage; -import sanbing.jcpp.proto.gen.ProtocolProto.RemoteStartChargingRequest; +import sanbing.jcpp.proto.gen.DownlinkProto.DownlinkRequestMessage; +import sanbing.jcpp.proto.gen.DownlinkProto.RemoteStartChargingRequest; import sanbing.jcpp.protocol.AbstractProtocolTestBase; import sanbing.jcpp.protocol.domain.DownlinkCmdEnum; import sanbing.jcpp.protocol.domain.ProtocolSession; diff --git a/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/LvnengDwonlinkMessage.java b/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/LvnengDwonlinkMessage.java index 1c9a7f9..35ae307 100644 --- a/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/LvnengDwonlinkMessage.java +++ b/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/LvnengDwonlinkMessage.java @@ -9,7 +9,7 @@ package sanbing.jcpp.protocol.lvneng; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; -import sanbing.jcpp.proto.gen.ProtocolProto.DownlinkRequestMessage; +import sanbing.jcpp.proto.gen.DownlinkProto.DownlinkRequestMessage; import java.io.Serializable; import java.util.UUID; diff --git a/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/LvnengProtocolMessageProcessor.java b/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/LvnengProtocolMessageProcessor.java index 30d0e5a..7ae084b 100644 --- a/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/LvnengProtocolMessageProcessor.java +++ b/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/LvnengProtocolMessageProcessor.java @@ -13,7 +13,7 @@ import lombok.extern.slf4j.Slf4j; import sanbing.jcpp.infrastructure.util.JCPPPair; import sanbing.jcpp.infrastructure.util.codec.ByteUtil; import sanbing.jcpp.infrastructure.util.jackson.JacksonUtil; -import sanbing.jcpp.proto.gen.ProtocolProto.DownlinkRequestMessage; +import sanbing.jcpp.proto.gen.DownlinkProto.DownlinkRequestMessage; import sanbing.jcpp.protocol.ProtocolContext; import sanbing.jcpp.protocol.ProtocolMessageProcessor; import sanbing.jcpp.protocol.domain.DownlinkCmdEnum; diff --git a/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/LvnengUplinkCmdExe.java b/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/LvnengUplinkCmdExe.java index db658bd..213d39c 100644 --- a/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/LvnengUplinkCmdExe.java +++ b/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/LvnengUplinkCmdExe.java @@ -10,7 +10,7 @@ import com.google.protobuf.ByteString; import lombok.extern.slf4j.Slf4j; import sanbing.jcpp.infrastructure.util.jackson.JacksonUtil; import sanbing.jcpp.infrastructure.util.trace.TracerContextUtil; -import sanbing.jcpp.proto.gen.ProtocolProto.UplinkQueueMessage; +import sanbing.jcpp.proto.gen.UplinkProto.UplinkQueueMessage; import sanbing.jcpp.protocol.ProtocolContext; import sanbing.jcpp.protocol.listener.tcp.TcpSession; diff --git a/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/v340/cmd/LvnengV340HeartbeatULCmd.java b/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/v340/cmd/LvnengV340HeartbeatULCmd.java index 97d3682..cd9ffe8 100644 --- a/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/v340/cmd/LvnengV340HeartbeatULCmd.java +++ b/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/v340/cmd/LvnengV340HeartbeatULCmd.java @@ -12,8 +12,8 @@ import io.netty.buffer.Unpooled; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import sanbing.jcpp.infrastructure.util.jackson.JacksonUtil; -import sanbing.jcpp.proto.gen.ProtocolProto.HeartBeatRequest; -import sanbing.jcpp.proto.gen.ProtocolProto.UplinkQueueMessage; +import sanbing.jcpp.proto.gen.UplinkProto.HeartBeatRequest; +import sanbing.jcpp.proto.gen.UplinkProto.UplinkQueueMessage; import sanbing.jcpp.protocol.ProtocolContext; import sanbing.jcpp.protocol.annotation.ProtocolCmd; import sanbing.jcpp.protocol.listener.tcp.TcpSession; diff --git a/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/v340/cmd/LvnengV340LoginAckDLCmd.java b/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/v340/cmd/LvnengV340LoginAckDLCmd.java index 2873d52..6ba471b 100644 --- a/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/v340/cmd/LvnengV340LoginAckDLCmd.java +++ b/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/v340/cmd/LvnengV340LoginAckDLCmd.java @@ -14,7 +14,7 @@ import sanbing.jcpp.infrastructure.util.codec.BCDUtil; import sanbing.jcpp.infrastructure.util.jackson.JacksonUtil; import sanbing.jcpp.infrastructure.util.mdc.MDCUtils; import sanbing.jcpp.infrastructure.util.trace.TracerContextUtil; -import sanbing.jcpp.proto.gen.ProtocolProto.LoginResponse; +import sanbing.jcpp.proto.gen.DownlinkProto.LoginResponse; import sanbing.jcpp.protocol.ProtocolContext; import sanbing.jcpp.protocol.annotation.ProtocolCmd; import sanbing.jcpp.protocol.listener.tcp.TcpSession; @@ -28,7 +28,7 @@ import java.util.Arrays; import java.util.concurrent.TimeUnit; import static sanbing.jcpp.infrastructure.util.config.ThreadPoolConfiguration.PROTOCOL_SESSION_SCHEDULED; -import static sanbing.jcpp.proto.gen.ProtocolProto.SessionCloseReason.SESSION_CLOSE_MANUALLY; +import static sanbing.jcpp.proto.gen.UplinkProto.SessionCloseReason.SESSION_CLOSE_MANUALLY; import static sanbing.jcpp.protocol.domain.DownlinkCmdEnum.LOGIN_ACK; import static sanbing.jcpp.protocol.domain.DownlinkCmdEnum.SYNC_TIME_REQUEST; import static sanbing.jcpp.protocol.listener.tcp.TcpSession.SCHEDULE_KEY_AUTO_SYNC_TIME; diff --git a/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/v340/cmd/LvnengV340LoginULCmd.java b/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/v340/cmd/LvnengV340LoginULCmd.java index 7e85ce1..74de6c0 100644 --- a/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/v340/cmd/LvnengV340LoginULCmd.java +++ b/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/v340/cmd/LvnengV340LoginULCmd.java @@ -13,8 +13,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import sanbing.jcpp.infrastructure.util.codec.BCDUtil; import sanbing.jcpp.infrastructure.util.jackson.JacksonUtil; -import sanbing.jcpp.proto.gen.ProtocolProto.LoginRequest; -import sanbing.jcpp.proto.gen.ProtocolProto.UplinkQueueMessage; +import sanbing.jcpp.proto.gen.UplinkProto.LoginRequest; +import sanbing.jcpp.proto.gen.UplinkProto.UplinkQueueMessage; import sanbing.jcpp.protocol.ProtocolContext; import sanbing.jcpp.protocol.annotation.ProtocolCmd; import sanbing.jcpp.protocol.listener.tcp.TcpSession; diff --git a/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/v340/cmd/LvnengV340RealTimeDataULCmd.java b/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/v340/cmd/LvnengV340RealTimeDataULCmd.java index 00157d9..0faf7d6 100644 --- a/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/v340/cmd/LvnengV340RealTimeDataULCmd.java +++ b/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/v340/cmd/LvnengV340RealTimeDataULCmd.java @@ -13,10 +13,10 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import sanbing.jcpp.infrastructure.util.codec.BCDUtil; import sanbing.jcpp.infrastructure.util.jackson.JacksonUtil; -import sanbing.jcpp.proto.gen.ProtocolProto.ChargingProgressProto; -import sanbing.jcpp.proto.gen.ProtocolProto.GunRunStatus; -import sanbing.jcpp.proto.gen.ProtocolProto.GunRunStatusProto; -import sanbing.jcpp.proto.gen.ProtocolProto.UplinkQueueMessage; +import sanbing.jcpp.proto.gen.UplinkProto.ChargingProgressProto; +import sanbing.jcpp.proto.gen.UplinkProto.GunRunStatus; +import sanbing.jcpp.proto.gen.UplinkProto.GunRunStatusProto; +import sanbing.jcpp.proto.gen.UplinkProto.UplinkQueueMessage; import sanbing.jcpp.protocol.ProtocolContext; import sanbing.jcpp.protocol.annotation.ProtocolCmd; import sanbing.jcpp.protocol.listener.tcp.TcpSession; diff --git a/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/v340/cmd/LvnengV340TransactionRecordAckDLCmd.java b/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/v340/cmd/LvnengV340TransactionRecordAckDLCmd.java index 9c0052a..a65d5f0 100644 --- a/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/v340/cmd/LvnengV340TransactionRecordAckDLCmd.java +++ b/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/v340/cmd/LvnengV340TransactionRecordAckDLCmd.java @@ -10,7 +10,7 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import lombok.extern.slf4j.Slf4j; import sanbing.jcpp.infrastructure.util.jackson.JacksonUtil; -import sanbing.jcpp.proto.gen.ProtocolProto.TransactionRecordResponse; +import sanbing.jcpp.proto.gen.DownlinkProto.TransactionRecordResponse; import sanbing.jcpp.protocol.ProtocolContext; import sanbing.jcpp.protocol.annotation.ProtocolCmd; import sanbing.jcpp.protocol.listener.tcp.TcpSession; diff --git a/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/v340/cmd/LvnengV340TransactionRecordULCmd.java b/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/v340/cmd/LvnengV340TransactionRecordULCmd.java index 6eee3de..cfdd25a 100644 --- a/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/v340/cmd/LvnengV340TransactionRecordULCmd.java +++ b/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/v340/cmd/LvnengV340TransactionRecordULCmd.java @@ -13,8 +13,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import sanbing.jcpp.infrastructure.util.codec.BCDUtil; import sanbing.jcpp.infrastructure.util.jackson.JacksonUtil; -import sanbing.jcpp.proto.gen.ProtocolProto.*; -import sanbing.jcpp.proto.gen.ProtocolProto.TimePeriodDetail.PeriodItem; +import sanbing.jcpp.proto.gen.UplinkProto.*; +import sanbing.jcpp.proto.gen.UplinkProto.TimePeriodDetail.PeriodItem; import sanbing.jcpp.protocol.ProtocolContext; import sanbing.jcpp.protocol.annotation.ProtocolCmd; import sanbing.jcpp.protocol.listener.tcp.TcpSession; diff --git a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/AbstractYunKuaiChongCmdExe.java b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/AbstractYunKuaiChongCmdExe.java index 382bfc7..feca495 100644 --- a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/AbstractYunKuaiChongCmdExe.java +++ b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/AbstractYunKuaiChongCmdExe.java @@ -11,7 +11,7 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import org.apache.commons.lang3.StringUtils; import sanbing.jcpp.infrastructure.util.codec.BCDUtil; -import sanbing.jcpp.proto.gen.ProtocolProto.PeriodProto; +import sanbing.jcpp.proto.gen.DownlinkProto.PeriodProto; import sanbing.jcpp.protocol.domain.DownlinkCmdEnum; import sanbing.jcpp.protocol.listener.tcp.TcpSession; import sanbing.jcpp.protocol.listener.tcp.enums.SequenceNumberLength; diff --git a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/YunKuaiChongDwonlinkMessage.java b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/YunKuaiChongDwonlinkMessage.java index c2df4cb..cb61443 100644 --- a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/YunKuaiChongDwonlinkMessage.java +++ b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/YunKuaiChongDwonlinkMessage.java @@ -9,7 +9,7 @@ package sanbing.jcpp.protocol.yunkuaichong; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; -import sanbing.jcpp.proto.gen.ProtocolProto.DownlinkRequestMessage; +import sanbing.jcpp.proto.gen.DownlinkProto.DownlinkRequestMessage; import java.io.Serializable; import java.util.UUID; diff --git a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/YunKuaiChongProtocolMessageProcessor.java b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/YunKuaiChongProtocolMessageProcessor.java index 2edb4eb..5ba4489 100644 --- a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/YunKuaiChongProtocolMessageProcessor.java +++ b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/YunKuaiChongProtocolMessageProcessor.java @@ -13,7 +13,7 @@ import io.netty.buffer.Unpooled; import lombok.extern.slf4j.Slf4j; import sanbing.jcpp.infrastructure.util.JCPPPair; import sanbing.jcpp.infrastructure.util.jackson.JacksonUtil; -import sanbing.jcpp.proto.gen.ProtocolProto.DownlinkRequestMessage; +import sanbing.jcpp.proto.gen.DownlinkProto.DownlinkRequestMessage; import sanbing.jcpp.protocol.ProtocolContext; import sanbing.jcpp.protocol.ProtocolMessageProcessor; import sanbing.jcpp.protocol.domain.DownlinkCmdEnum; diff --git a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/YunKuaiChongUplinkCmdExe.java b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/YunKuaiChongUplinkCmdExe.java index cd6b046..7f913c6 100644 --- a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/YunKuaiChongUplinkCmdExe.java +++ b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/YunKuaiChongUplinkCmdExe.java @@ -10,7 +10,7 @@ import com.google.protobuf.ByteString; import lombok.extern.slf4j.Slf4j; import sanbing.jcpp.infrastructure.util.jackson.JacksonUtil; import sanbing.jcpp.infrastructure.util.trace.TracerContextUtil; -import sanbing.jcpp.proto.gen.ProtocolProto.UplinkQueueMessage; +import sanbing.jcpp.proto.gen.UplinkProto.UplinkQueueMessage; import sanbing.jcpp.protocol.ProtocolContext; import sanbing.jcpp.protocol.listener.tcp.TcpSession; diff --git a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150BmsAbortULCmd.java b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150BmsAbortULCmd.java index 86383ab..9717d14 100644 --- a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150BmsAbortULCmd.java +++ b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150BmsAbortULCmd.java @@ -14,8 +14,8 @@ 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.BmsAbortProto; -import sanbing.jcpp.proto.gen.ProtocolProto.UplinkQueueMessage; +import sanbing.jcpp.proto.gen.UplinkProto.BmsAbortProto; +import sanbing.jcpp.proto.gen.UplinkProto.UplinkQueueMessage; import sanbing.jcpp.protocol.ProtocolContext; import sanbing.jcpp.protocol.annotation.ProtocolCmd; import sanbing.jcpp.protocol.listener.tcp.TcpSession; diff --git a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150BmsChargingErrorULCmd.java b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150BmsChargingErrorULCmd.java index bdedfe6..6eee199 100644 --- a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150BmsChargingErrorULCmd.java +++ b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150BmsChargingErrorULCmd.java @@ -12,8 +12,8 @@ import io.netty.buffer.Unpooled; 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.BmsChargingErrorProto; -import sanbing.jcpp.proto.gen.ProtocolProto.UplinkQueueMessage; +import sanbing.jcpp.proto.gen.UplinkProto.BmsChargingErrorProto; +import sanbing.jcpp.proto.gen.UplinkProto.UplinkQueueMessage; import sanbing.jcpp.protocol.ProtocolContext; import sanbing.jcpp.protocol.annotation.ProtocolCmd; import sanbing.jcpp.protocol.listener.tcp.TcpSession; diff --git a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150BmsChargingInfoULCmd.java b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150BmsChargingInfoULCmd.java index ed95e72..68b019b 100644 --- a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150BmsChargingInfoULCmd.java +++ b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150BmsChargingInfoULCmd.java @@ -12,8 +12,8 @@ import io.netty.buffer.Unpooled; 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.BmsChargingInfoProto; -import sanbing.jcpp.proto.gen.ProtocolProto.UplinkQueueMessage; +import sanbing.jcpp.proto.gen.UplinkProto.BmsChargingInfoProto; +import sanbing.jcpp.proto.gen.UplinkProto.UplinkQueueMessage; import sanbing.jcpp.protocol.ProtocolContext; import sanbing.jcpp.protocol.annotation.ProtocolCmd; import sanbing.jcpp.protocol.listener.tcp.TcpSession; diff --git a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150BmsDemandChargerOutputULCmd.java b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150BmsDemandChargerOutputULCmd.java index 933fcb7..311dc13 100644 --- a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150BmsDemandChargerOutputULCmd.java +++ b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150BmsDemandChargerOutputULCmd.java @@ -13,8 +13,8 @@ import lombok.extern.slf4j.Slf4j; import sanbing.jcpp.infrastructure.util.codec.BCDUtil; import sanbing.jcpp.infrastructure.util.jackson.JacksonUtil; import sanbing.jcpp.infrastructure.util.trace.TracerContextUtil; -import sanbing.jcpp.proto.gen.ProtocolProto.BmsDemandChargerOutputProto; -import sanbing.jcpp.proto.gen.ProtocolProto.UplinkQueueMessage; +import sanbing.jcpp.proto.gen.UplinkProto.BmsDemandChargerOutputProto; +import sanbing.jcpp.proto.gen.UplinkProto.UplinkQueueMessage; import sanbing.jcpp.protocol.ProtocolContext; import sanbing.jcpp.protocol.annotation.ProtocolCmd; import sanbing.jcpp.protocol.listener.tcp.TcpSession; diff --git a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150BmsHandshakeULCmd.java b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150BmsHandshakeULCmd.java index c52913a..3d6da89 100644 --- a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150BmsHandshakeULCmd.java +++ b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150BmsHandshakeULCmd.java @@ -13,8 +13,8 @@ import io.netty.buffer.Unpooled; 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.BmsHandshakeProto; -import sanbing.jcpp.proto.gen.ProtocolProto.UplinkQueueMessage; +import sanbing.jcpp.proto.gen.UplinkProto.BmsHandshakeProto; +import sanbing.jcpp.proto.gen.UplinkProto.UplinkQueueMessage; import sanbing.jcpp.protocol.ProtocolContext; import sanbing.jcpp.protocol.annotation.ProtocolCmd; import sanbing.jcpp.protocol.listener.tcp.TcpSession; diff --git a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150BmsParamConfigReportULCmd.java b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150BmsParamConfigReportULCmd.java index c7077c7..9790147 100644 --- a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150BmsParamConfigReportULCmd.java +++ b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150BmsParamConfigReportULCmd.java @@ -10,8 +10,8 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import lombok.extern.slf4j.Slf4j; import sanbing.jcpp.infrastructure.util.codec.BCDUtil; -import sanbing.jcpp.proto.gen.ProtocolProto.BmsParamConfigReportProto; -import sanbing.jcpp.proto.gen.ProtocolProto.UplinkQueueMessage; +import sanbing.jcpp.proto.gen.UplinkProto.BmsParamConfigReportProto; +import sanbing.jcpp.proto.gen.UplinkProto.UplinkQueueMessage; import sanbing.jcpp.protocol.ProtocolContext; import sanbing.jcpp.protocol.annotation.ProtocolCmd; import sanbing.jcpp.protocol.listener.tcp.TcpSession; diff --git a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150HeartbeatULCmd.java b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150HeartbeatULCmd.java index 112bd57..3f20018 100644 --- a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150HeartbeatULCmd.java +++ b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150HeartbeatULCmd.java @@ -12,8 +12,8 @@ import io.netty.buffer.Unpooled; 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.HeartBeatRequest; -import sanbing.jcpp.proto.gen.ProtocolProto.UplinkQueueMessage; +import sanbing.jcpp.proto.gen.UplinkProto.HeartBeatRequest; +import sanbing.jcpp.proto.gen.UplinkProto.UplinkQueueMessage; import sanbing.jcpp.protocol.ProtocolContext; import sanbing.jcpp.protocol.annotation.ProtocolCmd; import sanbing.jcpp.protocol.listener.tcp.TcpSession; diff --git a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150LockStatusULCmd.java b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150LockStatusULCmd.java index 4198bbb..1d6699f 100644 --- a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150LockStatusULCmd.java +++ b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150LockStatusULCmd.java @@ -10,8 +10,8 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import lombok.extern.slf4j.Slf4j; import sanbing.jcpp.infrastructure.util.codec.BCDUtil; -import sanbing.jcpp.proto.gen.ProtocolProto.GroundLockStatusProto; -import sanbing.jcpp.proto.gen.ProtocolProto.UplinkQueueMessage; +import sanbing.jcpp.proto.gen.UplinkProto.GroundLockStatusProto; +import sanbing.jcpp.proto.gen.UplinkProto.UplinkQueueMessage; import sanbing.jcpp.protocol.ProtocolContext; import sanbing.jcpp.protocol.annotation.ProtocolCmd; import sanbing.jcpp.protocol.listener.tcp.TcpSession; diff --git a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150LoginAckDLCmd.java b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150LoginAckDLCmd.java index e227de7..e3f14c9 100644 --- a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150LoginAckDLCmd.java +++ b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150LoginAckDLCmd.java @@ -14,7 +14,7 @@ import sanbing.jcpp.infrastructure.util.codec.CP56Time2aUtil; import sanbing.jcpp.infrastructure.util.jackson.JacksonUtil; import sanbing.jcpp.infrastructure.util.mdc.MDCUtils; import sanbing.jcpp.infrastructure.util.trace.TracerContextUtil; -import sanbing.jcpp.proto.gen.ProtocolProto.LoginResponse; +import sanbing.jcpp.proto.gen.DownlinkProto.LoginResponse; import sanbing.jcpp.protocol.ProtocolContext; import sanbing.jcpp.protocol.annotation.ProtocolCmd; import sanbing.jcpp.protocol.listener.tcp.TcpSession; @@ -28,7 +28,7 @@ import java.util.Arrays; import java.util.concurrent.TimeUnit; import static sanbing.jcpp.infrastructure.util.config.ThreadPoolConfiguration.PROTOCOL_SESSION_SCHEDULED; -import static sanbing.jcpp.proto.gen.ProtocolProto.SessionCloseReason.SESSION_CLOSE_MANUALLY; +import static sanbing.jcpp.proto.gen.UplinkProto.SessionCloseReason.SESSION_CLOSE_MANUALLY; import static sanbing.jcpp.protocol.domain.DownlinkCmdEnum.LOGIN_ACK; import static sanbing.jcpp.protocol.domain.DownlinkCmdEnum.SYNC_TIME_REQUEST; import static sanbing.jcpp.protocol.listener.tcp.TcpSession.SCHEDULE_KEY_AUTO_SYNC_TIME; diff --git a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150LoginULCmd.java b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150LoginULCmd.java index 9c5d59d..a06eb12 100644 --- a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150LoginULCmd.java +++ b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150LoginULCmd.java @@ -12,8 +12,8 @@ import io.netty.buffer.Unpooled; 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.LoginRequest; -import sanbing.jcpp.proto.gen.ProtocolProto.UplinkQueueMessage; +import sanbing.jcpp.proto.gen.UplinkProto.LoginRequest; +import sanbing.jcpp.proto.gen.UplinkProto.UplinkQueueMessage; import sanbing.jcpp.protocol.ProtocolContext; import sanbing.jcpp.protocol.annotation.ProtocolCmd; import sanbing.jcpp.protocol.listener.tcp.TcpSession; diff --git a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150OfflineCardBalanceUpdateRequestDLCmd.java b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150OfflineCardBalanceUpdateRequestDLCmd.java index fa5be7d..5063d28 100644 --- a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150OfflineCardBalanceUpdateRequestDLCmd.java +++ b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150OfflineCardBalanceUpdateRequestDLCmd.java @@ -10,7 +10,7 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import lombok.extern.slf4j.Slf4j; import sanbing.jcpp.infrastructure.util.codec.BCDUtil; -import sanbing.jcpp.proto.gen.ProtocolProto.OfflineCardBalanceUpdateRequest; +import sanbing.jcpp.proto.gen.DownlinkProto.OfflineCardBalanceUpdateRequest; import sanbing.jcpp.protocol.ProtocolContext; import sanbing.jcpp.protocol.annotation.ProtocolCmd; import sanbing.jcpp.protocol.listener.tcp.TcpSession; diff --git a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150OfflineCardBalanceUpdateResponseULCmd.java b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150OfflineCardBalanceUpdateResponseULCmd.java index 1405331..f3f1ff3 100644 --- a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150OfflineCardBalanceUpdateResponseULCmd.java +++ b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150OfflineCardBalanceUpdateResponseULCmd.java @@ -11,8 +11,8 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import lombok.extern.slf4j.Slf4j; import sanbing.jcpp.infrastructure.util.codec.BCDUtil; -import sanbing.jcpp.proto.gen.ProtocolProto.OfflineCardBalanceUpdateResponse; -import sanbing.jcpp.proto.gen.ProtocolProto.UplinkQueueMessage; +import sanbing.jcpp.proto.gen.UplinkProto.OfflineCardBalanceUpdateResponse; +import sanbing.jcpp.proto.gen.UplinkProto.UplinkQueueMessage; import sanbing.jcpp.protocol.ProtocolContext; import sanbing.jcpp.protocol.annotation.ProtocolCmd; import sanbing.jcpp.protocol.listener.tcp.TcpSession; diff --git a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150OfflineCardSyncRequestDLCmd.java b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150OfflineCardSyncRequestDLCmd.java index 10db42d..24322bb 100644 --- a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150OfflineCardSyncRequestDLCmd.java +++ b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150OfflineCardSyncRequestDLCmd.java @@ -10,7 +10,7 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import lombok.extern.slf4j.Slf4j; import sanbing.jcpp.infrastructure.util.codec.BCDUtil; -import sanbing.jcpp.proto.gen.ProtocolProto.OfflineCardSyncRequest; +import sanbing.jcpp.proto.gen.DownlinkProto.OfflineCardSyncRequest; import sanbing.jcpp.protocol.ProtocolContext; import sanbing.jcpp.protocol.annotation.ProtocolCmd; import sanbing.jcpp.protocol.listener.tcp.TcpSession; diff --git a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150OfflineCardSyncResponseULCmd.java b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150OfflineCardSyncResponseULCmd.java index a56cdaa..1d50693 100644 --- a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150OfflineCardSyncResponseULCmd.java +++ b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150OfflineCardSyncResponseULCmd.java @@ -11,8 +11,8 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import lombok.extern.slf4j.Slf4j; import sanbing.jcpp.infrastructure.util.codec.BCDUtil; -import sanbing.jcpp.proto.gen.ProtocolProto.OfflineCardSyncResponse; -import sanbing.jcpp.proto.gen.ProtocolProto.UplinkQueueMessage; +import sanbing.jcpp.proto.gen.UplinkProto.OfflineCardSyncResponse; +import sanbing.jcpp.proto.gen.UplinkProto.UplinkQueueMessage; import sanbing.jcpp.protocol.ProtocolContext; import sanbing.jcpp.protocol.annotation.ProtocolCmd; import sanbing.jcpp.protocol.listener.tcp.TcpSession; diff --git a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150OtaRequestDLCmd.java b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150OtaRequestDLCmd.java index 75adf86..0496c02 100644 --- a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150OtaRequestDLCmd.java +++ b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150OtaRequestDLCmd.java @@ -9,7 +9,7 @@ package sanbing.jcpp.protocol.yunkuaichong.v150.cmd; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import lombok.extern.slf4j.Slf4j; -import sanbing.jcpp.proto.gen.ProtocolProto.OtaRequest; +import sanbing.jcpp.proto.gen.DownlinkProto.OtaRequest; import sanbing.jcpp.protocol.ProtocolContext; import sanbing.jcpp.protocol.annotation.ProtocolCmd; import sanbing.jcpp.protocol.listener.tcp.TcpSession; diff --git a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150OtaResponseULCmd.java b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150OtaResponseULCmd.java index 1c7de1d..f66254d 100644 --- a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150OtaResponseULCmd.java +++ b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150OtaResponseULCmd.java @@ -10,8 +10,8 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import lombok.extern.slf4j.Slf4j; import sanbing.jcpp.infrastructure.util.codec.BCDUtil; -import sanbing.jcpp.proto.gen.ProtocolProto.OtaResponse; -import sanbing.jcpp.proto.gen.ProtocolProto.UplinkQueueMessage; +import sanbing.jcpp.proto.gen.UplinkProto.OtaResponse; +import sanbing.jcpp.proto.gen.UplinkProto.UplinkQueueMessage; import sanbing.jcpp.protocol.ProtocolContext; import sanbing.jcpp.protocol.annotation.ProtocolCmd; import sanbing.jcpp.protocol.listener.tcp.TcpSession; diff --git a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150QueryPricingModelAckDLCmd.java b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150QueryPricingModelAckDLCmd.java index 58168b7..c60eb43 100644 --- a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150QueryPricingModelAckDLCmd.java +++ b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150QueryPricingModelAckDLCmd.java @@ -9,7 +9,7 @@ package sanbing.jcpp.protocol.yunkuaichong.v150.cmd; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import lombok.extern.slf4j.Slf4j; -import sanbing.jcpp.proto.gen.ProtocolProto.*; +import sanbing.jcpp.proto.gen.DownlinkProto.*; import sanbing.jcpp.protocol.ProtocolContext; import sanbing.jcpp.protocol.annotation.ProtocolCmd; import sanbing.jcpp.protocol.listener.tcp.TcpSession; @@ -21,7 +21,7 @@ import java.time.LocalTime; import java.util.List; import java.util.Map; -import static sanbing.jcpp.proto.gen.ProtocolProto.PricingModelFlag.*; +import static sanbing.jcpp.proto.gen.DownlinkProto.PricingModelFlag.*; import static sanbing.jcpp.protocol.domain.DownlinkCmdEnum.QUERY_PRICING_ACK; import static sanbing.jcpp.protocol.yunkuaichong.YunKuaiChongProtocolConstants.ProtocolNames.*; diff --git a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150QueryPricingModelULCmd.java b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150QueryPricingModelULCmd.java index eb225e8..19a4ad1 100644 --- a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150QueryPricingModelULCmd.java +++ b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150QueryPricingModelULCmd.java @@ -12,8 +12,8 @@ import io.netty.buffer.Unpooled; 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.QueryPricingRequest; -import sanbing.jcpp.proto.gen.ProtocolProto.UplinkQueueMessage; +import sanbing.jcpp.proto.gen.UplinkProto.QueryPricingRequest; +import sanbing.jcpp.proto.gen.UplinkProto.UplinkQueueMessage; import sanbing.jcpp.protocol.ProtocolContext; import sanbing.jcpp.protocol.annotation.ProtocolCmd; import sanbing.jcpp.protocol.listener.tcp.TcpSession; diff --git a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150RealTimeDataULCmd.java b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150RealTimeDataULCmd.java index 945efd8..7316dbd 100644 --- a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150RealTimeDataULCmd.java +++ b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150RealTimeDataULCmd.java @@ -13,10 +13,10 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import sanbing.jcpp.infrastructure.util.codec.BCDUtil; import sanbing.jcpp.infrastructure.util.jackson.JacksonUtil; -import sanbing.jcpp.proto.gen.ProtocolProto.ChargingProgressProto; -import sanbing.jcpp.proto.gen.ProtocolProto.GunRunStatus; -import sanbing.jcpp.proto.gen.ProtocolProto.GunRunStatusProto; -import sanbing.jcpp.proto.gen.ProtocolProto.UplinkQueueMessage; +import sanbing.jcpp.proto.gen.UplinkProto.ChargingProgressProto; +import sanbing.jcpp.proto.gen.UplinkProto.GunRunStatus; +import sanbing.jcpp.proto.gen.UplinkProto.GunRunStatusProto; +import sanbing.jcpp.proto.gen.UplinkProto.UplinkQueueMessage; import sanbing.jcpp.protocol.ProtocolContext; import sanbing.jcpp.protocol.annotation.ProtocolCmd; import sanbing.jcpp.protocol.listener.tcp.TcpSession; diff --git a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150RemoteStartDLCmd.java b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150RemoteStartDLCmd.java index 06a7bb2..60d63e6 100644 --- a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150RemoteStartDLCmd.java +++ b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150RemoteStartDLCmd.java @@ -9,7 +9,7 @@ package sanbing.jcpp.protocol.yunkuaichong.v150.cmd; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import lombok.extern.slf4j.Slf4j; -import sanbing.jcpp.proto.gen.ProtocolProto.RemoteStartChargingRequest; +import sanbing.jcpp.proto.gen.DownlinkProto.RemoteStartChargingRequest; import sanbing.jcpp.protocol.ProtocolContext; import sanbing.jcpp.protocol.annotation.ProtocolCmd; import sanbing.jcpp.protocol.listener.tcp.TcpSession; diff --git a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150RemoteStartResultULCmd.java b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150RemoteStartResultULCmd.java index 5f391d0..cb80fce 100644 --- a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150RemoteStartResultULCmd.java +++ b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150RemoteStartResultULCmd.java @@ -12,8 +12,8 @@ import io.netty.buffer.Unpooled; 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.RemoteStartChargingResponse; -import sanbing.jcpp.proto.gen.ProtocolProto.UplinkQueueMessage; +import sanbing.jcpp.proto.gen.UplinkProto.RemoteStartChargingResponse; +import sanbing.jcpp.proto.gen.UplinkProto.UplinkQueueMessage; import sanbing.jcpp.protocol.ProtocolContext; import sanbing.jcpp.protocol.annotation.ProtocolCmd; import sanbing.jcpp.protocol.listener.tcp.TcpSession; diff --git a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150RemoteStopDLCmd.java b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150RemoteStopDLCmd.java index 904fa74..2d465bd 100644 --- a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150RemoteStopDLCmd.java +++ b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150RemoteStopDLCmd.java @@ -9,7 +9,7 @@ package sanbing.jcpp.protocol.yunkuaichong.v150.cmd; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import lombok.extern.slf4j.Slf4j; -import sanbing.jcpp.proto.gen.ProtocolProto.RemoteStopChargingRequest; +import sanbing.jcpp.proto.gen.DownlinkProto.RemoteStopChargingRequest; import sanbing.jcpp.protocol.ProtocolContext; import sanbing.jcpp.protocol.annotation.ProtocolCmd; import sanbing.jcpp.protocol.listener.tcp.TcpSession; diff --git a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150RemoteStopResultULCmd.java b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150RemoteStopResultULCmd.java index 0a3b067..12f9235 100644 --- a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150RemoteStopResultULCmd.java +++ b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150RemoteStopResultULCmd.java @@ -12,8 +12,8 @@ import io.netty.buffer.Unpooled; 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.RemoteStopChargingResponse; -import sanbing.jcpp.proto.gen.ProtocolProto.UplinkQueueMessage; +import sanbing.jcpp.proto.gen.UplinkProto.RemoteStopChargingResponse; +import sanbing.jcpp.proto.gen.UplinkProto.UplinkQueueMessage; import sanbing.jcpp.protocol.ProtocolContext; import sanbing.jcpp.protocol.annotation.ProtocolCmd; import sanbing.jcpp.protocol.listener.tcp.TcpSession; diff --git a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150RestartPileAckULCmd.java b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150RestartPileAckULCmd.java index 90c7b45..125a5ea 100644 --- a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150RestartPileAckULCmd.java +++ b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150RestartPileAckULCmd.java @@ -10,8 +10,8 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import lombok.extern.slf4j.Slf4j; import sanbing.jcpp.infrastructure.util.codec.BCDUtil; -import sanbing.jcpp.proto.gen.ProtocolProto.RestartPileResponse; -import sanbing.jcpp.proto.gen.ProtocolProto.UplinkQueueMessage; +import sanbing.jcpp.proto.gen.UplinkProto.RestartPileResponse; +import sanbing.jcpp.proto.gen.UplinkProto.UplinkQueueMessage; import sanbing.jcpp.protocol.ProtocolContext; import sanbing.jcpp.protocol.annotation.ProtocolCmd; import sanbing.jcpp.protocol.listener.tcp.TcpSession; diff --git a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150RestartPileDLCmd.java b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150RestartPileDLCmd.java index 6b79c96..8d2ed88 100644 --- a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150RestartPileDLCmd.java +++ b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150RestartPileDLCmd.java @@ -9,7 +9,7 @@ package sanbing.jcpp.protocol.yunkuaichong.v150.cmd; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import lombok.extern.slf4j.Slf4j; -import sanbing.jcpp.proto.gen.ProtocolProto.RestartPileRequest; +import sanbing.jcpp.proto.gen.DownlinkProto.RestartPileRequest; import sanbing.jcpp.protocol.ProtocolContext; import sanbing.jcpp.protocol.annotation.ProtocolCmd; import sanbing.jcpp.protocol.listener.tcp.TcpSession; diff --git a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150SetPricingModelAckULCmd.java b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150SetPricingModelAckULCmd.java index dc9778d..f66b804 100644 --- a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150SetPricingModelAckULCmd.java +++ b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150SetPricingModelAckULCmd.java @@ -10,8 +10,8 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import lombok.extern.slf4j.Slf4j; import sanbing.jcpp.infrastructure.util.codec.BCDUtil; -import sanbing.jcpp.proto.gen.ProtocolProto.SetPricingResponse; -import sanbing.jcpp.proto.gen.ProtocolProto.UplinkQueueMessage; +import sanbing.jcpp.proto.gen.UplinkProto.SetPricingResponse; +import sanbing.jcpp.proto.gen.UplinkProto.UplinkQueueMessage; import sanbing.jcpp.protocol.ProtocolContext; import sanbing.jcpp.protocol.annotation.ProtocolCmd; import sanbing.jcpp.protocol.listener.tcp.TcpSession; diff --git a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150SetPricingModelDLCmd.java b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150SetPricingModelDLCmd.java index 2aec71c..cceca1b 100644 --- a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150SetPricingModelDLCmd.java +++ b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150SetPricingModelDLCmd.java @@ -9,7 +9,7 @@ package sanbing.jcpp.protocol.yunkuaichong.v150.cmd; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import lombok.extern.slf4j.Slf4j; -import sanbing.jcpp.proto.gen.ProtocolProto.*; +import sanbing.jcpp.proto.gen.DownlinkProto.*; import sanbing.jcpp.protocol.ProtocolContext; import sanbing.jcpp.protocol.annotation.ProtocolCmd; import sanbing.jcpp.protocol.listener.tcp.TcpSession; @@ -22,7 +22,7 @@ import java.time.LocalTime; import java.util.List; import java.util.Map; -import static sanbing.jcpp.proto.gen.ProtocolProto.PricingModelFlag.*; +import static sanbing.jcpp.proto.gen.DownlinkProto.PricingModelFlag.*; import static sanbing.jcpp.protocol.domain.DownlinkCmdEnum.SET_PRICING; import static sanbing.jcpp.protocol.yunkuaichong.YunKuaiChongProtocolConstants.ProtocolNames.*; diff --git a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150StartChargeAckDLCmd.java b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150StartChargeAckDLCmd.java index 113ced6..a5797b2 100644 --- a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150StartChargeAckDLCmd.java +++ b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150StartChargeAckDLCmd.java @@ -10,7 +10,7 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import lombok.extern.slf4j.Slf4j; import sanbing.jcpp.infrastructure.util.jackson.JacksonUtil; -import sanbing.jcpp.proto.gen.ProtocolProto; +import sanbing.jcpp.proto.gen.DownlinkProto; import sanbing.jcpp.protocol.ProtocolContext; import sanbing.jcpp.protocol.annotation.ProtocolCmd; import sanbing.jcpp.protocol.listener.tcp.TcpSession; @@ -43,7 +43,7 @@ public class YunKuaiChongV150StartChargeAckDLCmd extends YunKuaiChongDownlinkCmd return; } - ProtocolProto.StartChargeResponse startChargeResponse = yunKuaiChongDwonlinkMessage.getMsg().getStartChargeResponse(); + DownlinkProto.StartChargeResponse startChargeResponse = yunKuaiChongDwonlinkMessage.getMsg().getStartChargeResponse(); String tradeNo = startChargeResponse.getTradeNo(); String pileCode = startChargeResponse.getPileCode(); String gunCode = startChargeResponse.getGunCode(); diff --git a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150StartChargeULCmd.java b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150StartChargeULCmd.java index 21f410e..6fef79d 100644 --- a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150StartChargeULCmd.java +++ b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150StartChargeULCmd.java @@ -15,15 +15,14 @@ import org.springframework.util.DigestUtils; import sanbing.jcpp.infrastructure.util.codec.BCDUtil; import sanbing.jcpp.infrastructure.util.jackson.JacksonUtil; import sanbing.jcpp.infrastructure.util.trace.TracerContextUtil; -import sanbing.jcpp.proto.gen.ProtocolProto; +import sanbing.jcpp.proto.gen.UplinkProto; import sanbing.jcpp.protocol.ProtocolContext; import sanbing.jcpp.protocol.annotation.ProtocolCmd; import sanbing.jcpp.protocol.listener.tcp.TcpSession; import sanbing.jcpp.protocol.yunkuaichong.YunKuaiChongUplinkCmdExe; import sanbing.jcpp.protocol.yunkuaichong.YunKuaiChongUplinkMessage; -import sanbing.jcpp.protocol.yunkuaichong.enums.YunKuaiChongStartTypeEnum; import sanbing.jcpp.protocol.yunkuaichong.enums.YunKuaiChongPasswordRequiredEnum; - +import sanbing.jcpp.protocol.yunkuaichong.enums.YunKuaiChongStartTypeEnum; import java.nio.charset.StandardCharsets; @@ -83,7 +82,7 @@ public class YunKuaiChongV150StartChargeULCmd extends YunKuaiChongUplinkCmdExe { String carVinCode = reverseVinCode(new String(carVinCodeBytes, StandardCharsets.US_ASCII)); // 转发到后端 - ProtocolProto.StartChargeRequest startChargingRequest = ProtocolProto.StartChargeRequest.newBuilder() + UplinkProto.StartChargeRequest startChargingRequest = UplinkProto.StartChargeRequest.newBuilder() .setTs(ts) .setPileCode(pileCode) .setGunCode(gunCode) @@ -95,7 +94,7 @@ public class YunKuaiChongV150StartChargeULCmd extends YunKuaiChongUplinkCmdExe { .setAdditionalInfo(additionalInfo.toString()) .build(); - ProtocolProto.UplinkQueueMessage uplinkQueueMessage = uplinkMessageBuilder(startChargingRequest.getPileCode(), tcpSession, yunKuaiChongUplinkMessage) + UplinkProto.UplinkQueueMessage uplinkQueueMessage = uplinkMessageBuilder(startChargingRequest.getPileCode(), tcpSession, yunKuaiChongUplinkMessage) .setStartChargeRequest(startChargingRequest) .build(); diff --git a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150TimeSyncDLCmd.java b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150TimeSyncDLCmd.java index e63ee01..f220183 100644 --- a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150TimeSyncDLCmd.java +++ b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150TimeSyncDLCmd.java @@ -11,7 +11,7 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import lombok.extern.slf4j.Slf4j; import sanbing.jcpp.infrastructure.util.codec.CP56Time2aUtil; -import sanbing.jcpp.proto.gen.ProtocolProto.TimeSyncRequest; +import sanbing.jcpp.proto.gen.DownlinkProto.TimeSyncRequest; import sanbing.jcpp.protocol.ProtocolContext; import sanbing.jcpp.protocol.annotation.ProtocolCmd; import sanbing.jcpp.protocol.listener.tcp.TcpSession; diff --git a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150TimeSyncResultULCmd.java b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150TimeSyncResultULCmd.java index 029cc2d..c432652 100644 --- a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150TimeSyncResultULCmd.java +++ b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150TimeSyncResultULCmd.java @@ -12,8 +12,8 @@ import io.netty.buffer.Unpooled; import lombok.extern.slf4j.Slf4j; import sanbing.jcpp.infrastructure.util.codec.BCDUtil; import sanbing.jcpp.infrastructure.util.codec.CP56Time2aUtil; -import sanbing.jcpp.proto.gen.ProtocolProto.TimeSyncResponse; -import sanbing.jcpp.proto.gen.ProtocolProto.UplinkQueueMessage; +import sanbing.jcpp.proto.gen.UplinkProto.TimeSyncResponse; +import sanbing.jcpp.proto.gen.UplinkProto.UplinkQueueMessage; import sanbing.jcpp.protocol.ProtocolContext; import sanbing.jcpp.protocol.annotation.ProtocolCmd; import sanbing.jcpp.protocol.listener.tcp.TcpSession; diff --git a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150TransactionRecordAckDLCmd.java b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150TransactionRecordAckDLCmd.java index 340aaf2..79d672a 100644 --- a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150TransactionRecordAckDLCmd.java +++ b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150TransactionRecordAckDLCmd.java @@ -10,7 +10,7 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import lombok.extern.slf4j.Slf4j; import sanbing.jcpp.infrastructure.util.jackson.JacksonUtil; -import sanbing.jcpp.proto.gen.ProtocolProto.TransactionRecordResponse; +import sanbing.jcpp.proto.gen.DownlinkProto.TransactionRecordResponse; import sanbing.jcpp.protocol.ProtocolContext; import sanbing.jcpp.protocol.annotation.ProtocolCmd; import sanbing.jcpp.protocol.listener.tcp.TcpSession; diff --git a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150TransactionRecordULCmd.java b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150TransactionRecordULCmd.java index c57eeaa..bc16664 100644 --- a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150TransactionRecordULCmd.java +++ b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150TransactionRecordULCmd.java @@ -13,7 +13,7 @@ import lombok.extern.slf4j.Slf4j; import sanbing.jcpp.infrastructure.util.codec.BCDUtil; import sanbing.jcpp.infrastructure.util.codec.CP56Time2aUtil; import sanbing.jcpp.infrastructure.util.jackson.JacksonUtil; -import sanbing.jcpp.proto.gen.ProtocolProto.*; +import sanbing.jcpp.proto.gen.UplinkProto.*; import sanbing.jcpp.protocol.ProtocolContext; import sanbing.jcpp.protocol.annotation.ProtocolCmd; import sanbing.jcpp.protocol.listener.tcp.TcpSession; diff --git a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150VerifyPricingModelAckDLCmd.java b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150VerifyPricingModelAckDLCmd.java index 9fa4e7e..67b1a3a 100644 --- a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150VerifyPricingModelAckDLCmd.java +++ b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150VerifyPricingModelAckDLCmd.java @@ -10,7 +10,7 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import lombok.extern.slf4j.Slf4j; import sanbing.jcpp.infrastructure.util.jackson.JacksonUtil; -import sanbing.jcpp.proto.gen.ProtocolProto.VerifyPricingResponse; +import sanbing.jcpp.proto.gen.DownlinkProto.VerifyPricingResponse; import sanbing.jcpp.protocol.ProtocolContext; import sanbing.jcpp.protocol.annotation.ProtocolCmd; import sanbing.jcpp.protocol.listener.tcp.TcpSession; diff --git a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150VerifyPricingModelULCmd.java b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150VerifyPricingModelULCmd.java index 7befe10..8a24d64 100644 --- a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150VerifyPricingModelULCmd.java +++ b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150VerifyPricingModelULCmd.java @@ -13,8 +13,8 @@ import io.netty.buffer.Unpooled; 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.UplinkQueueMessage; -import sanbing.jcpp.proto.gen.ProtocolProto.VerifyPricingRequest; +import sanbing.jcpp.proto.gen.UplinkProto.UplinkQueueMessage; +import sanbing.jcpp.proto.gen.UplinkProto.VerifyPricingRequest; import sanbing.jcpp.protocol.ProtocolContext; import sanbing.jcpp.protocol.annotation.ProtocolCmd; import sanbing.jcpp.protocol.listener.tcp.TcpSession; diff --git a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v160/cmd/YunKuaiChongV160RemoteParallelStartDLCmd.java b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v160/cmd/YunKuaiChongV160RemoteParallelStartDLCmd.java index 999b6d0..80e01a9 100644 --- a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v160/cmd/YunKuaiChongV160RemoteParallelStartDLCmd.java +++ b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v160/cmd/YunKuaiChongV160RemoteParallelStartDLCmd.java @@ -10,7 +10,7 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import lombok.extern.slf4j.Slf4j; import sanbing.jcpp.infrastructure.util.codec.BCDUtil; -import sanbing.jcpp.proto.gen.ProtocolProto; +import sanbing.jcpp.proto.gen.DownlinkProto; import sanbing.jcpp.protocol.ProtocolContext; import sanbing.jcpp.protocol.annotation.ProtocolCmd; import sanbing.jcpp.protocol.listener.tcp.TcpSession; @@ -45,7 +45,7 @@ public class YunKuaiChongV160RemoteParallelStartDLCmd extends YunKuaiChongDownli return; } - ProtocolProto.RemoteStartChargingRequest remoteStartChargingRequest = yunKuaiChongDwonlinkMessage.getMsg().getRemoteStartChargingRequest(); + DownlinkProto.RemoteStartChargingRequest remoteStartChargingRequest = yunKuaiChongDwonlinkMessage.getMsg().getRemoteStartChargingRequest(); String pileCode = remoteStartChargingRequest.getPileCode(); String gunCode = remoteStartChargingRequest.getGunCode(); String tradeNo = remoteStartChargingRequest.getTradeNo(); diff --git a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v160/cmd/YunKuaiChongV160RemoteParallelStartResultULCmd.java b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v160/cmd/YunKuaiChongV160RemoteParallelStartResultULCmd.java index 5d8494d..cbc9ce1 100644 --- a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v160/cmd/YunKuaiChongV160RemoteParallelStartResultULCmd.java +++ b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v160/cmd/YunKuaiChongV160RemoteParallelStartResultULCmd.java @@ -12,8 +12,8 @@ import io.netty.buffer.Unpooled; 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.RemoteStartChargingResponse; -import sanbing.jcpp.proto.gen.ProtocolProto.UplinkQueueMessage; +import sanbing.jcpp.proto.gen.UplinkProto.RemoteStartChargingResponse; +import sanbing.jcpp.proto.gen.UplinkProto.UplinkQueueMessage; import sanbing.jcpp.protocol.ProtocolContext; import sanbing.jcpp.protocol.annotation.ProtocolCmd; import sanbing.jcpp.protocol.listener.tcp.TcpSession; diff --git a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v170/cmd/YunKuaiChongV170TransactionRecordULCmd.java b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v170/cmd/YunKuaiChongV170TransactionRecordULCmd.java index d8d6b30..3301568 100644 --- a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v170/cmd/YunKuaiChongV170TransactionRecordULCmd.java +++ b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v170/cmd/YunKuaiChongV170TransactionRecordULCmd.java @@ -14,7 +14,7 @@ import lombok.extern.slf4j.Slf4j; import sanbing.jcpp.infrastructure.util.codec.BCDUtil; import sanbing.jcpp.infrastructure.util.codec.CP56Time2aUtil; import sanbing.jcpp.infrastructure.util.jackson.JacksonUtil; -import sanbing.jcpp.proto.gen.ProtocolProto.*; +import sanbing.jcpp.proto.gen.UplinkProto.*; import sanbing.jcpp.protocol.ProtocolContext; import sanbing.jcpp.protocol.annotation.ProtocolCmd; import sanbing.jcpp.protocol.listener.tcp.TcpSession; diff --git a/jcpp-web-ui/src/components/GunManagement.tsx b/jcpp-web-ui/src/components/GunManagement.tsx index 508451d..500bed5 100644 --- a/jcpp-web-ui/src/components/GunManagement.tsx +++ b/jcpp-web-ui/src/components/GunManagement.tsx @@ -8,7 +8,6 @@ import React, {useEffect, useMemo, useState} from 'react'; import { Button, Card, - Cascader, Checkbox, Col, Dropdown, @@ -41,7 +40,6 @@ const GunManagement: React.FC = () => { const [form] = Form.useForm(); const [stationOptions, setStationOptions] = useState([]); const [pileOptions, setPileOptions] = useState([]); - const [cascaderOptions, setCascaderOptions] = useState([]); const [modalVisible, setModalVisible] = useState(false); const [modalLoading, setModalLoading] = useState(false); const [isEdit, setIsEdit] = useState(false); @@ -238,6 +236,9 @@ const GunManagement: React.FC = () => { + { } }; - // 加载级联选择器数据 - const loadCascaderOptions = async () => { - try { - const response = await stationService.getStationPileCascaderOptions(); - setCascaderOptions(Array.isArray(response) ? response : []); - } catch (error: any) { - console.error('加载级联选择器数据失败:', error); - } - }; - // 监听搜索参数变化 useEffect(() => { loadData(); @@ -448,7 +439,6 @@ const GunManagement: React.FC = () => { useEffect(() => { loadStationOptions(); loadPileOptions(); - loadCascaderOptions(); }, []); // 处理表格变化 @@ -506,23 +496,25 @@ const GunManagement: React.FC = () => { setModalVisible(true); form.setFieldsValue({ ...record, - gunNo: record.gunNo, - stationPile: [record.stationId, record.pileId] // 设置级联选择器的值 + gunNo: record.gunNo.toString() }); }; + // 处理查看 + const handleView = (record: Gun) => { + showMessage.info('查看功能待实现'); + }; // 生成充电枪编码 const handleGenerateGunCode = () => { - const stationPile = form.getFieldValue('stationPile'); + const pileId = form.getFieldValue('pileId'); const gunNo = form.getFieldValue('gunNo'); - if (!stationPile || stationPile.length !== 2 || !gunNo) { - showMessage.warning('请先选择充电站和充电桩，并填写枪号'); + if (!pileId || !gunNo) { + showMessage.warning('请先选择充电桩和填写枪号'); return; } - const pileId = stationPile[1]; const selectedPile = pileOptions.find(p => p.id === pileId); if (selectedPile) { const code = generateGunCode(selectedPile.pileCode, gunNo); @@ -538,37 +530,23 @@ const GunManagement: React.FC = () => { if (isEdit && currentRecord) { // 编辑充电枪 - // 从级联选择器值中获取充电站ID和充电桩ID - const cascaderValue = values.stationPile; - if (!cascaderValue || cascaderValue.length !== 2) { - showMessage.error('请选择充电站和充电桩'); - return; - } - const updateData: GunUpdateRequest = { gunName: values.gunName, gunNo: values.gunNo, gunCode: values.gunCode, - stationId: cascaderValue[0], // 充电站ID - pileId: cascaderValue[1] // 充电桩ID + stationId: values.stationId, + pileId: values.pileId }; await gunService.updateGun(currentRecord.id, updateData); showMessage.success('充电枪更新成功'); } else { // 新建充电枪 - // 从级联选择器值中获取充电站ID和充电桩ID - const cascaderValue = values.stationPile; - if (!cascaderValue || cascaderValue.length !== 2) { - showMessage.error('请选择充电站和充电桩'); - return; - } - const createData: GunCreateRequest = { gunName: values.gunName, gunNo: values.gunNo, gunCode: values.gunCode, - stationId: cascaderValue[0], // 充电站ID - pileId: cascaderValue[1] // 充电桩ID + stationId: values.stationId, + pileId: values.pileId }; await gunService.createGun(createData); showMessage.success('充电枪创建成功'); @@ -900,25 +878,52 @@ const GunManagement: React.FC = () => { - - - path.some(option => - option.label.toLowerCase().includes(inputValue.toLowerCase()) - ) - }} - disabled={false} - changeOnSelect={false} - expandTrigger="hover" - /> - + + + + + + + + + + + + @@ -938,13 +943,13 @@ const GunManagement: React.FC = () => { >