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

wuzeyu

2024-05-28 bf079a83490bcdb46504b09925d29671d7769895

 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_26_Down.java

@@ -55,23 +55,17 @@
            if(cvo == null){
                throw new Exception("json转ComCd22Vo为null") ;
            }
            if(cvo.ipChannel != 1 && cvo.ipChannel !=2){
                throw new Exception("IP通道号只能是1或2") ;
            }

            if(cvo.maxAmountYear < 0 || cvo.maxAmountYear > 99999999){
                throw new Exception("设备终端年用水量必须是0~99999999范围内的整数") ;
            }

            byte[] bs = new byte[15] ;
            byte[] bs = new byte[14] ;
            int index = 0 ;
            bs[index] = (byte)(Integer.parseInt(cvo.controllerType, 16));

            index ++ ;
            bs[index] = cvo.projectNo.byteValue() ;

            index ++ ;
            bs[index] = cvo.ipChannel.byteValue() ;

            index ++ ;
            String strTemp = "" + cvo.maxAmountYear ;