包名重构

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java

@@ -7,18 +7,25 @@ package com.ruoyi.common.core.constant;
  */
 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";
+
 }

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; //账户余额
+
+}

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 {
 

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;

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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<Instance> ppInstances = namingService.getAllInstances("xhpc-power-pile");
+        // todo clean dead host pile cache
+        String ipAndPort = GetIpAndPort.getIpAndPort();
+        return ipAndPort;
+    }
+
+}

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;

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;

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;

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;

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;

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;

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;

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;

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;

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<String, Map<String, List<ServiceField>>> versionMapFields;
     private static ServiceFieldMapper fieldMapper;
 
     @Autowired
-    public FieldService(ServiceFieldMapper fieldMapper) {
+    public FieldLogic(ServiceFieldMapper fieldMapper) {
 
         versionMapFields = new HashMap<>();
-        FieldService.fieldMapper = fieldMapper;
+        FieldLogic.fieldMapper = fieldMapper;
-        FieldService.init();
+        FieldLogic.init();
     }
 
     public static void refreshCache() {

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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.logic.FieldLogic;
-import com.xhpc.pp.service.ServiceMainLogic;
+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<String, Object> pileCache = REDIS.getCacheMap(pileNo);
-        pileCache.put("Status", REGISTERED);
+        pileCache.put("status", REGISTERED);
-        pileCache.put("Server", getLocalIPAndPort());
+        pileCache.put("server", getLocalIPAndPort());
         REDIS.setCacheMap(pileNo, pileCache);
         Set<String> pilesAtHost = REDIS.getCacheSet(getLocalIP());
         pilesAtHost.add(pileNo);
@@ -132,7 +132,7 @@ public class ChargingPileBinaryHandler implements ClientBinaryHandler {
 
     private Map<String, Object> analysis(byte[] data, String service, String ver) throws TxException {
 
-        List<ServiceField> fieldList = FieldService.fieldList(ver, service);
+        List<ServiceField> fieldList = FieldLogic.fieldList(ver, service);
         if (fieldList == null || fieldList.isEmpty())
             throw TxException.INNER_ERROR("field mapper not found");
         Map<String, Object> result = new HashMap<String, Object>();

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;
 

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;