From 276ce2ba5e91523f3c202cce0b0a8bae43630a5e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 03 六月 2025 10:37:21 +0800
Subject: [PATCH] 表阀一体协议与测控一体阀协议进行兼容时，阀门状态位判断未做兼容修改，本次进行修改并进行必要注释。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_C2_Up.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_C2_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_C2_Up.java
index 0116cc3..20c8507 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_C2_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_C2_Up.java
@@ -79,12 +79,19 @@
callback.callback(midRs.reportOrResponse_trueOrFalse, para.data.subData==null?null:((DataV202404)(para.data.subData)).subData);
if(para.data != null && para.data.getSubData() != null){
DataCdC2Vo subData = (DataCdC2Vo)((DataV202404)para.data.getSubData()).subData ;
+ /* 2025-06-03 涓嬮潰闃�闂ㄧ姸鎬佹槸鍘熸潵瀹炵幇锛岀幇鍦ㄧ粺璁℃敼涓虹敤鐘舵�佷綅鏁版嵁鍒ゆ柇闃�闂ㄧ姸鎬�
// public Byte opType2 ;//寮�鍚叧闂細0: 寮�鍚� -1:鍏抽棴
// public Boolean success ;//鎵ц缁撴灉锛坱rue鎴愬姛, false澶辫触锛�
if(subData.opType2.byteValue() == 0 && subData.success){
callback.notify(new ValveStateInfo(true));
- }else if(subData.opType2.byteValue() == 1 && subData.success){
+ }else if(subData.opType2.byteValue() == -1 && subData.success){
callback.notify(new ValveStateInfo(false));
+ }
+ */
+ if(subData.statePump != null){
+ //(琛ㄩ榾涓�浣撴満锛�1锛氬紑娉�/闃�锛�0锛氬叧娉�/闃�)(娴嬫帶涓�浣撻榾锛�0锛氬紑娉�/闃�锛�1锛氬叧娉�/闃�)
+ //鍗忚瑙ｆ瀽鏃讹紝缁熶竴杞崲涓轰簡娴嬫帶涓�浣撻榾锛�
+ callback.notify(new ValveStateInfo(subData.statePump.byteValue()== 0?true:false));
}
}
@@ -99,9 +106,9 @@
* @throws Exception 寮傚父
*/
protected void doParse(byte[] bs, int bsLen, String dataCode, Data data) throws Exception {
- DataV202404 dV1 = (DataV202404)data.getSubData() ;
+ DataV202404 dV202404 = (DataV202404)data.getSubData() ;
DataCdC2Vo cdData = new DataCdC2Vo(CodeV202404.getCodeName(dataCode)) ;
- dV1.subData = cdData ;
+ dV202404.subData = cdData ;
int index = ProtocolConstantV206V202404.dataIndex ;
cdData.controllerType = ByteUtil.bytes2Hex(bs, false, index, 1) ;
@@ -124,15 +131,11 @@
cdData.success = false ;
}
- if(!cdData.success){
- return ;
- }
-
index++ ;
cdData.orderNo = ByteUtil.BCD2String_BE(bs, index, index + 7) ;
index += 8 ;
- GlParse.parseRtuDt(bs, index);
+ cdData.rtuDt = GlParse.parseRtuDt(bs, index);
index+= 6 ;
GlParse.parseAlarmAndState(bs, index, cdData);//鍥涗釜瀛楄妭
--
Gitblit v1.8.0