Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

zhubaomin

2025-02-21 1e6561acc89b7105c1dcbf5395845d6046f1453d

 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkDealAlarmStatus.java

@@ -4,6 +4,8 @@
import com.dy.pipIrrGlobal.pojoRm.RmAlarmStateHistory;
import com.dy.rtuMw.server.ServerProperties;
import com.dy.rtuMw.server.forMs.SendMsCache;
import com.dy.rtuMw.server.msCenter.MsCenterUnit;
import com.dy.rtuMw.server.msCenter.MsObj;
import com.dy.rtuMw.server.rtuData.TaskSurpport;
import com.dy.rtuMw.server.rtuData.dbSv.DbSv;
import com.dy.common.mw.protocol.Data;
@@ -34,6 +36,7 @@
        Data d = (Data)data ;
        Object subD = d.getSubData() ;
        if(subD != null){
            boolean toNext = false ;
            DataV1 dV1 = (DataV1)subD ;
            if(dV1 != null && dV1.subData != null){
                //dV1.dataCd81Vo、 dV1.dataCd84Vo 与 dV1.dataCdC0Vo 不会同时有值
@@ -46,11 +49,13 @@
                            Object[] objs = this.getTaskResults(TkPreGenObjs.taskId);
                            DbSv sv = (DbSv) objs[0];
                            PrController controller = (PrController) objs[1];
                            this.toMsCenter(controller, d.getRtuAddr(), dV1, dataCd81Vo.alarmVo, dataCd81Vo.stateVo);
                            this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), dataCd81Vo.rtuDt, dV1, dataCd81Vo.alarmVo, dataCd81Vo.stateVo);
                            this.saveHistory(sv, controller, d.getRtuAddr(), dataCd81Vo.rtuDt, dV1, 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 ;
                                }
                            }
                        }
@@ -61,12 +66,14 @@
                            Object[] objs = this.getTaskResults(TkPreGenObjs.taskId);
                            DbSv sv = (DbSv) objs[0];
                            PrController controller = (PrController) objs[1];
                            this.toMsCenter(controller, d.getRtuAddr(), dV1, dataCd84Vo.alarmVo, dataCd84Vo.stateVo);
                            this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), dataCd84Vo.rtuDt, dV1, dataCd84Vo.alarmVo, dataCd84Vo.stateVo);
                            this.saveHistory(sv, controller, d.getRtuAddr(), dataCd84Vo.rtuDt, dV1, 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} ;
                                    toNext = true ;
                                }
                            }*/
                        }
@@ -77,11 +84,13 @@
                            Object[] objs = this.getTaskResults(TkPreGenObjs.taskId);
                            DbSv sv = (DbSv) objs[0];
                            PrController controller = (PrController) objs[1];
                            this.toMsCenter(controller, d.getRtuAddr(), dV1, dataCdC0Vo.alarmVo, dataCdC0Vo.stateVo);
                            this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), dataCdC0Vo.rtuDt, dV1, dataCdC0Vo.alarmVo, dataCdC0Vo.stateVo);
                            this.saveHistory(sv, controller, d.getRtuAddr(), dataCdC0Vo.rtuDt, dV1, 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 ;
                                }
                            }
                        }
@@ -90,8 +99,32 @@
                    log.error("保存控制器报警和状态数据时发生异常", e);
                }
            }
            if(toNext){
                this.toNextTasks(d);
            }
        }
    }

    /**
     * 报警状态数据存入消息中心
     * @param controller 控制器对象
     * @param rtuAddr 控制器地址
     * @param dV1 数据对象
     * @param alarmVo 报警对象
     * @param stateVo 状态对象
     */
    private void toMsCenter(PrController controller, String rtuAddr, DataV1 dV1, DataAlarmVo alarmVo, DataStateVo stateVo){
        if(alarmVo != null && controller != null && alarmVo.hasAlarm()){
            MsObj msObj = new MsObj() ;
            msObj.put("name", "报警");
            msObj.put("rtuAddr", rtuAddr);
            msObj.put("intakeId", controller.getIntakeId());
            msObj.put("alarm", alarmVo.alarmContent());
            msObj.put("dt", dV1.dt);
            MsCenterUnit.getInstance().pushMs(msObj);
        }
    }

    /**
     * 保存报警状态最新数据
     * @param sv 服务