From eb90271ed12a538a190a55b0e594740a6e729386 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 09 七月 2024 09:58:43 +0800
Subject: [PATCH] 1、上行数据处理任务中，过滤掉心跳数据处理，以加快处理速度。
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkFindP206V1_0_0.java | 16 +++++++++++++++-
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkFindP206V202404.java | 16 +++++++++++++++-
2 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkFindP206V1_0_0.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkFindP206V1_0_0.java
index 278ffda..c4ced6b 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkFindP206V1_0_0.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkFindP206V1_0_0.java
@@ -1,6 +1,8 @@
package com.dy.rtuMw.server.rtuData.p206V1_0_0;
+import com.dy.common.mw.protocol.p206V1_0_0.DataV1_0_1;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd02Vo;
import com.dy.rtuMw.server.rtuData.TaskSurpport;
import com.dy.common.mw.protocol.Data;
import com.dy.common.mw.protocol.p206V1_0_0.ProtocolConstantV206V1_0_0;
@@ -18,7 +20,19 @@
public void execute(Object data) {
Data d = (Data)data ;
if(d.getProtocol() != null && d.getProtocol().equals(ProtocolConstantV206V1_0_0.protocolName)){
- this.toNextTasks(data);
+ //璇嗗埆鍑烘槸P206V1.0.0鍗忚鏁版嵁
+ //鏃犲懡浠D
+ boolean toNext = true ;
+ if(d.getSubData() != null) {
+ DataV1_0_1 dataV1_0_1 = (DataV1_0_1)d.getSubData() ;
+ if(dataV1_0_1 != null && dataV1_0_1.subData != null && dataV1_0_1.subData instanceof DataCd02Vo){
+ //杩囨护鎺夊績璺虫暟鎹�
+ toNext = false ;
+ }
+ }
+ if(toNext){
+ this.toNextTasks(data);
+ }
}else{
//涓嶆槸鏈崗璁殑鏁版嵁
}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkFindP206V202404.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkFindP206V202404.java
index 30f7e28..f196071 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkFindP206V202404.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkFindP206V202404.java
@@ -1,7 +1,9 @@
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.ProtocolConstantV206V202404 ;
+import com.dy.common.mw.protocol.p206V202404.upVos.DataCd02Vo;
import com.dy.rtuMw.server.rtuData.TaskSurpport;
/**
* @Author liurunyu
@@ -20,7 +22,19 @@
public void execute(Object data) {
Data d = (Data)data ;
if(d.getProtocol() != null && d.getProtocol().equals(ProtocolConstantV206V202404.protocolName)){
- this.toNextTasks(data);
+ //璇嗗埆鍑烘槸P206V202404鍗忚鏁版嵁
+ //鏃犲懡浠D
+ boolean toNext = true ;
+ if(d.getSubData() != null) {
+ DataV202404 dataV202404 = (DataV202404)d.getSubData() ;
+ if(dataV202404 != null && dataV202404.subData != null && dataV202404.subData instanceof DataCd02Vo){
+ //杩囨护鎺夊績璺虫暟鎹�
+ toNext = false ;
+ }
+ }
+ if(toNext){
+ this.toNextTasks(data);
+ }
}else{
//涓嶆槸鏈崗璁殑鏁版嵁
}
--
Gitblit v1.8.0