From 04779efe2410fb0df1ff983b26384d56471b85cf Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 08 十一月 2024 08:50:52 +0800
Subject: [PATCH] RTU远程升级管理及相关代码适应性调整与修改

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_83_Up.java |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_83_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_83_Up.java
index 8019737..4512ccb 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_83_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_83_Up.java
@@ -3,7 +3,6 @@
 import com.dy.common.mw.protocol.*;
 import com.dy.common.mw.protocol.p206V1.*;
 import com.dy.common.mw.protocol.p206V1.parse.global.GlParse;
-import com.dy.common.mw.protocol.p206V1.upVos.DataCd81Vo;
 import com.dy.common.mw.protocol.p206V1.upVos.DataCd83CloseVo;
 import com.dy.common.mw.protocol.p206V1.upVos.DataCd83OpenVo;
 import com.dy.common.mw.protocol.rtuState.ValveStateInfo;
@@ -25,7 +24,7 @@
     @Override
     public MidResult[] parse(Boolean isLowPower, CodeParseParams params, CodeParseCallback callback)throws Exception {
         ParseParamsForUpV1 para = (ParseParamsForUpV1)params ;
-        int bsLen = new CommonV1().parseDataLen(para.upBuffer) ;
+        int bsLen = new CommonV1().parseDataLen4P206(para.upBuffer) ;
         if(bsLen > 0){
             this.doParse(para.upBuffer,
                     bsLen,
@@ -78,7 +77,7 @@
             confirmCommand.isQuickSend = true ;
         }
         if(para.data != null && para.data.getSubData() != null){
-            Object subData = para.data.getSubData() ;
+            Object subData = ((DataV1)para.data.getSubData()).subData ;
             if(subData instanceof DataCd83OpenVo){
                 callback.notify(new ValveStateInfo(true));
             }else if(subData instanceof DataCd83CloseVo){
@@ -223,7 +222,7 @@
         Data data = new Data() ;
         data.setSubData(new DataV1()) ;
 
-        int bsLen = new CommonV1().parseDataLen(bs) ;
+        int bsLen = new CommonV1().parseDataLen4P206(bs) ;
         if(bsLen > 0){
             try {
             obj.doParse(bs,

--
Gitblit v1.8.0