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

zhubaomin

3 天以前 70f61b0638e32274d0e5f9b972ce2a18f139f1b4

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

@@ -76,7 +76,8 @@
                        //随机自报报
                        DataCd81Vo dataCd81Vo = (DataCd81Vo)cdObj ;
                        if (dataCd81Vo.alarmVo != null || dataCd81Vo.stateVo != null) {
                            if(this.needSave2Db( d.getRtuAddr())) {
                            //2025-06-11 因为81命令是RTU状态改变时即上报，所以可以及时体现状态变化，进而不受存储控制
                            //if(this.needSave2Db( d.getRtuAddr())) {
                                //在一个小时内没有存储报警数据
                                Object[] objs = this.getTaskResults(TkPreGenObjsV2.taskId);
                                DbSv sv = (DbSv) objs[0];
@@ -91,7 +92,7 @@
                                        toNext = true ;
                                    }
                                }
                            }
                            //}
                        }
                    } else if (cdObj instanceof DataCd84Vo) {
                        //阀开工作报