解决bean注入问题

xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/redis/StaticBeanUtil.java

@@ -1,5 +1,6 @@
 package com.xhpc.common.data.redis;
 
+import com.xhpc.common.api.PileOrderService;
 import com.xhpc.common.redis.service.RedisService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.support.atomic.RedisAtomicLong;
@@ -8,9 +9,13 @@ import org.springframework.stereotype.Component;
 import javax.annotation.PostConstruct;
 
 @Component
-public class SeqUtil {
+public class StaticBeanUtil {
 
     public static RedisService REDIS;
+    public static PileOrderService ORDER_SVC;
+
+    @Autowired
+    public PileOrderService pileOrderService;
 
     @Autowired
     public RedisService redisService;
@@ -18,6 +23,7 @@ public class SeqUtil {
     @PostConstruct
     public void init() {
 
+        ORDER_SVC = pileOrderService;
         REDIS = redisService;
     }
 

xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/HxpcChargeOrderServiceImpl.java

@@ -5,7 +5,7 @@ import com.xhpc.common.api.PowerPileService;
 import com.xhpc.common.core.domain.R;
 import com.xhpc.common.core.web.domain.AjaxResult;
 import com.xhpc.common.data.down.StartChargingData;
-import com.xhpc.common.data.redis.SeqUtil;
+import com.xhpc.common.data.redis.StaticBeanUtil;
 import com.xhpc.common.domain.XhpcTerminal;
 import com.xhpc.common.redis.service.RedisService;
 import com.xhpc.order.domain.HxpcChargeOrder;
@@ -134,7 +134,7 @@ public class HxpcChargeOrderServiceImpl implements IHxpcChargeOrderService {
         Date date = new Date();
         String format = DateUtil.format(date, "yyMMddHHmmss");
         //自增
-        String orderNo = serialNumber + format + SeqUtil.seqDec("gun:" + serialNumber + ".seqdec");
+        String orderNo = serialNumber + format + StaticBeanUtil.seqDec("gun:" + serialNumber + ".seqdec");
 
         startChargingData.setOrderNo(orderNo);
         if(userMessage.get("phone") !=null){

xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/config/EarlierBeanConf.java

@@ -12,8 +12,8 @@ import java.util.List;
 import java.util.Map;
 
 import static com.xhpc.common.core.utils.GetIpAndPort.getLocalIP;
+import static com.xhpc.common.data.redis.StaticBeanUtil.REDIS;
 import static com.xhpc.pp.logic.RegisterLogic.REGISTERED;
-import static com.xhpc.pp.server.ChargingPileServer.REDIS;
 
 @Configuration
 public class EarlierBeanConf {

xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java

@@ -29,9 +29,11 @@ import java.util.List;
 import java.util.Map;
 
 import static cn.hutool.core.date.DatePattern.NORM_DATETIME_FORMAT;
-import static com.xhpc.common.data.redis.SeqUtil.seqHex;
+import static com.xhpc.common.data.redis.StaticBeanUtil.REDIS;
+import static com.xhpc.common.data.redis.StaticBeanUtil.seqHex;
 import static com.xhpc.pp.logic.RegisterLogic.REGISTERED;
-import static com.xhpc.pp.server.ChargingPileServer.*;
+import static com.xhpc.pp.server.ChargingPileServer.default_version;
+import static com.xhpc.pp.server.ChargingPileServer.getHandler;
 import static com.xhpc.pp.utils.security.HexUtils.toHexInt;
 
 @RestController

xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/PileController.java

@@ -13,7 +13,7 @@ import java.io.IOException;
 import java.util.Map;
 import java.util.Set;
 
-import static com.xhpc.pp.server.ChargingPileServer.REDIS;
+import static com.xhpc.common.data.redis.StaticBeanUtil.REDIS;
 import static com.xhpc.pp.server.ChargingPileServer.getHandler;
 
 @RestController

xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/StationController.java

@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import static com.xhpc.pp.server.ChargingPileServer.REDIS;
+import static com.xhpc.common.data.redis.StaticBeanUtil.REDIS;
 
 @RestController
 public class StationController {

xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingDataLogic.java

@@ -14,7 +14,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import static com.xhpc.pp.server.ChargingPileServer.REDIS;
+import static com.xhpc.common.data.redis.StaticBeanUtil.REDIS;
 
 @Lazy
 @Component("BmsChargingDataLogic")

xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsErrorDataLogic.java

@@ -14,7 +14,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import static com.xhpc.pp.server.ChargingPileServer.REDIS;
+import static com.xhpc.common.data.redis.StaticBeanUtil.REDIS;
 
 @Lazy
 @Component("BmsErrorDataLogic")

xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsInterruptDataLogic.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Component;
 
 import java.util.Map;
 
-import static com.xhpc.pp.server.ChargingPileServer.REDIS;
+import static com.xhpc.common.data.redis.StaticBeanUtil.REDIS;
 
 @Lazy
 @Component("BmsInterruptDataLogic")

xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsReqChargerOutputDataLogic.java

@@ -14,7 +14,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import static com.xhpc.pp.server.ChargingPileServer.REDIS;
+import static com.xhpc.common.data.redis.StaticBeanUtil.REDIS;
 
 @Lazy
 @Component("BmsReqChargerOutputDataLogic")

xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargerInterruptDataLogic.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Component;
 
 import java.util.Map;
 
-import static com.xhpc.pp.server.ChargingPileServer.REDIS;
+import static com.xhpc.common.data.redis.StaticBeanUtil.REDIS;
 
 @Lazy
 @Component("ChargerInterruptDataLogic")

xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargingCompletedDataLogic.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Component;
 
 import java.util.Map;
 
-import static com.xhpc.pp.server.ChargingPileServer.REDIS;
+import static com.xhpc.common.data.redis.StaticBeanUtil.REDIS;
 
 @Lazy
 @Component("ChargingCompletedDataLogic")

xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargingConfigDataLogic.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Component;
 
 import java.util.Map;
 
-import static com.xhpc.pp.server.ChargingPileServer.REDIS;
+import static com.xhpc.common.data.redis.StaticBeanUtil.REDIS;
 
 @Lazy
 @Component("ChargingConfigDataLogic")

xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargingHandshakeDataLogic.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Component;
 
 import java.util.Map;
 
-import static com.xhpc.pp.server.ChargingPileServer.REDIS;
+import static com.xhpc.common.data.redis.StaticBeanUtil.REDIS;
 
 @Lazy
 @Component("ChargingHandshakeDataLogic")

xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/HBLogic.java

@@ -12,8 +12,8 @@ import org.springframework.stereotype.Component;
 
 import java.util.Map;
 
-import static com.xhpc.common.data.redis.SeqUtil.seqHex;
+import static com.xhpc.common.data.redis.StaticBeanUtil.REDIS;
-import static com.xhpc.pp.server.ChargingPileServer.REDIS;
+import static com.xhpc.common.data.redis.StaticBeanUtil.seqHex;
 
 @Lazy
 @Component("HBLogic")

xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OrderDataLogic.java

@@ -19,8 +19,8 @@ import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Map;
 
-import static com.xhpc.common.data.redis.SeqUtil.seqHex;
+import static com.xhpc.common.data.redis.StaticBeanUtil.REDIS;
-import static com.xhpc.pp.server.ChargingPileServer.REDIS;
+import static com.xhpc.common.data.redis.StaticBeanUtil.seqHex;
 import static com.xhpc.pp.utils.security.CacheDataUtils.reflectTranslate;
 
 @Lazy

xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileTimeConfigReplyDataLogic.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Component;
 import java.util.Map;
 
 import static cn.hutool.core.date.DatePattern.NORM_DATETIME_FORMAT;
-import static com.xhpc.pp.server.ChargingPileServer.REDIS;
+import static com.xhpc.common.data.redis.StaticBeanUtil.REDIS;
 import static com.xhpc.pp.utils.security.CP56Time2a.cp56toDate;
 
 @Lazy

xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelConfigReplyDataLogic.java

@@ -13,7 +13,7 @@ import org.springframework.stereotype.Component;
 
 import java.util.Map;
 
-import static com.xhpc.pp.server.ChargingPileServer.REDIS;
+import static com.xhpc.common.data.redis.StaticBeanUtil.REDIS;
 import static com.xhpc.pp.tx.ServiceResult.*;
 
 @Lazy

xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelRequestLogic.java

@@ -16,8 +16,8 @@ import org.springframework.stereotype.Component;
 
 import java.util.Map;
 
-import static com.xhpc.common.data.redis.SeqUtil.seqHex;
+import static com.xhpc.common.data.redis.StaticBeanUtil.REDIS;
-import static com.xhpc.pp.server.ChargingPileServer.REDIS;
+import static com.xhpc.common.data.redis.StaticBeanUtil.seqHex;
 import static com.xhpc.pp.utils.security.HexUtils.toHexInt;
 
 @Lazy

xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelValidateLogic.java

@@ -13,8 +13,8 @@ import org.springframework.stereotype.Component;
 
 import java.util.Map;
 
-import static com.xhpc.common.data.redis.SeqUtil.seqHex;
+import static com.xhpc.common.data.redis.StaticBeanUtil.REDIS;
-import static com.xhpc.pp.server.ChargingPileServer.REDIS;
+import static com.xhpc.common.data.redis.StaticBeanUtil.seqHex;
 
 @Lazy
 @Component("RateModelValidateLogic")

xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java

@@ -21,7 +21,7 @@ import java.util.Calendar;
 import java.util.List;
 import java.util.Map;
 
-import static com.xhpc.pp.server.ChargingPileServer.REDIS;
+import static com.xhpc.common.data.redis.StaticBeanUtil.REDIS;
 import static com.xhpc.pp.utils.security.CacheDataUtils.reflectTranslate;
 import static com.xhpc.pp.utils.security.HexUtils.reverseHexInt;
 import static com.xhpc.pp.utils.security.HexUtils.toBits;

xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RegisterLogic.java

@@ -14,9 +14,9 @@ import org.springframework.stereotype.Component;
 import java.util.Map;
 import java.util.Set;
 
-import static com.xhpc.common.data.redis.SeqUtil.seqHex;
+import static com.xhpc.common.data.redis.StaticBeanUtil.REDIS;
+import static com.xhpc.common.data.redis.StaticBeanUtil.seqHex;
 import static com.xhpc.pp.config.EarlierBeanConf.getLocalIPAndPort;
-import static com.xhpc.pp.server.ChargingPileServer.REDIS;
 
 @Lazy
 @Component("RegisterLogic")

xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteStartReplyDataLogic.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Component;
 
 import java.util.Map;
 
-import static com.xhpc.pp.server.ChargingPileServer.REDIS;
+import static com.xhpc.common.data.redis.StaticBeanUtil.REDIS;
 import static com.xhpc.pp.tx.ServiceResult.HEX_01;
 
 @Lazy

xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteStopReplyDataLogic.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Component;
 
 import java.util.Map;
 
-import static com.xhpc.pp.server.ChargingPileServer.REDIS;
+import static com.xhpc.common.data.redis.StaticBeanUtil.REDIS;
 import static com.xhpc.pp.tx.ServiceResult.HEX_01;
 
 @Lazy

xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/ChargingPileBinaryHandler.java

@@ -22,8 +22,8 @@ import java.io.IOException;
 import java.util.*;
 
 import static cn.hutool.core.date.DatePattern.NORM_DATETIME_FORMAT;
-import static com.xhpc.common.data.redis.SeqUtil.seqHex;
+import static com.xhpc.common.data.redis.StaticBeanUtil.REDIS;
-import static com.xhpc.pp.server.ChargingPileServer.REDIS;
+import static com.xhpc.common.data.redis.StaticBeanUtil.seqHex;
 import static com.xhpc.pp.tx.ServiceResult.OK;
 import static com.xhpc.pp.utils.security.CP56Time2a.toCp56Hex;
 import static com.xhpc.pp.utils.security.CRCCalculator.calcCrc;

xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/ChargingPileEventHandler.java

@@ -9,8 +9,8 @@ import org.springframework.stereotype.Component;
 
 import java.util.Map;
 
+import static com.xhpc.common.data.redis.StaticBeanUtil.REDIS;
 import static com.xhpc.pp.logic.RegisterLogic.DISCONNECTED;
-import static com.xhpc.pp.server.ChargingPileServer.REDIS;
 
 @Lazy(false)
 @Component

xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/ChargingPileServer.java

@@ -1,7 +1,5 @@
 package com.xhpc.pp.server;
 
-import com.xhpc.common.api.PileOrderService;
-import com.xhpc.common.redis.service.RedisService;
 import com.xhpc.pp.logic.FieldLogic;
 import com.xhpc.pp.utils.security.HexUtils;
 import org.quickserver.net.server.ClientHandler;
@@ -17,11 +15,12 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
+import static com.xhpc.common.data.redis.StaticBeanUtil.ORDER_SVC;
+import static com.xhpc.common.data.redis.StaticBeanUtil.REDIS;
 import static com.xhpc.pp.logic.RegisterLogic.DISCONNECTED;
 
 
@@ -37,21 +36,10 @@ public class ChargingPileServer {
     private static Map<String, ClientHandler> handlerMap = new HashMap<>();
     private static Map<String, String> versionMapper = new HashMap<>();
     private static Map<String, String> pileMap = new HashMap<>();
-    public static RedisService REDIS;
     private QuickServer server;
 
     @Autowired
     private FieldLogic fieldLogic;
-    @Autowired
-    public RedisService redisService;
-    @Autowired
-    private static PileOrderService pileOrderService;
-
-    @PostConstruct
-    public void init() {
-
-        REDIS = redisService;
-    }
 
     @Autowired
     public ChargingPileServer(@Value("${ppsvc.server}") String host, @Value("${ppsvc.port}") int port) {
@@ -106,7 +94,7 @@ public class ChargingPileServer {
                     cacheOrder.put("lordiss", "true");
                     REDIS.setCacheMap(orderkey, cacheOrder);
                     String orderNo = orderkey.replace("order:", "");
-                    pileOrderService.pileStop(orderNo, 3, "充电桩离线,订单实时数据可能中断");
+                    ORDER_SVC.pileStop(orderNo, 3, "充电桩离线,订单实时数据可能中断");
                 }
             }
         }

xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/utils/security/CacheDataUtils.java

@@ -8,7 +8,7 @@ import java.util.concurrent.TimeUnit;
 
 import static cn.hutool.core.date.DatePattern.NORM_DATETIME_FORMAT;
 import static com.xhpc.common.core.utils.StringUtils.capitalize;
-import static com.xhpc.pp.server.ChargingPileServer.REDIS;
+import static com.xhpc.common.data.redis.StaticBeanUtil.REDIS;
 import static com.xhpc.pp.utils.security.CP56Time2a.cp56toDate;
 
 public class CacheDataUtils {