Merge remote-tracking branch 'origin/master'

zuoxiao

2025-06-25 d2fc819dc069c7b8d338ae52a90a7f38704fac08

 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);
            //无命令ID
            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);
            }
        }
    }
}