From a021f91265139a52c7515942b4332e03ce994351 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 11 六月 2025 16:34:31 +0800
Subject: [PATCH] 1、通信中间件本地命令处理逻辑修改； 2、参数设置软件增量开发，以处理MQTT相关配置； 3、《打包发布配置修改》文档修改。
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealControllerNoTrampV202404.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealControllerNoTrampV202404.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealControllerNoTrampV202404.java
index 0a0723a..60a7880 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealControllerNoTrampV202404.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealControllerNoTrampV202404.java
@@ -1,8 +1,15 @@
package com.dy.rtuMw.server.rtuData.p206V202404;
+import com.dy.common.mw.protocol.Data;
+import com.dy.common.mw.protocol.p206V202404.DataV202404;
+import com.dy.common.mw.protocol.p206V202404.upVos.DataCd02Vo;
+import com.dy.common.mw.protocol.p206V202404.upVos.DataCd8AVo;
+import com.dy.pipIrrGlobal.pojoPr.PrControllerTramp;
import com.dy.rtuMw.server.rtuData.TaskSurpport;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+
+import java.util.Date;
/**
* @Author liurunyu
@@ -22,7 +29,22 @@
*/
@Override
public void execute(Object data) {
- //姝や换鍔℃棤鍏蜂綋涓氬姟閫昏緫锛屽彧鏄湪浠诲姟xml閰嶇疆鏂囦欢涓紝妗嗕綇鍏跺瓙浠诲姟鑺傜偣
- this.toNextTasks(data);
+ Data d = (Data)data ;
+ Object[] objs = this.getTaskResults(TkPreGenObjsV202404.taskId) ;
+ PrControllerTramp tramp = (PrControllerTramp)objs[2] ;
+ if(tramp == null){
+ //鏃犲懡浠D
+ boolean toNext = true ;
+ if(d.getSubData() != null) {
+ DataV202404 dataV202404 = (DataV202404)d.getSubData() ;
+ if(dataV202404 != null && dataV202404.subData != null && (dataV202404.subData instanceof DataCd8AVo || dataV202404.subData instanceof DataCd02Vo)){
+ //杩囨护鎺夌櫥褰曞拰蹇冭烦鏁版嵁
+ toNext = false ;
+ }
+ }
+ if(toNext){
+ this.toNextTasks(data);
+ }
+ }
}
}
--
Gitblit v1.8.0