From cd08bf41f787659948901ec5dc7f468ab7fcded6 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期一, 20 五月 2024 11:12:56 +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/p206V202404/TkRtuDealCommandResponseV202404.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkRtuDealCommandResponse.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkRtuDealCommandResponseV202404.java
similarity index 69%
copy from pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkRtuDealCommandResponse.java
copy to pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkRtuDealCommandResponseV202404.java
index 8ae8b9e..10b704d 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkRtuDealCommandResponse.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkRtuDealCommandResponseV202404.java
@@ -1,23 +1,22 @@
-package com.dy.aceMw.server.rtuData.p206V1_0_0;
+package com.dy.rtuMw.server.rtuData.p206V202404;
-import com.dy.aceMw.server.rtuData.TaskSurpport;
import com.dy.common.mw.protocol.Data;
-import com.dy.common.mw.protocol.p206V1_0_0.DataV1_0_1;
+import com.dy.common.mw.protocol.p206V202404.DataV202404;
+import com.dy.rtuMw.server.rtuData.TaskSurpport;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
/**
* @Author liurunyu
- * @Date 2024/4/2 13:45
- * @LastEditTime 2024/4/2 13:45
+ * @Date 2024/5/8 14:18
* @Description 澶勭悊鍛戒护鍝嶅簲涓婃姤
*/
-public class TkRtuDealCommandResponse extends TaskSurpport {
+public class TkRtuDealCommandResponseV202404 extends TaskSurpport {
- private static final Logger log = LogManager.getLogger(TkRtuDealCommandResponse.class.getName()) ;
+ private static final Logger log = LogManager.getLogger(TkRtuDealCommandResponseV202404.class.getName()) ;
//绫籌D锛屼竴瀹氫笌Tree.xml閰嶇疆鏂囦欢涓厤缃竴鑷�
- public static final String taskId = "TkRtuDealCommandResponse" ;
+ public static final String taskId = "TkRtuDealCommandResponseV202404" ;
/**
* 鎵ц鑺傜偣浠诲姟锛氬鐞嗗懡浠ゅ搷搴斾笂鎶�
@@ -25,10 +24,11 @@
*/
@Override
public void execute(Object data) {
- Data d = (Data) data;
- Object subD = d.getSubData();
- if (subD != null) {
- DataV1_0_1 dV1_0_1 = (DataV1_0_1) subD;
+ Data d = (Data)data ;
+ Object protocolData = d.getSubData() ;
+ if(protocolData != null){
+ DataV202404 dV202404 = (DataV202404)protocolData ;
+ if(dV202404 != null) {
// if (dV1_0_1 != null && dV1_0_1.dataCdC0Vo != null) {
// Object[] objs = this.getTaskResults(TkPreGenObjs.taskId) ;
// DbSv sv = (DbSv)objs[0] ;
@@ -40,6 +40,7 @@
// log.error("淇濆瓨鎺у埗鍣ㄨ嚜鎶ユ暟鎹椂鍙戠敓寮傚父", e);
// }
// }
+ }
}
}
}
--
Gitblit v1.8.0