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 f8f89018..71e2d884 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 @@ -82,8 +82,8 @@ public class ChargingController { ClientHandler clientHandler = ChargingPileServer.getHandler(pileNo); if (clientHandler == null) return R.fail("充电桩没有连接到上次注册的服务器"); try { - String gunKey = "gun:".concat(pileNo).concat(startChargingData.getGunId()); - String skey = gunKey.concat(".seqhex"); + String gunkey = "gun:".concat(pileNo).concat(startChargingData.getGunId()); + String skey = gunkey.concat(".seqhex"); String seq = seqHex(skey); byte[] msg = translateSucc(startChargingData, seq); clientHandler.sendClientBinary(msg); 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 ddff1aeb..f4d9cf51 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 @@ -28,10 +28,10 @@ public class HBLogic implements ServiceLogic { String gunId = (String) req.get("gunId"); String gunStatus = (String) req.get("gunStatus"); int gunStatusInt = Integer.parseInt(gunStatus); - String gunKey = "gun:".concat(pileNo).concat(gunId); - Map cacheGun = REDIS.getCacheMap(gunKey); + String gunkey = "gun:".concat(pileNo).concat(gunId); + Map cacheGun = REDIS.getCacheMap(gunkey); cacheGun.put("status", gunStatusInt); - REDIS.setCacheMap(gunKey, cacheGun); + REDIS.setCacheMap(gunkey, cacheGun); String resultStr = "680D00000004".concat(pileNo).concat(gunId).concat(ServiceResult.HEX_OK); resultStr = resultStr.concat(CRCCalculator.calcCrc(resultStr)); return new ServiceResult(HexUtils.toBytes(resultStr), ServiceResult.OK); 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 9c744305..11b0fe94 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 @@ -34,11 +34,11 @@ public class RealtimeDataLogic implements ServiceLogic { String status = realtimeData.getStatus(); realtimeData.setCreateBy("SYSTEM"); realtimeData.setCreateTime(Calendar.getInstance().getTime()); - String pileGun = pileNo.concat(gunId); - Map cacheGun = REDIS.getCacheMap(pileGun); + String gunkey = "gun:".concat(pileNo).concat(gunId); + Map cacheGun = REDIS.getCacheMap(gunkey); cacheGun.put("status", status); cacheGun.put("soc", realtimeData.getSoc()); - REDIS.setCacheMap(pileGun, cacheGun); + REDIS.setCacheMap(gunkey, cacheGun); String orderNo = realtimeData.getOrderNo(); Map order = REDIS.getCacheMap(orderNo); List realtimeDataList = (List) order.get("realtimeDataList"); 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..0565e2ea 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 @@ -39,10 +39,10 @@ public class RegisterLogic implements ServiceLogic { int gunNum = Integer.parseInt(req.get("gunNum").toString()); for (int gunN = 1; gunN <= gunNum; gunN++) { String gunId = String.format("%02d", (int) gunN); - String gunKey = "gun:".concat(pileNo.concat(gunId)); - Map cacheGun = REDIS.getCacheMap(gunKey); + String gunkey = "gun:".concat(pileNo.concat(gunId)); + Map cacheGun = REDIS.getCacheMap(gunkey); cacheGun.put("svcSrv", getLocalIPAndPort()); - REDIS.setCacheMap(gunKey, cacheGun); + REDIS.setCacheMap(gunkey, cacheGun); } String resultStr = "680C00000002".concat(pileNo).concat(hexCode); resultStr = resultStr.concat(CRCCalculator.calcCrc(resultStr)); 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 04e236c9..8aad7205 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 @@ -113,8 +113,8 @@ public class ChargingPileBinaryHandler implements ClientBinaryHandler { int gunNum = Integer.parseInt(req.get("gunNum").toString()); for (int gunN = 1; gunN <= gunNum; gunN++) { String gunId = String.format("%02d", (int) gunN); - String gunKey = pileNo.concat(gunId); - cachePileGunSvcSrv("svcSrvGun:", gunKey); + String gunkey = pileNo.concat(gunId); + cachePileGunSvcSrv("svcSrvGun:", gunkey); } log.info("pile registering >>>> [{}] ", pileNo); }