From 9860dd8d6a437ba7e11168f490f86d4cc6edf584 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期四, 13 六月 2024 22:34:47 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkRtuDealCommandResponse.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkRtuDealCommandResponse.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkRtuDealCommandResponse.java
index 24d7ac2..b01b6c1 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkRtuDealCommandResponse.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkRtuDealCommandResponse.java
@@ -3,6 +3,10 @@
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.dy.common.mw.protocol.p206V1_0_0.*;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd92Vo;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd93Vo;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd97Vo;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd98Vo;
 import com.dy.common.util.DateTime;
 import com.dy.pipIrrGlobal.pojoPr.PrController;
 import com.dy.pipIrrGlobal.pojoRm.RmCommandHistory;
@@ -38,7 +42,7 @@
             if (dV1_0_1 != null && dV1_0_1.subData != null) {
                 Object[] objs = this.getTaskResults(TkPreGenObjs.taskId) ;
                 DbSv sv = (DbSv)objs[0] ;
-                PrController controller = (PrController)objs[1] ;
+                //PrController controller = (PrController)objs[1] ;
                 try{
                     RmCommandHistory po = sv.getCommandLog(d.commandId) ;
                     if(po != null){

--
Gitblit v1.8.0