diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/BaseData.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/BaseData.java index 6c676ba3..8adf375a 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/BaseData.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/BaseData.java @@ -9,16 +9,27 @@ public class BaseData implements Serializable { private String createBy; private String createTime; private String hex; - private int seq; + private String seqhex; + private int seqint; - public int getSeq() { + public String getSeqhex() { - return seq; + return seqhex; } - public void setSeq(int seq) { + public void setSeqhex(String seqhex) { - this.seq = seq; + this.seqhex = seqhex; + } + + public int getSeqint() { + + return seqint; + } + + public void setSeqint(int seqint) { + + this.seqint = seqint; } public String getCreateBy() { 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 491c2112..0c7b7765 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 @@ -213,7 +213,7 @@ public class ChargingPileBinaryHandler implements ClientBinaryHandler { pos += field.getLen(); } result.put("hex", toHex(data)); - result.put("seq", getSeq(data)); + result.put("seqhex", getSeq(data)); return result; }