From 7a30cb7329eb065d9a95213b327818412c2d5d0e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 03 三月 2025 14:22:22 +0800
Subject: [PATCH] 1、表阀一体机新协议解析优化； 2、取水口实体编辑更新逻辑修改，去除引起bug的代码。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/MidResultToRtu.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/MidResultToRtu.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/MidResultToRtu.java
index 4c58abe..0984a87 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/MidResultToRtu.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/MidResultToRtu.java
@@ -10,13 +10,13 @@
serialVersionUID = 201606271057003L;
}
+ public String rtuResultSendWebUrl ;//rtu杩斿洖鍛戒护缁撴灉 鍙戝悜鐩殑鍦皐eb URL
public String protocolName ;//鍗忚鍚嶇О
- public String rtuAddr ;//IMEI鍙�(鐢典俊骞冲彴IMEI)
- public String meterNo ;//姘磋〃鍙�
- public Integer productId ;//鐢典俊骞冲彴浜у搧ID
- public String deviceId ;//鐢典俊骞冲彴璁惧ID
+ public Short protocolVersion ;//鍗忚鐗堟湰鍙�
+ public String rtuAddr ;//Rtu鍦板潃
public String commandId ;//鍛戒护ID锛屽彂璧峰懡浠ょ殑瀹㈡埛绔�(web绔�)鐢熸垚锛屼互鍖归厤鍛戒护缁撴灉
public String downCode ;//涓嬭鍛戒护鍔熻兘鐮�;
+ public String downCodeName ;//涓嬭鍛戒护鍔熻兘鐮佸悕绉�;
public byte[] downBuffer ;//涓嬭鍛戒护鏁版嵁
public String downBufHex ;//涓嬭鍛戒护鏁版嵁鍗佸叚杩涘埗褰㈠紡
public boolean hasResponse ;//鏄惁鏈夊簲绛�
@@ -24,13 +24,20 @@
public boolean isCachForOffLine ;//RTU涓嶅湪绾匡紝鍛戒护鏄惁缂撳瓨
public boolean isSendFirst;//浼樺厛鍏朵粬鍙戦�侊紝渚嬪鍚勫懡浠ょ殑搴旂瓟
- public boolean isQuickSend;//閫熷彂鍛戒护锛屽嵆涓嶅彈涓嬪彂鏁版嵁鏃堕棿闂撮殧闄愬埗
-
+ public boolean isQuickSend;//閫熷彂鍛戒护锛屽嵆涓嶅彈涓嬪彂鏁版嵁鏃堕棿闂撮殧闄愬埗(閫氫俊涓棿浠朵负浣庡姛鑰楁椂璧蜂綔鐢�)
+ public boolean isFastCom;//蹇�熷懡浠わ紝涓嬪彂鏁版嵁鏃堕棿闂撮殧鍙楀皬鍊硷紙閰嶇疆鏂囦欢涓璮astCommandSendInterval锛夐檺鍒讹紙濡傚崌绾у懡浠わ級
+
+ public int countdown4Send;////鍊掕鏃讹紝褰撴鍊间负灏忎簬绛変簬0鏃舵墠浼氫笅鍙戯紝鍚﹀垯閫愭鍑�1锛岀洰鐨勬槸寤惰繜涓嬪彂鍛戒护锛屼娇鍏朵粬鍛戒护鍙互鎻愬墠鍙戦��
+
+ //public Object param ;//缂撳瓨涓�浜涙暟鎹紝渚嬪涓哄吋瀹圭帇宸ワ紙姹熸捣锛夊崗璁笌闈虫�诲崗璁紙铏氭嫙IC鍗＄紪鍙烽暱搴︿笉涓�鑷达級锛屾妸涓嶅吋瀹圭殑铏氭嫙IC鍗＄紪鍙风殑鍓嶅崐閮ㄥ垎鏀惧叆姝ゅ
+
public MidResultToRtu(){
hasResponse = true ;
isCachForOffLine = false ;
isSendFirst = false ;
isQuickSend = false ;
+ isFastCom = false ;
+ countdown4Send = 0 ;
}
@Override
--
Gitblit v1.8.0