diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java index a7dcfdd6..85d5a8d6 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java @@ -2,23 +2,30 @@ package com.ruoyi.common.core.constant; /** * 服务名称 - * + * * @author ruoyi */ public class ServiceNameConstants { + /** - * 认证服务的serviceid + * 认证服务service id */ public static final String AUTH_SERVICE = "ruoyi-auth"; /** - * 系统模块的serviceid + * 系统模块service id */ public static final String SYSTEM_SERVICE = "ruoyi-system"; /** - * 文件服务的serviceid + * 文件服务service id */ public static final String FILE_SERVICE = "ruoyi-file"; + + /** + * 充电桩服务service id + */ + public static final String PILE_SERVICE = "xhpc-power-pile"; + } diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/down/StartChargingData.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/down/StartChargingData.java new file mode 100644 index 00000000..8f03e03b --- /dev/null +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/down/StartChargingData.java @@ -0,0 +1,13 @@ +package com.xhpc.common.data.down; + +public class StartChargingData { + + + private String orderNo; //交易流水号 + private String pileNo; //桩号 + private String gunId; //枪号 + private String logicCardNo; //逻辑卡号 + private String physicCardNo; //物理卡号 + private double balance; //账户余额 + +} diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/BalanceUpdateReplyData.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/BalanceUpdateReplyData.java similarity index 95% rename from xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/BalanceUpdateReplyData.java rename to xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/BalanceUpdateReplyData.java index 82c0707e..5774df0a 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/BalanceUpdateReplyData.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/BalanceUpdateReplyData.java @@ -1,4 +1,4 @@ -package com.xhpc.common.pilemsg; +package com.xhpc.common.data.up; public class BalanceUpdateReplyData extends BaseData { diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/BaseData.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/BaseData.java similarity index 96% rename from xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/BaseData.java rename to xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/BaseData.java index 5206864f..fc3eecec 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/BaseData.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/BaseData.java @@ -1,4 +1,4 @@ -package com.xhpc.common.pilemsg; +package com.xhpc.common.data.up; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/BmsChargingData.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/BmsChargingData.java similarity index 99% rename from xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/BmsChargingData.java rename to xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/BmsChargingData.java index c569d31e..fa95d88f 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/BmsChargingData.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/BmsChargingData.java @@ -1,4 +1,4 @@ -package com.xhpc.common.pilemsg; +package com.xhpc.common.data.up; public class BmsChargingData extends BaseData { diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/BmsErrorData.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/BmsErrorData.java similarity index 99% rename from xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/BmsErrorData.java rename to xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/BmsErrorData.java index c771410f..65cb5e19 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/BmsErrorData.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/BmsErrorData.java @@ -1,4 +1,4 @@ -package com.xhpc.common.pilemsg; +package com.xhpc.common.data.up; public class BmsErrorData extends BaseData { diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/BmsInterruptData.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/BmsInterruptData.java similarity index 97% rename from xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/BmsInterruptData.java rename to xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/BmsInterruptData.java index d91badcd..0d8f3fa9 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/BmsInterruptData.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/BmsInterruptData.java @@ -1,4 +1,4 @@ -package com.xhpc.common.pilemsg; +package com.xhpc.common.data.up; public class BmsInterruptData extends BaseData { diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/BmsReqChargerOutputData.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/BmsReqChargerOutputData.java similarity index 99% rename from xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/BmsReqChargerOutputData.java rename to xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/BmsReqChargerOutputData.java index b88aac4a..9ce2d99a 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/BmsReqChargerOutputData.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/BmsReqChargerOutputData.java @@ -1,4 +1,4 @@ -package com.xhpc.common.pilemsg; +package com.xhpc.common.data.up; public class BmsReqChargerOutputData extends BaseData { diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/ChargerInterruptData.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/ChargerInterruptData.java similarity index 97% rename from xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/ChargerInterruptData.java rename to xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/ChargerInterruptData.java index 2bbd6e96..00443dc2 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/ChargerInterruptData.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/ChargerInterruptData.java @@ -1,4 +1,4 @@ -package com.xhpc.common.pilemsg; +package com.xhpc.common.data.up; public class ChargerInterruptData extends BaseData { diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/ChargingCompletedData.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/ChargingCompletedData.java similarity index 98% rename from xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/ChargingCompletedData.java rename to xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/ChargingCompletedData.java index 015b2b94..4dbd226c 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/ChargingCompletedData.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/ChargingCompletedData.java @@ -1,4 +1,4 @@ -package com.xhpc.common.pilemsg; +package com.xhpc.common.data.up; public class ChargingCompletedData extends BaseData { diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/ChargingConfigData.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/ChargingConfigData.java similarity index 99% rename from xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/ChargingConfigData.java rename to xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/ChargingConfigData.java index ddb3bd84..be84143c 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/ChargingConfigData.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/ChargingConfigData.java @@ -1,4 +1,4 @@ -package com.xhpc.common.pilemsg; +package com.xhpc.common.data.up; public class ChargingConfigData extends BaseData { diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/ChargingHandshakeData.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/ChargingHandshakeData.java similarity index 99% rename from xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/ChargingHandshakeData.java rename to xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/ChargingHandshakeData.java index 660756c7..60ea88cd 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/ChargingHandshakeData.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/ChargingHandshakeData.java @@ -1,4 +1,4 @@ -package com.xhpc.common.pilemsg; +package com.xhpc.common.data.up; public class ChargingHandshakeData extends BaseData { diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/OfflineCardSyncReplyData.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/OfflineCardSyncReplyData.java similarity index 95% rename from xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/OfflineCardSyncReplyData.java rename to xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/OfflineCardSyncReplyData.java index 34c90b3a..d408ee72 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/OfflineCardSyncReplyData.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/OfflineCardSyncReplyData.java @@ -1,4 +1,4 @@ -package com.xhpc.common.pilemsg; +package com.xhpc.common.data.up; public class OfflineCardSyncReplyData extends BaseData { diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/OrderData.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/OrderData.java similarity index 99% rename from xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/OrderData.java rename to xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/OrderData.java index cdaa03bd..5643daba 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/OrderData.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/OrderData.java @@ -1,4 +1,4 @@ -package com.xhpc.common.pilemsg; +package com.xhpc.common.data.up; public class OrderData extends BaseData { diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/PileConfigReplyData.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/PileConfigReplyData.java similarity index 93% rename from xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/PileConfigReplyData.java rename to xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/PileConfigReplyData.java index 766409fc..a17d7dc2 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/PileConfigReplyData.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/PileConfigReplyData.java @@ -1,4 +1,4 @@ -package com.xhpc.common.pilemsg; +package com.xhpc.common.data.up; public class PileConfigReplyData extends BaseData { diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/PileStartChargingData.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/PileStartChargingData.java similarity index 97% rename from xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/PileStartChargingData.java rename to xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/PileStartChargingData.java index 94c7aeb7..7e396796 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/PileStartChargingData.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/PileStartChargingData.java @@ -1,4 +1,4 @@ -package com.xhpc.common.pilemsg; +package com.xhpc.common.data.up; public class PileStartChargingData extends BaseData { diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/PileTimeConfigReplyData.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/PileTimeConfigReplyData.java similarity index 93% rename from xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/PileTimeConfigReplyData.java rename to xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/PileTimeConfigReplyData.java index 3a978ba6..c38ed693 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/PileTimeConfigReplyData.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/PileTimeConfigReplyData.java @@ -1,4 +1,4 @@ -package com.xhpc.common.pilemsg; +package com.xhpc.common.data.up; public class PileTimeConfigReplyData extends BaseData { diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/RealtimeData.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/RealtimeData.java similarity index 99% rename from xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/RealtimeData.java rename to xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/RealtimeData.java index d9e3aca8..dda697be 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/RealtimeData.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/RealtimeData.java @@ -1,4 +1,4 @@ -package com.xhpc.common.pilemsg; +package com.xhpc.common.data.up; public class RealtimeData extends BaseData { diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/RemoteStartReplyData.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/RemoteStartReplyData.java similarity index 96% rename from xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/RemoteStartReplyData.java rename to xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/RemoteStartReplyData.java index 881e1925..379015ba 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/RemoteStartReplyData.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/RemoteStartReplyData.java @@ -1,4 +1,4 @@ -package com.xhpc.common.pilemsg; +package com.xhpc.common.data.up; public class RemoteStartReplyData extends BaseData { diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/RemoteStopReplyData.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/RemoteStopReplyData.java similarity index 96% rename from xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/RemoteStopReplyData.java rename to xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/RemoteStopReplyData.java index a97355cb..ca702e00 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/pilemsg/RemoteStopReplyData.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/RemoteStopReplyData.java @@ -1,4 +1,4 @@ -package com.xhpc.common.pilemsg; +package com.xhpc.common.data.up; public class RemoteStopReplyData extends BaseData { diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java new file mode 100644 index 00000000..4ea2fc77 --- /dev/null +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java @@ -0,0 +1,30 @@ +package com.xhpc.pp.controller; + +import com.alibaba.nacos.api.NacosFactory; +import com.alibaba.nacos.api.exception.NacosException; +import com.alibaba.nacos.api.naming.NamingService; +import com.alibaba.nacos.api.naming.pojo.Instance; +import com.ruoyi.common.core.utils.GetIpAndPort; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +public class ChargingController { + + @PostMapping("test") + public String test() throws NacosException { + + String serverIp = "127.0.0.1"; + int serverPort = 8848; + String serverAddr = serverIp + ":" + serverPort; + + NamingService namingService = NacosFactory.createNamingService(serverAddr); + List ppInstances = namingService.getAllInstances("xhpc-power-pile"); + // todo clean dead host pile cache + String ipAndPort = GetIpAndPort.getIpAndPort(); + return ipAndPort; + } + +} diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/BalanceUpdateReplyDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BalanceUpdateReplyDataLogic.java similarity index 91% rename from xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/BalanceUpdateReplyDataLogic.java rename to xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BalanceUpdateReplyDataLogic.java index 1456a966..e789ebc7 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/BalanceUpdateReplyDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BalanceUpdateReplyDataLogic.java @@ -1,7 +1,7 @@ -package com.xhpc.pp.service; +package com.xhpc.pp.logic; import com.fasterxml.jackson.databind.ObjectMapper; -import com.xhpc.common.pilemsg.BalanceUpdateReplyData; +import com.xhpc.common.data.up.BalanceUpdateReplyData; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/BmsChargingDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingDataLogic.java similarity index 94% rename from xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/BmsChargingDataLogic.java rename to xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingDataLogic.java index bab70c48..412541a8 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/BmsChargingDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingDataLogic.java @@ -1,7 +1,7 @@ -package com.xhpc.pp.service; +package com.xhpc.pp.logic; import com.fasterxml.jackson.databind.ObjectMapper; -import com.xhpc.common.pilemsg.BmsChargingData; +import com.xhpc.common.data.up.BmsChargingData; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/BmsErrorDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsErrorDataLogic.java similarity index 94% rename from xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/BmsErrorDataLogic.java rename to xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsErrorDataLogic.java index 4287090b..71b3219c 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/BmsErrorDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsErrorDataLogic.java @@ -1,7 +1,7 @@ -package com.xhpc.pp.service; +package com.xhpc.pp.logic; import com.fasterxml.jackson.databind.ObjectMapper; -import com.xhpc.common.pilemsg.BmsErrorData; +import com.xhpc.common.data.up.BmsErrorData; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/BmsInterruptDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsInterruptDataLogic.java similarity index 93% rename from xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/BmsInterruptDataLogic.java rename to xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsInterruptDataLogic.java index b0c5ccbc..0c68111c 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/BmsInterruptDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsInterruptDataLogic.java @@ -1,7 +1,7 @@ -package com.xhpc.pp.service; +package com.xhpc.pp.logic; import com.fasterxml.jackson.databind.ObjectMapper; -import com.xhpc.common.pilemsg.BmsInterruptData; +import com.xhpc.common.data.up.BmsInterruptData; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/BmsReqChargerOutputDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsReqChargerOutputDataLogic.java similarity index 94% rename from xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/BmsReqChargerOutputDataLogic.java rename to xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsReqChargerOutputDataLogic.java index 616f1eee..9ece6ed7 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/BmsReqChargerOutputDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsReqChargerOutputDataLogic.java @@ -1,7 +1,7 @@ -package com.xhpc.pp.service; +package com.xhpc.pp.logic; import com.fasterxml.jackson.databind.ObjectMapper; -import com.xhpc.common.pilemsg.BmsReqChargerOutputData; +import com.xhpc.common.data.up.BmsReqChargerOutputData; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/ChargerInterruptDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargerInterruptDataLogic.java similarity index 93% rename from xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/ChargerInterruptDataLogic.java rename to xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargerInterruptDataLogic.java index 47268916..6cd7c255 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/ChargerInterruptDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargerInterruptDataLogic.java @@ -1,7 +1,7 @@ -package com.xhpc.pp.service; +package com.xhpc.pp.logic; import com.fasterxml.jackson.databind.ObjectMapper; -import com.xhpc.common.pilemsg.ChargerInterruptData; +import com.xhpc.common.data.up.ChargerInterruptData; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/ChargingCompletedDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargingCompletedDataLogic.java similarity index 93% rename from xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/ChargingCompletedDataLogic.java rename to xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargingCompletedDataLogic.java index f1f34bdf..79c0463b 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/ChargingCompletedDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargingCompletedDataLogic.java @@ -1,7 +1,7 @@ -package com.xhpc.pp.service; +package com.xhpc.pp.logic; import com.fasterxml.jackson.databind.ObjectMapper; -import com.xhpc.common.pilemsg.ChargingCompletedData; +import com.xhpc.common.data.up.ChargingCompletedData; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/ChargingConfigDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargingConfigDataLogic.java similarity index 93% rename from xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/ChargingConfigDataLogic.java rename to xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargingConfigDataLogic.java index 8538c7aa..84dfd617 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/ChargingConfigDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargingConfigDataLogic.java @@ -1,7 +1,7 @@ -package com.xhpc.pp.service; +package com.xhpc.pp.logic; import com.fasterxml.jackson.databind.ObjectMapper; -import com.xhpc.common.pilemsg.ChargingConfigData; +import com.xhpc.common.data.up.ChargingConfigData; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/ChargingHandshakeDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargingHandshakeDataLogic.java similarity index 93% rename from xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/ChargingHandshakeDataLogic.java rename to xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargingHandshakeDataLogic.java index 19017472..c449aa02 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/ChargingHandshakeDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargingHandshakeDataLogic.java @@ -1,7 +1,7 @@ -package com.xhpc.pp.service; +package com.xhpc.pp.logic; import com.fasterxml.jackson.databind.ObjectMapper; -import com.xhpc.common.pilemsg.ChargingHandshakeData; +import com.xhpc.common.data.up.ChargingHandshakeData; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/FieldService.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/FieldLogic.java similarity index 91% rename from xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/FieldService.java rename to xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/FieldLogic.java index ff79a64b..3bbab26b 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/FieldService.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/FieldLogic.java @@ -1,4 +1,4 @@ -package com.xhpc.pp.service; +package com.xhpc.pp.logic; import com.xhpc.pp.domain.ServiceField; import com.xhpc.pp.mapper.ServiceFieldMapper; @@ -15,18 +15,18 @@ import java.util.Map; @Lazy @Component -public class FieldService { +public class FieldLogic { // 版本->协议字段表 private static Map>> versionMapFields; private static ServiceFieldMapper fieldMapper; @Autowired - public FieldService(ServiceFieldMapper fieldMapper) { + public FieldLogic(ServiceFieldMapper fieldMapper) { versionMapFields = new HashMap<>(); - FieldService.fieldMapper = fieldMapper; - FieldService.init(); + FieldLogic.fieldMapper = fieldMapper; + FieldLogic.init(); } public static void refreshCache() { diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/HBLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/HBLogic.java similarity index 98% rename from xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/HBLogic.java rename to xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/HBLogic.java index c867dcef..b0a5e00f 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/HBLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/HBLogic.java @@ -1,4 +1,4 @@ -package com.xhpc.pp.service; +package com.xhpc.pp.logic; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/OfflineCardEraseReplyDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OfflineCardEraseReplyDataLogic.java similarity index 95% rename from xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/OfflineCardEraseReplyDataLogic.java rename to xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OfflineCardEraseReplyDataLogic.java index 393c02f5..603f0762 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/OfflineCardEraseReplyDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OfflineCardEraseReplyDataLogic.java @@ -1,4 +1,4 @@ -package com.xhpc.pp.service; +package com.xhpc.pp.logic; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/OfflineCardInquiryReplyDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OfflineCardInquiryReplyDataLogic.java similarity index 95% rename from xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/OfflineCardInquiryReplyDataLogic.java rename to xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OfflineCardInquiryReplyDataLogic.java index 877660f4..4aaab37d 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/OfflineCardInquiryReplyDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OfflineCardInquiryReplyDataLogic.java @@ -1,4 +1,4 @@ -package com.xhpc.pp.service; +package com.xhpc.pp.logic; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/OfflineCardSyncReplyDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OfflineCardSyncReplyDataLogic.java similarity index 91% rename from xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/OfflineCardSyncReplyDataLogic.java rename to xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OfflineCardSyncReplyDataLogic.java index 9aa24f2f..77509aa9 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/OfflineCardSyncReplyDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OfflineCardSyncReplyDataLogic.java @@ -1,7 +1,7 @@ -package com.xhpc.pp.service; +package com.xhpc.pp.logic; import com.fasterxml.jackson.databind.ObjectMapper; -import com.xhpc.common.pilemsg.OfflineCardSyncReplyData; +import com.xhpc.common.data.up.OfflineCardSyncReplyData; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/OrderDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OrderDataLogic.java similarity index 92% rename from xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/OrderDataLogic.java rename to xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OrderDataLogic.java index 8b0a51a5..f79f48a9 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/OrderDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OrderDataLogic.java @@ -1,7 +1,7 @@ -package com.xhpc.pp.service; +package com.xhpc.pp.logic; import com.fasterxml.jackson.databind.ObjectMapper; -import com.xhpc.common.pilemsg.OrderData; +import com.xhpc.common.data.up.OrderData; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/PileConfigReplyDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileConfigReplyDataLogic.java similarity index 91% rename from xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/PileConfigReplyDataLogic.java rename to xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileConfigReplyDataLogic.java index 851a221d..17b899aa 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/PileConfigReplyDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileConfigReplyDataLogic.java @@ -1,7 +1,7 @@ -package com.xhpc.pp.service; +package com.xhpc.pp.logic; import com.fasterxml.jackson.databind.ObjectMapper; -import com.xhpc.common.pilemsg.PileConfigReplyData; +import com.xhpc.common.data.up.PileConfigReplyData; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/PileRateModelConfigReplyDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileRateModelConfigReplyDataLogic.java similarity index 92% rename from xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/PileRateModelConfigReplyDataLogic.java rename to xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileRateModelConfigReplyDataLogic.java index 95ec75ae..641ad924 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/PileRateModelConfigReplyDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileRateModelConfigReplyDataLogic.java @@ -1,7 +1,7 @@ -package com.xhpc.pp.service; +package com.xhpc.pp.logic; import com.fasterxml.jackson.databind.ObjectMapper; -import com.xhpc.common.pilemsg.PileConfigReplyData; +import com.xhpc.common.data.up.PileConfigReplyData; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/PileStartChargingDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileStartChargingDataLogic.java similarity index 91% rename from xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/PileStartChargingDataLogic.java rename to xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileStartChargingDataLogic.java index d01ce898..29d54cde 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/PileStartChargingDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileStartChargingDataLogic.java @@ -1,7 +1,7 @@ -package com.xhpc.pp.service; +package com.xhpc.pp.logic; import com.fasterxml.jackson.databind.ObjectMapper; -import com.xhpc.common.pilemsg.PileStartChargingData; +import com.xhpc.common.data.up.PileStartChargingData; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/PileTimeConfigReplyDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileTimeConfigReplyDataLogic.java similarity index 92% rename from xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/PileTimeConfigReplyDataLogic.java rename to xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileTimeConfigReplyDataLogic.java index afc128cc..6a881674 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/PileTimeConfigReplyDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileTimeConfigReplyDataLogic.java @@ -1,7 +1,7 @@ -package com.xhpc.pp.service; +package com.xhpc.pp.logic; import com.fasterxml.jackson.databind.ObjectMapper; -import com.xhpc.common.pilemsg.PileConfigReplyData; +import com.xhpc.common.data.up.PileConfigReplyData; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/RateModelRequestLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelRequestLogic.java similarity index 98% rename from xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/RateModelRequestLogic.java rename to xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelRequestLogic.java index 282bced6..4d721006 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/RateModelRequestLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelRequestLogic.java @@ -1,4 +1,4 @@ -package com.xhpc.pp.service; +package com.xhpc.pp.logic; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/RateModelValidateLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelValidateLogic.java similarity index 98% rename from xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/RateModelValidateLogic.java rename to xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelValidateLogic.java index 1fadb2e3..6314a0f8 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/RateModelValidateLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelValidateLogic.java @@ -1,4 +1,4 @@ -package com.xhpc.pp.service; +package com.xhpc.pp.logic; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/RealtimeDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java similarity index 96% rename from xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/RealtimeDataLogic.java rename to xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java index 0a6bd574..9c744305 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/RealtimeDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java @@ -1,7 +1,7 @@ -package com.xhpc.pp.service; +package com.xhpc.pp.logic; import com.fasterxml.jackson.databind.ObjectMapper; -import com.xhpc.common.pilemsg.RealtimeData; +import com.xhpc.common.data.up.RealtimeData; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/RegisterLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RegisterLogic.java similarity index 98% rename from xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/RegisterLogic.java rename to xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RegisterLogic.java index 58482340..6da4d938 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/RegisterLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RegisterLogic.java @@ -1,4 +1,4 @@ -package com.xhpc.pp.service; +package com.xhpc.pp.logic; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/RemoteRestartReplyDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteRestartReplyDataLogic.java similarity index 92% rename from xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/RemoteRestartReplyDataLogic.java rename to xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteRestartReplyDataLogic.java index 769ad2ca..6bc07564 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/RemoteRestartReplyDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteRestartReplyDataLogic.java @@ -1,7 +1,7 @@ -package com.xhpc.pp.service; +package com.xhpc.pp.logic; import com.fasterxml.jackson.databind.ObjectMapper; -import com.xhpc.common.pilemsg.PileConfigReplyData; +import com.xhpc.common.data.up.PileConfigReplyData; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/RemoteStartReplyDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteStartReplyDataLogic.java similarity index 91% rename from xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/RemoteStartReplyDataLogic.java rename to xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteStartReplyDataLogic.java index 4a78a6e5..9ac7adea 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/RemoteStartReplyDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteStartReplyDataLogic.java @@ -1,7 +1,7 @@ -package com.xhpc.pp.service; +package com.xhpc.pp.logic; import com.fasterxml.jackson.databind.ObjectMapper; -import com.xhpc.common.pilemsg.PileStartChargingData; +import com.xhpc.common.data.up.PileStartChargingData; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/RemoteStopReplyDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteStopReplyDataLogic.java similarity index 91% rename from xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/RemoteStopReplyDataLogic.java rename to xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteStopReplyDataLogic.java index b8425bf6..384b2b80 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/RemoteStopReplyDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteStopReplyDataLogic.java @@ -1,7 +1,7 @@ -package com.xhpc.pp.service; +package com.xhpc.pp.logic; import com.fasterxml.jackson.databind.ObjectMapper; -import com.xhpc.common.pilemsg.RemoteStopReplyData; +import com.xhpc.common.data.up.RemoteStopReplyData; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/RemoteUpgradeReplyDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteUpgradeReplyDataLogic.java similarity index 92% rename from xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/RemoteUpgradeReplyDataLogic.java rename to xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteUpgradeReplyDataLogic.java index 27dda746..92f9844b 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/RemoteUpgradeReplyDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteUpgradeReplyDataLogic.java @@ -1,7 +1,7 @@ -package com.xhpc.pp.service; +package com.xhpc.pp.logic; import com.fasterxml.jackson.databind.ObjectMapper; -import com.xhpc.common.pilemsg.PileConfigReplyData; +import com.xhpc.common.data.up.PileConfigReplyData; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/ServiceMainLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ServiceMainLogic.java similarity index 99% rename from xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/ServiceMainLogic.java rename to xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ServiceMainLogic.java index 537407f7..f0ee5a3e 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/service/ServiceMainLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ServiceMainLogic.java @@ -1,4 +1,4 @@ -package com.xhpc.pp.service; +package com.xhpc.pp.logic; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/ChargingPileBinaryHandler.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/ChargingPileBinaryHandler.java index e0d27fe7..0a6a1466 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/ChargingPileBinaryHandler.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/ChargingPileBinaryHandler.java @@ -1,8 +1,8 @@ package com.xhpc.pp.server; import com.xhpc.pp.domain.ServiceField; -import com.xhpc.pp.service.FieldService; -import com.xhpc.pp.service.ServiceMainLogic; +import com.xhpc.pp.logic.FieldLogic; +import com.xhpc.pp.logic.ServiceMainLogic; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.TxException; @@ -19,8 +19,8 @@ import java.util.*; import static com.ruoyi.common.core.utils.GetIpAndPort.getLocalIP; import static com.xhpc.pp.config.EarlierBeanConf.getLocalIPAndPort; +import static com.xhpc.pp.logic.RegisterLogic.REGISTERED; import static com.xhpc.pp.server.ChargingPileServer.REDIS; -import static com.xhpc.pp.service.RegisterLogic.REGISTERED; import static com.xhpc.pp.tx.ServiceResult.OK; import static com.xhpc.pp.utils.security.CRCCalculator.calcCrc; @@ -100,8 +100,8 @@ public class ChargingPileBinaryHandler implements ClientBinaryHandler { ChargingPileServer.putHandler(pileNo, handler); ChargingPileServer.putVersion(handler.getName(), (String) req.get("version")); Map pileCache = REDIS.getCacheMap(pileNo); - pileCache.put("Status", REGISTERED); - pileCache.put("Server", getLocalIPAndPort()); + pileCache.put("status", REGISTERED); + pileCache.put("server", getLocalIPAndPort()); REDIS.setCacheMap(pileNo, pileCache); Set pilesAtHost = REDIS.getCacheSet(getLocalIP()); pilesAtHost.add(pileNo); @@ -132,7 +132,7 @@ public class ChargingPileBinaryHandler implements ClientBinaryHandler { private Map analysis(byte[] data, String service, String ver) throws TxException { - List fieldList = FieldService.fieldList(ver, service); + List fieldList = FieldLogic.fieldList(ver, service); if (fieldList == null || fieldList.isEmpty()) throw TxException.INNER_ERROR("field mapper not found"); Map result = new HashMap(); diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/ChargingPileServer.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/ChargingPileServer.java index ef23c9b8..704bb7f7 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/ChargingPileServer.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/ChargingPileServer.java @@ -1,7 +1,7 @@ package com.xhpc.pp.server; import com.ruoyi.common.redis.service.RedisService; -import com.xhpc.pp.service.FieldService; +import com.xhpc.pp.logic.FieldLogic; import com.xhpc.pp.utils.security.HexUtils; import org.quickserver.net.server.ClientHandler; import org.quickserver.net.server.DataMode; @@ -23,7 +23,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import static com.xhpc.pp.service.RegisterLogic.DISCONNECTED; +import static com.xhpc.pp.logic.RegisterLogic.DISCONNECTED; /** @@ -42,7 +42,7 @@ public class ChargingPileServer { private QuickServer server; @Autowired - private FieldService fieldService; + private FieldLogic fieldLogic; @Autowired public RedisService redisService; diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/tx/ServiceController.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/tx/ServiceController.java index 2a332fe5..b72d3a85 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/tx/ServiceController.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/tx/ServiceController.java @@ -1,6 +1,6 @@ package com.xhpc.pp.tx; -import com.xhpc.pp.service.ServiceMainLogic; +import com.xhpc.pp.logic.ServiceMainLogic; import com.xhpc.pp.utils.JSONUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller;