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

wuzeyu

2024-11-29 ac87f61568a68501aa50d5c3f0d083e8ea36ebb3

 pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/java/com/dy/simRtu/tcpClient/downData/DownData.java

@@ -42,18 +42,18 @@
                String cd = cdPre + cdSuf;
                if(cd.equals("1601")){
                    //升级配置
                    if(ServerProperties.argOneDie){
                        UpHeartBeat.upHeartBeat = true ;//使能上行心跳
                    }else{
                        UpCd9601.upData() ;
                    }

                }else if(cd.equals("1602")){
                    //升级数据
                    count9602 ++ ;
                    if(ServerProperties.argOneDie){
                        UpHeartBeat.upHeartBeat = true ;//使能上行心跳
                    }else{
                    if(ServerProperties.argMultiDie){
                        if(count9602 > 10){
                            int random =  CreateRandom.create_between(10, 100) ;
                            if(random > 50){
                                if(random > 90){
                                UpHeartBeat.upHeartBeat = true ;//使能上行心跳
                            }else{
                                UpCd9602.upData() ;
@@ -64,6 +64,7 @@
                    }else{
                        UpCd9602.upData() ;
                    }
                    }
                }else if(cd.equals("1603")){
                    //升级校验
                    UpCd9603.upData() ;