修改bug

liurunyu

2024-11-05 e3d90bb8f76149d26b838171f27bf175a457aeec

修改bug

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

@@ -34,6 +34,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 不会同时有值
@@ -51,6 +52,7 @@
                            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 ;
                                }
                            }
                        }
@@ -67,6 +69,7 @@
                            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 ;
                                }
                            }*/
                        }
@@ -82,6 +85,7 @@
                            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,6 +94,9 @@
                    log.error("保存控制器报警和状态数据时发生异常", e);
                }
            }
            if(toNext){
                this.toNextTasks(d);
            }
        }
    }
    /**