From a01c480dc47f8a2ee8324db50957328ab53df585 Mon Sep 17 00:00:00 2001 From: ZZ Date: Wed, 28 Jul 2021 11:54:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E5=8F=96=E5=B8=B8=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xhpc/common/Constants.java | 7 +++++++ .../java/com/xhpc/pp/controller/ChargingController.java | 3 --- .../main/java/com/xhpc/pp/controller/PileController.java | 9 +++++---- .../src/main/java/com/xhpc/pp/logic/RegisterLogic.java | 3 ++- 4 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/Constants.java diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/Constants.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/Constants.java new file mode 100644 index 00000000..ee25f680 --- /dev/null +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/Constants.java @@ -0,0 +1,7 @@ +package com.xhpc.common; + +public class Constants { + + public static final String PILE_WHITELIST = "PILE_WHITELIST"; + +} 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 cf1ac987..0852ff42 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 @@ -7,7 +7,6 @@ import com.ruoyi.common.core.utils.HttpUtils; import com.xhpc.common.api.PowerPileService; import com.xhpc.common.data.down.StartChargingData; import com.xhpc.common.data.up.OrderData; -import com.xhpc.pp.logic.FieldLogic; import com.xhpc.pp.server.ChargingPileServer; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.utils.security.CRCCalculator; @@ -38,8 +37,6 @@ public class ChargingController { @Autowired private PowerPileService powerPileService; - @Autowired - private FieldLogic fieldLogic; @PostMapping("test/pile/charging/order") 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 ce6849e7..66c4a752 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 @@ -5,6 +5,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Set; +import static com.xhpc.common.Constants.PILE_WHITELIST; import static com.xhpc.pp.server.ChargingPileServer.REDIS; @RestController @@ -13,18 +14,18 @@ public class PileController { @PostMapping("pile/whitelist") public Object addWhitelist(@RequestBody Set whitelist) { - Set cacheWhitelist = REDIS.getCacheSet("PILE_WHITELIST"); + Set cacheWhitelist = REDIS.getCacheSet(PILE_WHITELIST); cacheWhitelist.addAll(whitelist); - REDIS.setCacheSet("PILE_WHITELIST", cacheWhitelist); + REDIS.setCacheSet(PILE_WHITELIST, cacheWhitelist); return R.ok(); } @DeleteMapping("pile/whitelist/{pileNo}") public Object deleteWhitelist(@PathVariable String pileNo) { - Set cacheWhitelist = REDIS.getCacheSet("PILE_WHITELIST"); + Set cacheWhitelist = REDIS.getCacheSet(PILE_WHITELIST); cacheWhitelist.remove(pileNo); - REDIS.setCacheSet("PILE_WHITELIST", cacheWhitelist); + REDIS.setCacheSet(PILE_WHITELIST, cacheWhitelist); return R.ok(); } 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 4b76b67c..47ffd4fb 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 @@ -13,6 +13,7 @@ import org.springframework.stereotype.Component; import java.util.Map; import java.util.Set; +import static com.xhpc.common.Constants.PILE_WHITELIST; import static com.xhpc.pp.config.EarlierBeanConf.getLocalIPAndPort; import static com.xhpc.pp.server.ChargingPileServer.REDIS; @@ -31,7 +32,7 @@ public class RegisterLogic implements ServiceLogic { String resultCode = ServiceResult.OK; String hexCode = ServiceResult.HEX_OK; String pileNo = (String) req.get("pileNo"); - Set whitelist = REDIS.getCacheSet("PILE_WHITELIST"); + Set whitelist = REDIS.getCacheSet(PILE_WHITELIST); if (!whitelist.contains(pileNo)) { hexCode = ServiceResult.HEX_FAIL; resultCode = ServiceResult.FAIL;