From 844c5ecafe57077e0b29c92529ed3390443c71d5 Mon Sep 17 00:00:00 2001 From: zz Date: Wed, 15 Sep 2021 17:47:46 +0800 Subject: [PATCH] seqint seqhex --- .../pp/server/ChargingPileBinaryHandler.java | 2 +- .../com/xhpc/pp/utils/security/HexUtils.java | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) 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 1067cfd4..491c2112 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 @@ -90,7 +90,7 @@ public class ChargingPileBinaryHandler implements ClientBinaryHandler { String version = ChargingPileServer.getVersion(handler.getName()); Map req = analysis(data, serviceName, version); int seq = HexUtils.toInteger(data, 2, 4); - req.put("seq", seq); + req.put("seqint", seq); String pileNo = (String) req.get("pileNo"); ServiceParameter sp = new ServiceParameter(serviceName, pileNo, req); ServiceResult result = servicemainLogic.process(sp); diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/utils/security/HexUtils.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/utils/security/HexUtils.java index 88bc2b4a..dd16e33a 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/utils/security/HexUtils.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/utils/security/HexUtils.java @@ -180,13 +180,17 @@ public class HexUtils { public static void main(String[] args) { - System.out.println(Integer.parseInt("FF00", 16)); - System.out.println(reverseHexInt("FF00")); - byte[] data1 = toBytes(reverseHex("FC080000")); - System.out.println(toInteger(data1, 0, 4)); - System.out.println(reverseHexInt("FC080000")); +// System.out.println(Integer.parseInt("FF00", 16)); +// System.out.println(reverseHexInt("FF00")); +// byte[] data1 = toBytes(reverseHex("FC080000")); +// System.out.println(toInteger(data1, 0, 4)); +// System.out.println(reverseHexInt("FC080000")); // System.out.println(toHexInt(100000)); - System.out.println(toBits("1000")); +// System.out.println(toBits("1000")); + System.out.println(toHex(new byte[]{104, 48, 0, 119, 0, 37, 105, -123, 33, 69, -119, 101, 72, 2, 33, 9, 21, 22, 2, 40 + , 1, 121, 105, -123, 33, 69, -119, 101, 72, 2, 17, 34, 51, 68, 85, 0, -48, 61, 46})); + System.out.println(toHex(new byte[]{104, 48, 0, -19, 0, 37, 105, -123, 33, 69, -119, 101, 72, 2, 33, 9, 21, 22, 2, 40 + , 1, 121, 105, -123, 33, 69, -119, 101, 72, 2, 17, 34, 51, 68, 85, 0, -48, 14, 12})); } }