From 7aab004601e77890b158f19d1735594a8326feaa Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 24 四月 2025 17:11:17 +0800
Subject: [PATCH] 数据库事务注解位置调整

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

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_10_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_10_Up.java
index 8c7d5da..434be53 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_10_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_10_Up.java
@@ -25,7 +25,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,
@@ -45,7 +45,7 @@
 
         midRs.reportOrResponse_trueOrFalse = false ;//鍛戒护搴旂瓟
 
-        callback.callback(midRs.reportOrResponse_trueOrFalse);
+        callback.callback(midRs.reportOrResponse_trueOrFalse, para.data.subData==null?null:((DataV1)(para.data.subData)).subData);
         return new MidResult[]{midRs} ;
     }
     /**
@@ -60,7 +60,7 @@
         DataV1 dV1 = (DataV1)data.getSubData() ;
         DataCd10Vo cdData = new DataCd10Vo() ;
         dV1.subData = cdData ;
-        cdData.newRtuAddr = new CommonV1().parseRtuAddr(bs, ProtocolConstantV206V1.dataIndex) ;
+        cdData.newRtuAddr = new CommonV1().parseRtuAddr(bs, ProtocolConstantV206V1.dataIndex, true) ;
     }
 
 }

--
Gitblit v1.8.0