修改两个数间的随机数生成的bug

liurunyu

2024-11-28 8bd98786e735938659e6af3a8cc1ff8948267568

修改两个数间的随机数生成的bug

 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/CreateRandom.java

@@ -11,17 +11,20 @@

    /*
    public static void main(String[] args) {
        System.out.println(CreateRandom.random(1, 0));
        System.out.println(CreateRandom.random(2, 0));
        System.out.println(CreateRandom.random(3, 0));
        System.out.println(CreateRandom.random(4, 0));
        System.out.println(CreateRandom.random(5, 0));
        System.out.println(CreateRandom.random(100, 0));
        System.out.println(CreateRandom.random(1256, 1234));
//        System.out.println(CreateRandom.random(1, 0));
//        System.out.println(CreateRandom.random(2, 0));
//        System.out.println(CreateRandom.random(3, 0));
//        System.out.println(CreateRandom.random(4, 0));
//        System.out.println(CreateRandom.random(5, 0));
//        System.out.println(CreateRandom.random(100, 0));
//        System.out.println(CreateRandom.random(1256, 1234));
        System.out.println("=======================");
        System.out.println(create_between(10, 100));
        for(int i = 0 ; i < 100; i++){
            System.out.println(create_between(10, 100));
        }
    }
    */

    
    /**
     * 4位随机数据
@@ -81,13 +84,8 @@
        if(max - min < min/2){
            return min ;
        }
        String minStr = String.valueOf(min) ;
        int len = minStr.length() ;
        char minFirst = minStr.charAt(0) ;
        double d = Math.random();
        d = d * 10000000 ;
        String s = String.valueOf(d);
        s = minFirst + s ;
        int len = String.valueOf(min).length() ;
        String s = String.valueOf(Math.random() * 10000000);
        s = s.substring(0 ,len) ;
        int n = Integer.parseInt(s) ;
        if(n < min || n > max){

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

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

                }else if(cd.equals("1602")){
                    //升级数据
                    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 > 50){
                                    UpHeartBeat.upHeartBeat = true ;//使能上行心跳
                                }else{
                                    UpCd9602.upData() ;
                                }
                            }else{
                                UpCd9602.upData() ;
                            }
                        }else{
                            UpCd9602.upData() ;
                        }
                    }else{
                        UpCd9602.upData() ;
                    }
                }else if(cd.equals("1603")){
                    //升级校验