From 8a49b1da68c95287ebc1dbbbb18c1b05abc7a63e Mon Sep 17 00:00:00 2001 From: ZZ Date: Thu, 12 Aug 2021 14:47:58 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=90=AF=E5=81=9C=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xhpc/pp/controller/ChargingController.java | 7 ++++++- .../java/com/xhpc/pp/controller/PileController.java | 8 -------- .../com/xhpc/pp/controller/StationController.java | 7 ------- .../xhpc/pp/logic/RemoteStartReplyDataLogic.java | 13 ++++++++++--- .../com/xhpc/pp/logic/RemoteStopReplyDataLogic.java | 10 +++++++++- .../xhpc/pp/server/ChargingPileBinaryHandler.java | 5 +---- 6 files changed, 26 insertions(+), 24 deletions(-) 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 bd39a23e..6103a274 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 @@ -40,7 +40,10 @@ public class ChargingController { @PostMapping("test/pile/charging/order") public Object test(@Validated @RequestBody StartChargingData startChargingData) { - R r = powerPileService.startCharging(startChargingData); + R r = R.ok(); + for (int i = 0; i < startChargingData.getBalance(); i++) { + r = powerPileService.startCharging(startChargingData); + } return r; } @@ -207,6 +210,8 @@ public class ChargingController { cacheOrder.put("balance", balance); cacheOrder.put("tel", startChargingData.getTel()); REDIS.setCacheMap(orderkey, cacheOrder); + Map cacheGun = REDIS.getCacheMap(gunkey); + cacheGun.put("orderkey", orderkey); return R.ok(); } catch (IOException e) { log.error("send message failed. " + e.getMessage(), e); 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 ce39cce3..2008303d 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 @@ -38,10 +38,6 @@ public class PileController { cacheStation.getPiles().addAll(pileNoSet); } REDIS.setCacheObject(stationKey, cacheStation); - String rmskey = "rateModelStation:".concat(stationId.toString()); - Set cacheSettingRateModelSet = REDIS.getCacheSet(rmskey); - cacheSettingRateModelSet.addAll(pileNoSet); - REDIS.setCacheSet(rmskey, cacheSettingRateModelSet); for (String pileNo : pileNoSet) { String pkey = "pile:".concat(pileNo); Map cachePile = REDIS.getCacheMap(pkey); @@ -61,10 +57,6 @@ public class PileController { ChargingStationDto cacheStation = REDIS.getCacheObject(stationKey); cacheStation.getPiles().removeAll(pileNoSet); REDIS.setCacheObject(stationKey, cacheStation); - String rmskey = "rateModelStation:".concat(stationId.toString()); - Set cacheSettingRateModelSet = REDIS.getCacheSet(rmskey); - cacheSettingRateModelSet.removeAll(pileNoSet); - REDIS.setCacheSet(rmskey, cacheSettingRateModelSet); return R.ok(); } 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 9311d177..a34269f8 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,8 +8,6 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import java.util.Set; - import static com.xhpc.pp.server.ChargingPileServer.REDIS; @RestController @@ -25,11 +23,6 @@ public class StationController { REDIS.setCacheObject(skey, cacheStation); String rkey = "rateModel:".concat(rateModelId.toString()); REDIS.setCacheObject(rkey, rateModel); - Set piles = cacheStation.getPiles(); - if (piles!=null) { - String rmskey = "rateModelStation:".concat(stationId.toString()); - REDIS.setCacheSet(rmskey, piles); - } return R.ok(); } 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 9ac7adea..34b29a54 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 @@ -1,7 +1,7 @@ package com.xhpc.pp.logic; import com.fasterxml.jackson.databind.ObjectMapper; -import com.xhpc.common.data.up.PileStartChargingData; +import com.xhpc.common.data.up.RemoteStartReplyData; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; @@ -12,6 +12,8 @@ import org.springframework.stereotype.Component; import java.util.Map; +import static com.xhpc.pp.server.ChargingPileServer.REDIS; + @Lazy @Component("RemoteStartReplyDataLogic") public class RemoteStartReplyDataLogic implements ServiceLogic { @@ -23,8 +25,13 @@ public class RemoteStartReplyDataLogic implements ServiceLogic { Map req = sp.getParameters(); ObjectMapper objectMapper = new ObjectMapper(); - PileStartChargingData pileStartChargingData = objectMapper.convertValue(req, PileStartChargingData.class); - //todo + RemoteStartReplyData remoteStartReplyData = objectMapper.convertValue(req, RemoteStartReplyData.class); + String orderNo = remoteStartReplyData.getOrderNo(); + String orderkey = "order:".concat(orderNo); + Map cacheOrder = REDIS.getCacheMap(orderkey); + String startResult = remoteStartReplyData.getStartResult(); + cacheOrder.put("startResult", startResult); + REDIS.setCacheMap(orderkey, cacheOrder); return new ServiceResult(false); } 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 384b2b80..c9eee5a2 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 @@ -12,6 +12,8 @@ import org.springframework.stereotype.Component; import java.util.Map; +import static com.xhpc.pp.server.ChargingPileServer.REDIS; + @Lazy @Component("RemoteStopReplyDataLogic") public class RemoteStopReplyDataLogic implements ServiceLogic { @@ -24,7 +26,13 @@ public class RemoteStopReplyDataLogic implements ServiceLogic { Map req = sp.getParameters(); ObjectMapper objectMapper = new ObjectMapper(); RemoteStopReplyData remoteStopReplyData = objectMapper.convertValue(req, RemoteStopReplyData.class); - //todo + String gunkey = "gun:".concat(remoteStopReplyData.getPileNo()).concat(remoteStopReplyData.getGunId()); + Map cacheGun = REDIS.getCacheMap(gunkey); + String orderkey = (String) cacheGun.get("orderkey"); + Map cacheOrder = REDIS.getCacheMap(orderkey); + String stopResult = remoteStopReplyData.getStopResult(); + cacheOrder.put("stopResult", stopResult); + REDIS.setCacheMap(orderkey, cacheOrder); return new ServiceResult(false); } 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 f76c67bf..510cdfc1 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 @@ -94,9 +94,6 @@ public class ChargingPileBinaryHandler implements ClientBinaryHandler { } else if (SERVICE_RMCR.equals(serviceName) && OK.equals(resultCode)) { setCachePileRM(pilekey); } -// } else if (SERVICE_HB.equals(serviceName)) { -// TODO -// } if (result.getBinary() != null) { log.info("server send msg >>>> ({}) |{}|", pileNo, HexUtils.toHex(result.getBinary())); handler.sendClientBinary(result.getBinary()); @@ -106,7 +103,7 @@ public class ChargingPileBinaryHandler implements ClientBinaryHandler { } } - private void regHandler(ClientHandler handler, String pileNo, Map req) throws NacosException { + private void regHandler(ClientHandler handler, String pileNo, Map req) { ChargingPileServer.putHandler(pileNo, handler); ChargingPileServer.putVersion(handler.getName(), (String) req.get("version"));