From 3087ff4ccc174d5952e9650ac3fae61eff477554 Mon Sep 17 00:00:00 2001 From: wuzeyu <1223318623@qq.com> Date: 星期一, 01 四月 2024 10:42:55 +0800 Subject: [PATCH] 修改 流量计实体增加监测站ID外键和驼峰命名 流量计监测站绑定接口(同步修改流量计的监测站ID外键 和 绑定记录表) 流量计监测站解绑接口(同步修改流量计的监测站ID外键 和 绑定记录表) 条件查询监测站(绑定状态判定) 条件查询已绑定的流量计 回退误修改的获取绑定记录 --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_83_Up.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_83_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_83_Up.java index 381487d..6df3eeb 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_83_Up.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_83_Up.java @@ -116,11 +116,11 @@ cdData.totalAmount += tpInt * 100000000.0 ; //鐢ㄦ按鎴峰彿鏁版嵁鏍煎紡锛�5瀛楄妭BCD鐮佷綆浣嶅湪鍓嶉珮浣嶅湪鍚庛�� - cdData.cardNo = ByteUtil.BCD2String_LE(bs, index, index + 4) ; + cdData.icCardNo = ByteUtil.BCD2String_LE(bs, index, index + 4) ; index += 5 ; //IC鍗″彿鏍煎紡锛�4瀛楄妭HEX鐮佷綆浣嶅湪鍓嶉珮浣嶅湪鍚庛�� - cdData.cardNo = ByteUtil.bytesToHex(bs, index, index + 3) ; + cdData.icCardNo = ByteUtil.bytesToHex(bs, index, index + 3) ; index += 4 ; //鐢ㄦ按鎴蜂綑棰濓細鐢ㄦ埛浣欓4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0.00~999999.99锛屽崟浣嶄负鍏冦�� @@ -174,11 +174,11 @@ cdData.totalAmount += tpInt * 100000000.0 ; //鐢ㄦ按鎴峰彿鏁版嵁鏍煎紡锛�5瀛楄妭BCD鐮佷綆浣嶅湪鍓嶉珮浣嶅湪鍚庛�� - cdData.cardNo = ByteUtil.BCD2String_LE(bs, index, index + 4) ; + cdData.icCardNo = ByteUtil.BCD2String_LE(bs, index, index + 4) ; index += 5 ; //IC鍗″彿鏍煎紡锛�4瀛楄妭HEX鐮佷綆浣嶅湪鍓嶉珮浣嶅湪鍚庛�� - cdData.cardNo = ByteUtil.bytesToHex(bs, index, index + 3) ; + cdData.icCardNo = ByteUtil.bytesToHex(bs, index, index + 3) ; index += 4 ; //鐢ㄦ按鎴蜂綑棰濓細鐢ㄦ埛浣欓4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0.00~999999.99锛屽崟浣嶄负鍏冦�� -- Gitblit v1.8.0