From 45574f2a8abd3df329e73a9bed65bec925c0f34b Mon Sep 17 00:00:00 2001 From: ZZ Date: Tue, 24 Aug 2021 16:32:44 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3bean=E6=B3=A8=E5=85=A5?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{SeqUtil.java => StaticBeanUtil.java} | 8 +++++++- .../impl/HxpcChargeOrderServiceImpl.java | 4 ++-- .../com/xhpc/pp/config/EarlierBeanConf.java | 2 +- .../xhpc/pp/controller/ChargingController.java | 6 ++++-- .../com/xhpc/pp/controller/PileController.java | 2 +- .../xhpc/pp/controller/StationController.java | 2 +- .../xhpc/pp/logic/BmsChargingDataLogic.java | 2 +- .../com/xhpc/pp/logic/BmsErrorDataLogic.java | 2 +- .../xhpc/pp/logic/BmsInterruptDataLogic.java | 2 +- .../pp/logic/BmsReqChargerOutputDataLogic.java | 2 +- .../pp/logic/ChargerInterruptDataLogic.java | 2 +- .../pp/logic/ChargingCompletedDataLogic.java | 2 +- .../xhpc/pp/logic/ChargingConfigDataLogic.java | 2 +- .../pp/logic/ChargingHandshakeDataLogic.java | 2 +- .../main/java/com/xhpc/pp/logic/HBLogic.java | 4 ++-- .../java/com/xhpc/pp/logic/OrderDataLogic.java | 4 ++-- .../pp/logic/PileTimeConfigReplyDataLogic.java | 2 +- .../logic/RateModelConfigReplyDataLogic.java | 2 +- .../xhpc/pp/logic/RateModelRequestLogic.java | 4 ++-- .../xhpc/pp/logic/RateModelValidateLogic.java | 4 ++-- .../com/xhpc/pp/logic/RealtimeDataLogic.java | 2 +- .../java/com/xhpc/pp/logic/RegisterLogic.java | 4 ++-- .../pp/logic/RemoteStartReplyDataLogic.java | 2 +- .../pp/logic/RemoteStopReplyDataLogic.java | 2 +- .../pp/server/ChargingPileBinaryHandler.java | 4 ++-- .../pp/server/ChargingPileEventHandler.java | 2 +- .../com/xhpc/pp/server/ChargingPileServer.java | 18 +++--------------- .../xhpc/pp/utils/security/CacheDataUtils.java | 2 +- 28 files changed, 46 insertions(+), 50 deletions(-) rename xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/redis/{SeqUtil.java => StaticBeanUtil.java} (85%) diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/redis/SeqUtil.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/redis/StaticBeanUtil.java similarity index 85% rename from xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/redis/SeqUtil.java rename to xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/redis/StaticBeanUtil.java index 99c0c3b8..7a264612 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/redis/SeqUtil.java +++ b/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; } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/HxpcChargeOrderServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/HxpcChargeOrderServiceImpl.java index f8abae1a..8857b716 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/HxpcChargeOrderServiceImpl.java +++ b/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){ diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/config/EarlierBeanConf.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/config/EarlierBeanConf.java index 169f9618..3018f97a 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/config/EarlierBeanConf.java +++ b/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 { 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 index 5843740f..5b411993 100644 --- 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 @@ -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 diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/PileController.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/PileController.java index 973d2dcd..080cccb5 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/PileController.java +++ b/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 diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/StationController.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/StationController.java index a34269f8..ca8636f9 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/StationController.java +++ b/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 { diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingDataLogic.java index ad6e037d..dd2b1712 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingDataLogic.java +++ b/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") diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsErrorDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsErrorDataLogic.java index a8a8b670..f519358e 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsErrorDataLogic.java +++ b/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") diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsInterruptDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsInterruptDataLogic.java index 8f9277e4..67577895 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsInterruptDataLogic.java +++ b/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") diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsReqChargerOutputDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsReqChargerOutputDataLogic.java index 6ffd9999..3a2ac92c 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsReqChargerOutputDataLogic.java +++ b/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") diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargerInterruptDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargerInterruptDataLogic.java index 44f795f4..3e2d9680 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargerInterruptDataLogic.java +++ b/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") diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargingCompletedDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargingCompletedDataLogic.java index 2bf90e4d..e013c035 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargingCompletedDataLogic.java +++ b/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") diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargingConfigDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargingConfigDataLogic.java index 7f2d9ac8..dd400f5a 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargingConfigDataLogic.java +++ b/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") diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargingHandshakeDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargingHandshakeDataLogic.java index aacc7597..b68363d6 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargingHandshakeDataLogic.java +++ b/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") diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/HBLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/HBLogic.java index fe1078f7..09bcc386 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/HBLogic.java +++ b/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.pp.server.ChargingPileServer.REDIS; +import static com.xhpc.common.data.redis.StaticBeanUtil.REDIS; +import static com.xhpc.common.data.redis.StaticBeanUtil.seqHex; @Lazy @Component("HBLogic") diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OrderDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OrderDataLogic.java index d3024c4f..14456a27 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OrderDataLogic.java +++ b/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.pp.server.ChargingPileServer.REDIS; +import static com.xhpc.common.data.redis.StaticBeanUtil.REDIS; +import static com.xhpc.common.data.redis.StaticBeanUtil.seqHex; import static com.xhpc.pp.utils.security.CacheDataUtils.reflectTranslate; @Lazy diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileTimeConfigReplyDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileTimeConfigReplyDataLogic.java index 8738333e..83716140 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileTimeConfigReplyDataLogic.java +++ b/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 diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelConfigReplyDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelConfigReplyDataLogic.java index bbc8b0c1..a3e92055 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelConfigReplyDataLogic.java +++ b/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 diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelRequestLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelRequestLogic.java index 99e1cb2d..493910a0 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelRequestLogic.java +++ b/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.pp.server.ChargingPileServer.REDIS; +import static com.xhpc.common.data.redis.StaticBeanUtil.REDIS; +import static com.xhpc.common.data.redis.StaticBeanUtil.seqHex; import static com.xhpc.pp.utils.security.HexUtils.toHexInt; @Lazy diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelValidateLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelValidateLogic.java index da3e3d6a..d44244d6 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelValidateLogic.java +++ b/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.pp.server.ChargingPileServer.REDIS; +import static com.xhpc.common.data.redis.StaticBeanUtil.REDIS; +import static com.xhpc.common.data.redis.StaticBeanUtil.seqHex; @Lazy @Component("RateModelValidateLogic") diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java index 82cdd725..ca73b27b 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java +++ b/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; diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RegisterLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RegisterLogic.java index 74eb07b6..2206bd1a 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RegisterLogic.java +++ b/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") diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteStartReplyDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteStartReplyDataLogic.java index 373080da..43e97d1d 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteStartReplyDataLogic.java +++ b/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 diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteStopReplyDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteStopReplyDataLogic.java index 68c10c8e..3e48fc0b 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteStopReplyDataLogic.java +++ b/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 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 c2c25730..aa6ced85 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 @@ -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.pp.server.ChargingPileServer.REDIS; +import static com.xhpc.common.data.redis.StaticBeanUtil.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; diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/ChargingPileEventHandler.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/ChargingPileEventHandler.java index a45a38d0..f13c33f9 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/ChargingPileEventHandler.java +++ b/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 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 42db251b..bd27d967 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,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 handlerMap = new HashMap<>(); private static Map versionMapper = new HashMap<>(); private static Map 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, "充电桩离线,订单实时数据可能中断"); } } } diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/utils/security/CacheDataUtils.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/utils/security/CacheDataUtils.java index d8138bf0..59589acf 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/utils/security/CacheDataUtils.java +++ b/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 {