修改bug

liurunyu

2025-08-06 c6ef837cf5882b050d2e38a77d7a1531a882328b

 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V2/TkDealAlarmStatusV2.java

@@ -16,6 +16,9 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

import java.util.HashMap;
import java.util.Map;

/**
 * @Author liurunyu
 * @Date 2024/6/11 17:19
@@ -27,6 +30,9 @@

    //类ID，一定与Tree.xml配置文件中配置一致
    public static final String taskId = "TkDealAlarmStatusV2" ;

    //是否在某个时刻（年月日时）保存了报警状态数据
    private static final Map<String, Long> onceSaveAlarmData4Rtus = new HashMap<>();

    /**
     * 执行节点任务：报警及状态
@@ -47,18 +53,22 @@
                        //心跳数据，根据任务TkDealHearBeatV2,这里收到的心跳时，一定是报警或状态发生了改变
                        DataCd02Vo dataCd02Vo = (DataCd02Vo)cdObj ;
                        if (dataCd02Vo.alarmVo != null || dataCd02Vo.stateVo != null) {
                            Object[] objs = this.getTaskResults(TkPreGenObjsV2.taskId);
                            DbSv sv = (DbSv) objs[0];
                            PrController controller = (PrController) objs[1];
                            //心跳没有时钟，并且RTU针对心跳数据的机制是上报不成功不重发，所以时间采用本地时间
                            String now = DateTime.yyyy_MM_dd_HH_mm_ss() ;
                            this.toMsCenter(controller, d.getRtuAddr(), dV2, dataCd02Vo.alarmVo, dataCd02Vo.stateVo);
                            this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), now, dV2, dataCd02Vo.alarmVo, dataCd02Vo.stateVo);
                            this.saveHistory(sv, controller, d.getRtuAddr(), now, dV2, dataCd02Vo.alarmVo, dataCd02Vo.stateVo);
                            if(dataCd02Vo.stateVo != null && dataCd02Vo.stateVo.valveState != null && dataCd02Vo.stateVo.valveState.byteValue() == DataStateVo.ValveCloseState){
                                if(controller != null && controller.getIntakeId() != null){
                                    this.taskResult = new Object[]{controller.getIntakeId(), DataStateVo.ValveCloseState} ;
                                    toNext = true ;
                            if(this.needSave2Db( d.getRtuAddr())){
                                //在一个小时内没有存储报警数据
                                Object[] objs = this.getTaskResults(TkPreGenObjsV2.taskId);
                                DbSv sv = (DbSv) objs[0];
                                PrController controller = (PrController) objs[1];
                                //心跳没有时钟，并且RTU针对心跳数据的机制是上报不成功不重发，所以时间采用本地时间
                                String now = DateTime.yyyy_MM_dd_HH_mm_ss() ;
                                this.toMsCenter(controller, d.getRtuAddr(), dV2, dataCd02Vo.alarmVo, dataCd02Vo.stateVo);
                                this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), now, dV2, dataCd02Vo.alarmVo, dataCd02Vo.stateVo);
                                this.saveHistory(sv, controller, d.getRtuAddr(), now, dV2, dataCd02Vo.alarmVo, dataCd02Vo.stateVo);
                                this.cacheSaveTime(d.getRtuAddr());
                                if(dataCd02Vo.stateVo != null && dataCd02Vo.stateVo.valveState != null && dataCd02Vo.stateVo.valveState.byteValue() == DataStateVo.ValveCloseState){
                                    if(controller != null && controller.getIntakeId() != null){
                                        this.taskResult = new Object[]{controller.getIntakeId(), DataStateVo.ValveCloseState} ;
                                        toNext = true ;
                                    }
                                }
                            }
                        }
@@ -66,50 +76,63 @@
                        //随机自报报
                        DataCd81Vo dataCd81Vo = (DataCd81Vo)cdObj ;
                        if (dataCd81Vo.alarmVo != null || dataCd81Vo.stateVo != null) {
                            Object[] objs = this.getTaskResults(TkPreGenObjsV2.taskId);
                            DbSv sv = (DbSv) objs[0];
                            PrController controller = (PrController) objs[1];
                            this.toMsCenter(controller, d.getRtuAddr(), dV2, dataCd81Vo.alarmVo, dataCd81Vo.stateVo);
                            this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), dataCd81Vo.rtuDt, dV2, dataCd81Vo.alarmVo, dataCd81Vo.stateVo);
                            this.saveHistory(sv, controller, d.getRtuAddr(), dataCd81Vo.rtuDt, dV2, dataCd81Vo.alarmVo, dataCd81Vo.stateVo);
                            if(dataCd81Vo.stateVo != null && dataCd81Vo.stateVo.valveState != null && dataCd81Vo.stateVo.valveState.byteValue() == DataStateVo.ValveCloseState){
                                if(controller != null && controller.getIntakeId() != null){
                                    this.taskResult = new Object[]{controller.getIntakeId(), DataStateVo.ValveCloseState} ;
                                    toNext = true ;
                            //2025-06-11 因为81命令是RTU状态改变时即上报，所以可以及时体现状态变化，进而不受存储控制
                            //if(this.needSave2Db( d.getRtuAddr())) {
                                //在一个小时内没有存储报警数据
                                Object[] objs = this.getTaskResults(TkPreGenObjsV2.taskId);
                                DbSv sv = (DbSv) objs[0];
                                PrController controller = (PrController) objs[1];
                                this.toMsCenter(controller, d.getRtuAddr(), dV2, dataCd81Vo.alarmVo, dataCd81Vo.stateVo);
                                this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), dataCd81Vo.rtuDt, dV2, dataCd81Vo.alarmVo, dataCd81Vo.stateVo);
                                this.saveHistory(sv, controller, d.getRtuAddr(), dataCd81Vo.rtuDt, dV2, dataCd81Vo.alarmVo, dataCd81Vo.stateVo);
                                this.cacheSaveTime(d.getRtuAddr());
                                if(dataCd81Vo.stateVo != null && dataCd81Vo.stateVo.valveState != null && dataCd81Vo.stateVo.valveState.byteValue() == DataStateVo.ValveCloseState){
                                    if(controller != null && controller.getIntakeId() != null){
                                        this.taskResult = new Object[]{controller.getIntakeId(), DataStateVo.ValveCloseState} ;
                                        toNext = true ;
                                    }
                                }
                            }
                            //}
                        }
                    } else if (cdObj instanceof DataCd84Vo) {
                        //阀开工作报
                        DataCd84Vo dataCd84Vo = (DataCd84Vo)cdObj ;
                        if (dataCd84Vo.alarmVo != null || dataCd84Vo.stateVo != null) {
                            Object[] objs = this.getTaskResults(TkPreGenObjsV2.taskId);
                            DbSv sv = (DbSv) objs[0];
                            PrController controller = (PrController) objs[1];
                            this.toMsCenter(controller, d.getRtuAddr(), dV2, dataCd84Vo.alarmVo, dataCd84Vo.stateVo);
                            this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), dataCd84Vo.rtuDt, dV2, dataCd84Vo.alarmVo, dataCd84Vo.stateVo);
                            this.saveHistory(sv, controller, d.getRtuAddr(), dataCd84Vo.rtuDt, dV2, dataCd84Vo.alarmVo, dataCd84Vo.stateVo);
                            /** 阀开工作报，阀门状态一定是打开状态，所以不设置下面数据以备后续任务设置虚拟卡状态
                            if(dataCd84Vo.stateVo != null && dataCd84Vo.stateVo.valveState != null && dataCd84Vo.stateVo.valveState.byteValue() == DataStateVo.ValveCloseState){
                                if(controller != null && controller.getIntakeId() != null){
                                    this.taskResult = new Object[]{controller.getIntakeId(), DataStateVo.ValveCloseState} ;
                                }
                            }*/
                            if(this.needSave2Db( d.getRtuAddr())) {
                                //在一个小时内没有存储报警数据
                                Object[] objs = this.getTaskResults(TkPreGenObjsV2.taskId);
                                DbSv sv = (DbSv) objs[0];
                                PrController controller = (PrController) objs[1];
                                this.toMsCenter(controller, d.getRtuAddr(), dV2, dataCd84Vo.alarmVo, dataCd84Vo.stateVo);
                                this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), dataCd84Vo.rtuDt, dV2, dataCd84Vo.alarmVo, dataCd84Vo.stateVo);
                                this.saveHistory(sv, controller, d.getRtuAddr(), dataCd84Vo.rtuDt, dV2, dataCd84Vo.alarmVo, dataCd84Vo.stateVo);
                                this.cacheSaveTime(d.getRtuAddr());
                                /** 阀开工作报，阀门状态一定是打开状态，所以不设置下面数据以备后续任务设置虚拟卡状态
                                 if(dataCd84Vo.stateVo != null && dataCd84Vo.stateVo.valveState != null && dataCd84Vo.stateVo.valveState.byteValue() == DataStateVo.ValveCloseState){
                                 if(controller != null && controller.getIntakeId() != null){
                                 this.taskResult = new Object[]{controller.getIntakeId(), DataStateVo.ValveCloseState} ;
                                 }
                                 }*/
                            }
                        }
                    } else if (cdObj instanceof DataCdC0Vo) {
                        //整点报
                        DataCdC0Vo dataCdC0Vo = (DataCdC0Vo)cdObj ;
                        if (dataCdC0Vo.alarmVo != null || dataCdC0Vo.stateVo != null) {
                            Object[] objs = this.getTaskResults(TkPreGenObjsV2.taskId);
                            DbSv sv = (DbSv) objs[0];
                            PrController controller = (PrController) objs[1];
                            this.toMsCenter(controller, d.getRtuAddr(), dV2, dataCdC0Vo.alarmVo, dataCdC0Vo.stateVo);
                            this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), dataCdC0Vo.rtuDt, dV2, dataCdC0Vo.alarmVo, dataCdC0Vo.stateVo);
                            this.saveHistory(sv, controller, d.getRtuAddr(), dataCdC0Vo.rtuDt, dV2, dataCdC0Vo.alarmVo, dataCdC0Vo.stateVo);
                            if(dataCdC0Vo.stateVo != null && dataCdC0Vo.stateVo.valveState != null && dataCdC0Vo.stateVo.valveState.byteValue() == DataStateVo.ValveCloseState){
                                if(controller != null && controller.getIntakeId() != null){
                                    this.taskResult = new Object[]{controller.getIntakeId(), DataStateVo.ValveCloseState} ;
                                    toNext = true ;
                            if(this.needSave2Db( d.getRtuAddr())) {
                                //在一个小时内没有存储报警数据
                                Object[] objs = this.getTaskResults(TkPreGenObjsV2.taskId);
                                DbSv sv = (DbSv) objs[0];
                                PrController controller = (PrController) objs[1];
                                this.toMsCenter(controller, d.getRtuAddr(), dV2, dataCdC0Vo.alarmVo, dataCdC0Vo.stateVo);
                                this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), dataCdC0Vo.rtuDt, dV2, dataCdC0Vo.alarmVo, dataCdC0Vo.stateVo);
                                this.saveHistory(sv, controller, d.getRtuAddr(), dataCdC0Vo.rtuDt, dV2, dataCdC0Vo.alarmVo, dataCdC0Vo.stateVo);
                                this.cacheSaveTime(d.getRtuAddr());
                                if(dataCdC0Vo.stateVo != null && dataCdC0Vo.stateVo.valveState != null && dataCdC0Vo.stateVo.valveState.byteValue() == DataStateVo.ValveCloseState){
                                    if(controller != null && controller.getIntakeId() != null){
                                        this.taskResult = new Object[]{controller.getIntakeId(), DataStateVo.ValveCloseState} ;
                                        toNext = true ;
                                    }
                                }
                            }
                        }
@@ -122,6 +145,24 @@
                this.toNextTasks(d);
            }
        }
    }

    private boolean needSave2Db(String rtuAddr){
        if(!onceSaveAlarmData4Rtus.containsKey(rtuAddr)){
            return true ;
        }else{
            Long time = onceSaveAlarmData4Rtus.get(rtuAddr) ;
            Long ymdh = Long.parseLong(DateTime.yyyyMMddHH()) ;
            if(ymdh.longValue() == time.longValue()){
                //同一个小时内
                return false ;
            }else{
                return true ;
            }
        }
    }
    private void cacheSaveTime(String rtuAddr){
        onceSaveAlarmData4Rtus.put(rtuAddr, Long.parseLong(DateTime.yyyyMMddHH()));
    }

    /**
@@ -142,6 +183,16 @@
            msObj.put("dt", dV12.dt);
            MsCenterUnit.getInstance().pushMs(msObj);
        }
        if(stateVo != null && controller != null && stateVo.valveState != null){
            MsObj msObj = new MsObj() ;
            msObj.put("name", "阀态");
            msObj.put("rtuAddr", rtuAddr);
            msObj.put("intakeId", controller.getIntakeId());
            msObj.put("state", stateVo.valveState);
            msObj.put("stateName", stateVo.valveState==0?"开":"关");
            msObj.put("dt", dV12.dt);
            MsCenterUnit.getInstance().pushMs(msObj);
        }
    }
    /**
     * 保存报警状态最新数据