From 8dc79f02f4a538bb1d94c7f577db21d9d072cd67 Mon Sep 17 00:00:00 2001 From: ZZ Date: Tue, 3 Aug 2021 17:46:25 +0800 Subject: [PATCH] =?UTF-8?q?0x04=E5=BF=83=E8=B7=B3=E5=9B=9E=E5=A4=8D?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xhpc/pp/logic/HBLogic.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) 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 b0a5e00f..ddff1aeb 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 @@ -27,15 +27,11 @@ public class HBLogic implements ServiceLogic { String pileNo = (String) req.get("pileNo"); String gunId = (String) req.get("gunId"); String gunStatus = (String) req.get("gunStatus"); - int gunStatusInt = 0; - if (ServiceResult.HEX_FAIL.equals(gunStatus)) - gunStatusInt = 1; - String gunKey = pileNo.concat(gunId); + int gunStatusInt = Integer.parseInt(gunStatus); + String gunKey = "gun:".concat(pileNo).concat(gunId); Map cacheGun = REDIS.getCacheMap(gunKey); - int cacheGunStatus = cacheGun.get(gunKey); - if ((1 == cacheGunStatus && 0 == gunStatusInt) || (0 == cacheGunStatus && 1 == gunStatusInt)) { - cacheGun.put(gunKey, gunStatusInt); - } + cacheGun.put("status", gunStatusInt); + 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);