From 722b3b81ff774706f3aa2ea5c67919c9de565d61 Mon Sep 17 00:00:00 2001 From: ZZ Date: Fri, 25 Feb 2022 17:29:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E6=B5=81=E5=88=B7=E5=8D=A1;=E8=B4=B9?= =?UTF-8?q?=E7=8E=87=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1;naming..?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xhpc/pp/utils/HexUtils.java | 4 ++-- .../java/com/xhpc/pp/logic/RealtimeDataLogic.java | 6 +++--- .../java/com/xhpc/pp/server/RateModelTask.java | 14 +++++++------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/pp/utils/HexUtils.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/pp/utils/HexUtils.java index 6391baac..8659c322 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/pp/utils/HexUtils.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/pp/utils/HexUtils.java @@ -213,8 +213,8 @@ public class HexUtils { // System.out.println(reverseHexInt("FF00")); // byte[] data1 = toBytes(reverseHex("10270000")); // System.out.println(toInteger(data1, 0, 4)); - System.out.println(reverseHexInt("6C3E0000")); - System.out.println(reverseHexInt("80FA4800")); + System.out.println(reverseHexInt("EA600000")); + System.out.println(reverseHexInt("000060EA")); System.out.println(reverseHexInt("5D000000")); System.out.println(toHexInt(82)); // System.out.println(toHexInt(3800)); 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 b2390a05..d6a587f5 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 @@ -111,11 +111,11 @@ public class RealtimeDataLogic implements ServiceLogic { Map cacheOrder = REDIS.getCacheMap(orderkey); if (!orderNo.equals("00000000000000000000000000000000")) { if (statusInt == 3) { - Boolean o = (Boolean) cachePile.get("ac.on"); + Boolean o = (Boolean) cacheGun.get("ac.on"); if (o != null && !o) { R r = pileOrderService.pileStartup(orderNo, 1, "启动充电成功"); if (r.getCode() == 200) { - cachePile.put("ac.on", true); + cacheGun.put("ac.on", true); } } List realtimeDataList = (List) cacheOrder.get("realtimeDataList"); @@ -266,7 +266,7 @@ public class RealtimeDataLogic implements ServiceLogic { int sumPeriod = Integer.parseInt(hex.substring(0, 2), 16); List cds = new ArrayList<>(); - for (int i = 10; i < sumPeriod * 16 + 10; i = i + 16) { + for (int i = 10; i < sumPeriod * 16 + 10; i = i + 16) { // todo ChargeDetails cd = new ChargeDetails(); cd.setDetailPower(HexUtils.reverseHexInt(hex.substring(i, i + 8)) / 100000.0); cd.setDetailElecMoney(HexUtils.reverseHexInt(hex.substring(i + 8, i + 16)) / 100000.0); diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/RateModelTask.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/RateModelTask.java index 8a221aa0..185ed381 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/RateModelTask.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/RateModelTask.java @@ -29,10 +29,10 @@ public class RateModelTask { Long rateModelIdStation = stationDto.getRateModelId(); if (rateModelIdStation != null) { Set pks = stationDto.getPiles(); - if (pks != null) for (String pk : pks) { - pk = "pile:".concat(pk); - Long rateModelIdPile = REDIS.getCacheMapValue(pk, "rateModelId"); + if (pks != null) for (String pileNo : pks) { + Long rateModelIdPile = REDIS.getCacheMapValue(pileNo, "rateModelId"); if (!rateModelIdStation.equals(rateModelIdPile)) { + String pk = "pile:".concat(pileNo); String gkPattern = ("gun:").concat(pk).concat("*"); Collection gks = REDIS.keys(gkPattern); boolean charging = false; @@ -43,15 +43,15 @@ public class RateModelTask { } } if (!charging) { - ClientHandler handler = getHandler(pk); + ClientHandler handler = getHandler(pileNo); if (handler != null && handler.isOpen()) { - String rsmsg = RateModelRequestLogic.translate(pk, rateModelIdStation, "0058", + String rsmsg = RateModelRequestLogic.translate(pileNo, rateModelIdStation, "0058", REDIS.getCacheMapValue(pk, "version")); try { handler.sendClientBinary(HexUtils.toBytes(rsmsg)); - log.info("pile[{}] rate model[{}] sent ⚪", pk, rateModelIdStation); + log.info("pile[{}] rate model[{}] sent ⚪ {}", pileNo, rateModelIdStation, rsmsg); } catch (IOException e) { - log.error("pile[{}] rate model[{}] not sent ×", pk, rateModelIdStation); + log.error("pile[{}] rate model[{}] not sent ×", pileNo, rateModelIdStation); } } }