1、测控一体阀协议功能码50补充实现； 2、RTU模拟器模拟实现50、91、92功能码上报； 3、remote模块：完善透传命令实现，完善接收通信中间...

liurunyu

2 天以前 7f3cae29516a35e85e4b6fc02ec655882d4c2538

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

@@ -30,7 +30,16 @@
        }
    }
    private void dealP206V1(byte[] bs){
        //应该是链路检测数据
        String cdPre = ByteUtil.bytes2Hex(bs, false, ProtocolConstantV206V1.codeIndex, 1);
        if(cdPre.equals("50")){
            UpCd50.upData() ;
        }else if(cdPre.equals("66")){
            UpCd66.upData() ;
        }else if(cdPre.equals("91")){
            UpCd91.upData() ;
        }else if(cdPre.equals("92")){
            UpCd92.upData() ;
        }
    }
    private void dealUpgrade(byte[] bs){
        String cdPre = ByteUtil.bytes2Hex(bs, false, ProtocolConstantV206V1.UG_codeIndex, 1);
@@ -42,20 +51,27 @@
                String cd = cdPre + cdSuf;
                if(cd.equals("1601")){
                    //升级配置
                    if(ServerProperties.argOneDie){
                        UpHeartBeat.upHeartBeat = true ;//使能上行心跳
                    }
                    UpCd9601.upData() ;

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