From 9aafec73f2a5df0ccee2712505c63d44d91336c6 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期一, 28 四月 2025 14:40:09 +0800 Subject: [PATCH] 1、端口、IP、标签配置.docx文档修改:民勤配置项变化; 2、农户取水年度统计逻辑变化; 3、灌溉计划迟延时间可配置。 --- pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/tcpClient/RtuUpData.java | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/tcpClient/RtuUpData.java b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/tcpClient/RtuUpData.java index 8318a46..37a0fc7 100644 --- a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/tcpClient/RtuUpData.java +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/tcpClient/RtuUpData.java @@ -27,7 +27,7 @@ bsHead[index] = ctrl; //鎺у埗鍩熷姛鑳界爜 index++ ; - GlCreate.createRtuAddr(rtuAddr, bsHead, index); + GlCreate.createRtuAddr4P206(rtuAddr, bsHead, index); index += 5 ; ByteUtil.hex2Bytes(code, bsHead, index) ; @@ -51,7 +51,7 @@ GlCreate.createLen(bytes);//闀垮害鏀惧瓧鑺傛暟缁勪腑 - byte[] bsTail = GlCreate.createCrcTail(bytes) ;//CRC鍜屽熬鍙犲姞瀛楄妭鏁扮粍涓� + byte[] bsTail = GlCreate.createCrcTail4P206(bytes) ;//CRC鍜屽熬鍙犲姞瀛楄妭鏁扮粍涓� bytes = ByteUtil.bytesMerge(bytes, bsTail) ; @@ -104,7 +104,7 @@ GlCreate.createLen(bytes);//闀垮害鏀惧瓧鑺傛暟缁勪腑 - byte[] bsTail = GlCreate.createCrcTail(bytes) ;//CRC鍜屽熬鍙犲姞瀛楄妭鏁扮粍涓� + byte[] bsTail = GlCreate.createCrcTail4P206(bytes) ;//CRC鍜屽熬鍙犲姞瀛楄妭鏁扮粍涓� bytes = ByteUtil.bytesMerge(bytes, bsTail) ; @@ -195,7 +195,7 @@ GlCreate.createLen(bytes);//闀垮害鏀惧瓧鑺傛暟缁勪腑 - byte[] bsTail = GlCreate.createCrcTail(bytes) ;//CRC鍜屽熬鍙犲姞瀛楄妭鏁扮粍涓� + byte[] bsTail = GlCreate.createCrcTail4P206(bytes) ;//CRC鍜屽熬鍙犲姞瀛楄妭鏁扮粍涓� bytes = ByteUtil.bytesMerge(bytes, bsTail) ; @@ -224,7 +224,7 @@ bsHead[index] = commonV_1.createCtrl((byte)0x80, (byte)3) ;//鎺у埗鍩熷姛鑳界爜3锛氳嚜鎶ュ抚锛屾祦閲忥紙姘撮噺锛夊弬鏁� index++ ; - GlCreate.createRtuAddr(rtuAddr, bsHead, index); + GlCreate.createRtuAddr4P206(rtuAddr, bsHead, index); index += 5 ; ByteUtil.hex2Bytes("C0", bsHead, index) ; @@ -277,7 +277,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