From ff3d35c172c5cf5f3ebf8ed710643f8038c3675b Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期三, 07 五月 2025 11:27:52 +0800 Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_10_Down.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/parse/Cd_10_Down.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_10_Down.java index 855fff8..13cc09f 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_10_Down.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_10_Down.java @@ -66,7 +66,7 @@ throw new Exception("json杞珻om10Vo涓簄ull"); } if (cvo.rtuAddr == null) { - throw new Exception("娴嬭瘯鏂板湴鍧�涓嶈兘涓虹┖"); + throw new Exception("鍦板潃涓嶈兘涓虹┖"); } CommonV1 commonV_1 = new CommonV1(); @@ -85,7 +85,7 @@ bsHead[index] = commonV_1.createCtrl((byte) 0, (byte) 0); index++; - GlCreate.createRtuAddr(para.rtuAddr, bsHead, index); + GlCreate.createRtuAddr4P206(para.rtuAddr, bsHead, index); index += 5; ByteUtil.hex2Bytes(para.commandCode, bsHead, index); @@ -93,7 +93,7 @@ index = 0; byte[] bs = new byte[13]; - GlCreate.createRtuAddr(cvo.rtuAddr, bs, index); + GlCreate.createRtuAddr4P206(cvo.rtuAddr, bs, index); index += 5; GlCreate.createPw(bs, index); index += 2; @@ -102,7 +102,7 @@ GlCreate.createLen(bytes);//闀垮害鏀惧瓧鑺傛暟缁勪腑 - byte[] bsTail = GlCreate.createCrcTail(bytes);//CRC鍜屽熬鍙犲姞瀛楄妭鏁扮粍涓� + byte[] bsTail = GlCreate.createCrcTail4P206(bytes);//CRC鍜屽熬鍙犲姞瀛楄妭鏁扮粍涓� bytes = ByteUtil.bytesMerge(bytes, bsTail); -- Gitblit v1.8.0