From 3c2c295ec48587fe9d9f656e0baa74c71a3884f7 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期日, 27 十月 2024 16:46:45 +0800 Subject: [PATCH] 1、苏有勋把开关阀报(功能码83)报中的控制器时钟去除掉了,通信中间件解决这个报文时,把开阀报中的开阀时间当作控制器时钟,把关阀报中的关阀时间作为控制器时钟; 2、优化代码。 --- pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkFindP206V202404.java | 13 +------------ 1 files changed, 1 insertions(+), 12 deletions(-) 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 f196071..917fedf 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 @@ -23,18 +23,7 @@ Data d = (Data)data ; if(d.getProtocol() != null && d.getProtocol().equals(ProtocolConstantV206V202404.protocolName)){ //璇嗗埆鍑烘槸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); - } + this.toNextTasks(data); }else{ //涓嶆槸鏈崗璁殑鏁版嵁 } -- Gitblit v1.8.0