From 43a19a4424f67c379934ed0d70e0d1b3512cd769 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 27 三月 2025 09:31:44 +0800
Subject: [PATCH] 灌溉计划表中增加项目ID字段，计划列表返回值中增加项目名称，项目状态改为整数表示
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_1601_Down.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_1601_Down.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_1601_Down.java
index 845a90a..edc3511 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_1601_Down.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_1601_Down.java
@@ -37,6 +37,9 @@
midRs.maxSendTimes = null ;//鍛戒护鏈�澶у彂閫佹鏁�(褰撴敹涓嶅埌搴旂瓟鏃讹紝灏嗛噸鍙�)锛屽鏋滀笉璁剧疆锛屽懡浠ょ紦瀛樺櫒杩涜琛ュ厖璁剧疆
midRs.isCachForOffLine = false ;//RTU涓嶅湪绾匡紝鍛戒护鏄惁缂撳瓨锛屼綆鍔熻�楁椂涓簍rue
+ midRs.isFastCom = true ;//閫熷彂鍛戒护锛屼笅鍙戞暟鎹椂闂撮棿闅斿彈灏忓�硷紙閰嶇疆鏂囦欢涓璮astCommandSendInterval锛夐檺鍒�
+ midRs.countdown4Send = 10 ;//鍊掕鏃讹紝褰撴鍊间负灏忎簬绛変簬0鏃舵墠浼氫笅鍙戯紝鍚﹀垯閫愭鍑�1锛岀洰鐨勬槸寤惰繜涓嬪彂鍛戒护锛屼娇鍏朵粬鍛戒护鍙互鎻愬墠鍙戦��
+
if(isLowPower != null && isLowPower.booleanValue()){
//浣庡姛鑰楁椂锛屽敖蹇彂閫�
midRs.isQuickSend = true ;
@@ -87,18 +90,21 @@
ByteUtil.int2Bytes_BE(bs, vo.totalByte, 0);
bytes = ByteUtil.bytesMerge(bytes, bs) ;
- bs = new byte[2] ;
- ByteUtil.short2Bytes_BE(bs, (short)vo.softCrc, 0);
- bytes = ByteUtil.bytesMerge(bytes, bs) ;
-
- bs = new byte[2] ;
- ByteUtil.short2Bytes_BE(bs, (short)vo.softCrc, 0);
+ bs = new byte[4] ;
+ byte[] crcBs = new byte[4] ;
+ ByteUtil.int2Bytes_BE(crcBs, vo.softCrc, 0);
+ bs[0] = crcBs[2] ;
+ bs[1] = crcBs[3] ;
+ bs[2] = crcBs[2] ;
+ bs[3] = crcBs[3] ;
bytes = ByteUtil.bytesMerge(bytes, bs) ;
bs = new byte[4] ;
ByteUtil.hex2Bytes(vo.softStartAddr, bs, 0) ;
bytes = ByteUtil.bytesMerge(bytes, bs) ;
+ GlCreate.createLen4PUg(bytes);//闀垮害鏀惧瓧鑺傛暟缁勪腑
+
byte[] bsTail = GlCreate.createCrcTail4Ug(bytes) ;//CRC鍜屽熬鍙犲姞瀛楄妭鏁扮粍涓�
return ByteUtil.bytesMerge(bytes, bsTail) ;
--
Gitblit v1.8.0