修改类型转换bug

liurunyu

2024-11-03 3773d0e2d61676ce23901bb79b670691c28c7b04

修改类型转换bug

 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_81_Up.java

@@ -78,7 +78,7 @@

        callback.callback(midRs.reportOrResponse_trueOrFalse);
        if(para.data != null && para.data.getSubData() != null){
            DataCd81Vo cdData = (DataCd81Vo)para.data.getSubData() ;
            DataCd81Vo cdData = (DataCd81Vo)((DataV1)para.data.getSubData()).subData ;
            if(cdData.stateVo != null && cdData.stateVo.valveState != null){
                callback.notify(new ValveStateInfo(cdData.stateVo.valveState.byteValue()== 1?false:true));
            }

 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_83_Up.java

@@ -78,7 +78,7 @@
            confirmCommand.isQuickSend = true ;
        }
        if(para.data != null && para.data.getSubData() != null){
            Object subData = para.data.getSubData() ;
            Object subData = ((DataV1)para.data.getSubData()).subData ;
            if(subData instanceof DataCd83OpenVo){
                callback.notify(new ValveStateInfo(true));
            }else if(subData instanceof DataCd83CloseVo){

 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_84_Up.java

@@ -78,7 +78,7 @@

        callback.callback(midRs.reportOrResponse_trueOrFalse);
        if(para.data != null && para.data.getSubData() != null){
            DataCd84Vo cdData = (DataCd84Vo)para.data.getSubData() ;
            DataCd84Vo cdData = (DataCd84Vo)((DataV1)para.data.getSubData()).subData ;
            if(CommonV1.isCloseValveType(cdData.opType)){
                callback.notify(new ValveStateInfo(false)) ;
            }else{

 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_92_Up.java

@@ -52,7 +52,7 @@

        callback.callback(midRs.reportOrResponse_trueOrFalse);
        if(para.data != null && para.data.getSubData() != null){
            DataCd92Vo subData = (DataCd92Vo)para.data.getSubData() ;
            DataCd92Vo subData = (DataCd92Vo)((DataV1)para.data.getSubData()).subData ;
            callback.notify(new ValveStateInfo(subData.success));
        }
        return new MidResult[]{midRs} ;

 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_93_Up.java

@@ -51,7 +51,7 @@

        callback.callback(midRs.reportOrResponse_trueOrFalse);
        if(para.data != null && para.data.getSubData() != null){
            DataCd93Vo subData = (DataCd93Vo)para.data.getSubData() ;
            DataCd93Vo subData = (DataCd93Vo)((DataV1)para.data.getSubData()).subData ;
            callback.notify(new ValveStateInfo(!subData.success));
        }


 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_97_Up.java

@@ -51,7 +51,7 @@

        callback.callback(midRs.reportOrResponse_trueOrFalse);
        if(para.data != null && para.data.getSubData() != null){
            DataCd97Vo subData = (DataCd97Vo)para.data.getSubData() ;
            DataCd97Vo subData = (DataCd97Vo)((DataV1)para.data.getSubData()).subData ;
            callback.notify(new ValveStateInfo(subData.success));
        }
        return new MidResult[]{midRs} ;

 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_98_Up.java

@@ -51,7 +51,7 @@

        callback.callback(midRs.reportOrResponse_trueOrFalse);
        if(para.data != null && para.data.getSubData() != null){
            DataCd98Vo subData = (DataCd98Vo)para.data.getSubData() ;
            DataCd98Vo subData = (DataCd98Vo)((DataV1)para.data.getSubData()).subData ;
            callback.notify(new ValveStateInfo(!subData.success));
        }
        return new MidResult[]{midRs} ;

 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_99_Up.java

@@ -50,7 +50,7 @@

        callback.callback(midRs.reportOrResponse_trueOrFalse);
        if(para.data != null && para.data.getSubData() != null){
            DataCd99Vo subData = (DataCd99Vo)para.data.getSubData() ;
            DataCd99Vo subData = (DataCd99Vo)((DataV1)para.data.getSubData()).subData ;
            callback.notify(new ValveStateInfo(subData.success));
        }
        return new MidResult[]{midRs} ;

 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_A0_Up.java

@@ -50,7 +50,7 @@

        callback.callback(midRs.reportOrResponse_trueOrFalse);
        if(para.data != null && para.data.getSubData() != null){
            DataCdA0Vo subData = (DataCdA0Vo)para.data.getSubData() ;
            DataCdA0Vo subData = (DataCdA0Vo)((DataV1)para.data.getSubData()).subData ;
            callback.notify(new ValveStateInfo(subData.success));
        }
        return new MidResult[]{midRs} ;

 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_C0_Up.java

@@ -78,7 +78,7 @@

        callback.callback(midRs.reportOrResponse_trueOrFalse);
        if(para.data != null && para.data.getSubData() != null){
            DataCdC0Vo cdData = (DataCdC0Vo)para.data.getSubData() ;
            DataCdC0Vo cdData = (DataCdC0Vo)((DataV1)para.data.getSubData()).subData ;
            if(cdData.stateVo != null && cdData.stateVo.valveState != null){
                callback.notify(new ValveStateInfo(cdData.stateVo.valveState.byteValue()== 1?false:true));
            }

 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_02_Up.java

@@ -2,7 +2,6 @@


import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V1.upVos.DataCdC0Vo;
import com.dy.common.mw.protocol.p206V2.*;
import com.dy.common.mw.protocol.p206V2.parse.global.GlParse;
import com.dy.common.mw.protocol.p206V2.upVos.DataCd02Vo;
@@ -80,7 +79,7 @@

        callback.callback(midRs.reportOrResponse_trueOrFalse);
        if(para.data != null && para.data.getSubData() != null){
            DataCd02Vo cdData = (DataCd02Vo)para.data.getSubData() ;
            DataCd02Vo cdData = (DataCd02Vo)((DataV2)para.data.getSubData()).subData ;
            if(cdData.stateVo != null && cdData.stateVo.valveState != null){
                callback.notify(new ValveStateInfo(cdData.stateVo.valveState.byteValue()== 1?false:true));
            }

 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_81_Up.java

@@ -78,7 +78,7 @@

        callback.callback(midRs.reportOrResponse_trueOrFalse);
        if(para.data != null && para.data.getSubData() != null){
            DataCd81Vo cdData = (DataCd81Vo)para.data.getSubData() ;
            DataCd81Vo cdData = (DataCd81Vo)((DataV2)para.data.getSubData()).subData ;
            if(cdData.stateVo != null && cdData.stateVo.valveState != null){
                callback.notify(new ValveStateInfo(cdData.stateVo.valveState.byteValue()== 1?false:true));
            }

 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_83_Up.java

@@ -79,7 +79,7 @@

        callback.callback(midRs.reportOrResponse_trueOrFalse);
        if(para.data != null && para.data.getSubData() != null){
            Object subData = para.data.getSubData() ;
            Object subData = ((DataV2)para.data.getSubData()).subData ;
            if(subData instanceof DataCd83OpenVo){
                callback.notify(new ValveStateInfo(true));
            }else if(subData instanceof DataCd83CloseVo){

 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_84_Up.java

@@ -79,7 +79,7 @@

        callback.callback(midRs.reportOrResponse_trueOrFalse);
        if(para.data != null && para.data.getSubData() != null){
            DataCd84Vo cdData = (DataCd84Vo)para.data.getSubData() ;
            DataCd84Vo cdData = (DataCd84Vo)((DataV2)para.data.getSubData()).subData ;
            if(CommonV1.isCloseValveType(cdData.opType)){
                callback.notify(new ValveStateInfo(false)) ;
            }else{

 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_92_Up.java

@@ -50,7 +50,7 @@

        callback.callback(midRs.reportOrResponse_trueOrFalse);
        if(para.data != null && para.data.getSubData() != null){
            DataCd92Vo subData = (DataCd92Vo)para.data.getSubData() ;
            DataCd92Vo subData = (DataCd92Vo)((DataV2)para.data.getSubData()).subData ;
            callback.notify(new ValveStateInfo(subData.success));
        }
        return new MidResult[]{midRs} ;

 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_93_Up.java

@@ -50,7 +50,7 @@

        callback.callback(midRs.reportOrResponse_trueOrFalse);
        if(para.data != null && para.data.getSubData() != null){
            DataCd93Vo subData = (DataCd93Vo)para.data.getSubData() ;
            DataCd93Vo subData = (DataCd93Vo)((DataV2)para.data.getSubData()).subData ;
            callback.notify(new ValveStateInfo(!subData.success));
        }


 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_97_Up.java

@@ -50,7 +50,7 @@

        callback.callback(midRs.reportOrResponse_trueOrFalse);
        if(para.data != null && para.data.getSubData() != null){
            DataCd97Vo subData = (DataCd97Vo)para.data.getSubData() ;
            DataCd97Vo subData = (DataCd97Vo)((DataV2)para.data.getSubData()).subData ;
            callback.notify(new ValveStateInfo(subData.success));
        }
        return new MidResult[]{midRs} ;

 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_98_Up.java

@@ -50,7 +50,7 @@

        callback.callback(midRs.reportOrResponse_trueOrFalse);
        if(para.data != null && para.data.getSubData() != null){
            DataCd98Vo subData = (DataCd98Vo)para.data.getSubData() ;
            DataCd98Vo subData = (DataCd98Vo)((DataV2)para.data.getSubData()).subData ;
            callback.notify(new ValveStateInfo(!subData.success));
        }
        return new MidResult[]{midRs} ;

 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_99_Up.java

@@ -49,7 +49,7 @@

        callback.callback(midRs.reportOrResponse_trueOrFalse);
        if(para.data != null && para.data.getSubData() != null){
            DataCd99Vo subData = (DataCd99Vo)para.data.getSubData() ;
            DataCd99Vo subData = (DataCd99Vo)((DataV2)para.data.getSubData()).subData ;
            callback.notify(new ValveStateInfo(subData.success));
        }
        return new MidResult[]{midRs} ;

 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_A0_Up.java

@@ -49,7 +49,7 @@

        callback.callback(midRs.reportOrResponse_trueOrFalse);
        if(para.data != null && para.data.getSubData() != null){
            DataCdA0Vo subData = (DataCdA0Vo)para.data.getSubData() ;
            DataCdA0Vo subData = (DataCdA0Vo)((DataV2)para.data.getSubData()).subData ;
            callback.notify(new ValveStateInfo(subData.success));
        }
        return new MidResult[]{midRs} ;

 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_C0_Up.java

@@ -81,7 +81,7 @@

        callback.callback(midRs.reportOrResponse_trueOrFalse);
        if(para.data != null && para.data.getSubData() != null){
            DataCdC0Vo cdData = (DataCdC0Vo)para.data.getSubData() ;
            DataCdC0Vo cdData = (DataCdC0Vo)((DataV2)para.data.getSubData()).subData ;
            if(cdData.stateVo != null && cdData.stateVo.valveState != null){
                callback.notify(new ValveStateInfo(cdData.stateVo.valveState.byteValue()== 1?false:true));
            }

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

@@ -78,7 +78,7 @@
        }
        callback.callback(midRs.reportOrResponse_trueOrFalse);
        if(para.data != null && para.data.getSubData() != null){
            DataCd81Vo cdData = (DataCd81Vo)para.data.getSubData() ;
            DataCd81Vo cdData = (DataCd81Vo)((DataV202404)para.data.getSubData()).subData ;
            if(cdData.statePump != null){
                //泵/阀状态    (1：开泵/阀；0：关泵/阀)
                callback.notify(new ValveStateInfo(cdData.statePump.byteValue()== 1?true:false));

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

@@ -76,7 +76,7 @@
            confirmCommand.isQuickSend = true ;
        }
        callback.callback(midRs.reportOrResponse_trueOrFalse);
        if(para.data != null && para.data.getSubData() != null){
        if(para.data != null && ((DataV202404)para.data.getSubData()).subData != null){
            callback.notify(new ValveStateInfo(true));
        }


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

@@ -77,7 +77,7 @@
            confirmCommand.isQuickSend = true ;
        }
        callback.callback(midRs.reportOrResponse_trueOrFalse);
        if(para.data != null && para.data.getSubData() != null){
        if(para.data != null && ((DataV202404)para.data.getSubData()).subData != null){
            callback.notify(new ValveStateInfo(false));
        }


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

@@ -47,7 +47,7 @@

        callback.callback(midRs.reportOrResponse_trueOrFalse);
        if(para.data != null && para.data.getSubData() != null){
            DataCd92_A2Vo subData = (DataCd92_A2Vo)para.data.getSubData() ;
            DataCd92_A2Vo subData = (DataCd92_A2Vo)((DataV202404)para.data.getSubData()).subData ;
            //opResult ;//开启泵/阀结果: 0x00:成功 0x81:失败
            callback.notify(new ValveStateInfo(subData.opResult.byteValue() == 0 ? true:false));
        }

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

@@ -47,7 +47,7 @@

        callback.callback(midRs.reportOrResponse_trueOrFalse);
        if(para.data != null && para.data.getSubData() != null){
            DataCd93_A3Vo subData = (DataCd93_A3Vo)para.data.getSubData() ;
            DataCd93_A3Vo subData = (DataCd93_A3Vo)((DataV202404)para.data.getSubData()).subData ;
            //opResult ;//关泵/阀结果: 0x00:成功 0x81:失败
            callback.notify(new ValveStateInfo(subData.opResult.byteValue()==0?false:true));
        }

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

@@ -80,7 +80,7 @@
        }
        callback.callback(midRs.reportOrResponse_trueOrFalse);
        if(para.data != null && para.data.getSubData() != null){
            DataCdC2Vo subData = (DataCdC2Vo)para.data.getSubData() ;
            DataCdC2Vo subData = (DataCdC2Vo)((DataV202404)para.data.getSubData()).subData ;
            //    public Byte opType2 ;//开启关闭：0: 开启 -1:关闭
            //    public Boolean success ;//执行结果（true成功, false失败）
            if(subData.opType2.byteValue() == 0 && subData.success){
@@ -89,7 +89,7 @@
                callback.notify(new ValveStateInfo(false));
            }
        }
        

        return new MidResult[]{midRs, confirmCommand} ;
    }
    /**