From 02d965a2ff0cb5d415cedceacd2ae90c7ec1ac39 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 10 五月 2025 09:03:50 +0800
Subject: [PATCH] 解决开关阀记录数据因重绑定或改RTU地址而引起的地址变更问题
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealControllerNoTrampV202404.java | 19 +++++++++++++++++--
1 files changed, 17 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 33c8cb4..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,11 @@
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 com.dy.rtuMw.server.rtuData.dbSv.DbSv;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -26,10 +29,22 @@
*/
@Override
public void execute(Object data) {
+ Data d = (Data)data ;
Object[] objs = this.getTaskResults(TkPreGenObjsV202404.taskId) ;
PrControllerTramp tramp = (PrControllerTramp)objs[2] ;
if(tramp == null){
- this.toNextTasks(data);
+ //鏃犲懡浠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