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协议数据 //无命令ID 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{ //不是本协议的数据 } 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协议数据 //无命令ID 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{ //不是本协议的数据 }