RTU对命令的应答处理完善

liurunyu

2024-07-17 23244726687acf8f5da68ea1db551567efaba374

RTU对命令的应答处理完善

 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd92Vo.java

@@ -21,4 +21,14 @@

        return sb.toString() ;
    }


    public String comLog(){
        StringBuilder sb = new StringBuilder() ;
        sb.append("   强制无卡开阀一体阀回复:\n");
        sb.append(success?"执行":"失败");
        sb.append("\n");

        return sb.toString() ;
    }
}

 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd93Vo.java

@@ -21,4 +21,12 @@

        return sb.toString() ;
    }
    public String comLog(){
        StringBuilder sb = new StringBuilder() ;
        sb.append("   强制无卡关阀一体阀回复:\n");
        sb.append(success?"执行":"失败");
        sb.append("\n");

        return sb.toString() ;
    }
}

 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd97Vo.java

@@ -25,4 +25,16 @@

        return sb.toString() ;
    }
    public String comLog(){
        StringBuilder sb = new StringBuilder() ;
        sb.append("   APP远程开阀一体阀回复:\n");
        sb.append("      虚拟卡号：");
        sb.append(cardNo);
        sb.append("\n");
        sb.append("      结果：");
        sb.append(success?"执行":"失败");
        sb.append("\n");

        return sb.toString() ;
    }
}

 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd98Vo.java

@@ -25,4 +25,18 @@

        return sb.toString() ;
    }


    public String comLog(){
        StringBuilder sb = new StringBuilder() ;
        sb.append("   APP远程关阀一体阀回复:\n");
        sb.append("      虚拟卡号：");
        sb.append(cardNo);
        sb.append("\n");
        sb.append("      结果：");
        sb.append(success?"执行":"失败");
        sb.append("\n");

        return sb.toString() ;
    }
}

 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkRtuDealCommandResponse.java

@@ -60,26 +60,22 @@
            DataCd97Vo vo = (DataCd97Vo)obj ;
            po.setResult((byte)1);
            po.setResultTime(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt)) ;
            //po.setResultText((JSONObject) JSON.toJSON(vo));
            po.setResultText(vo.toString());
            po.setResultText(vo.comLog());
        }else if(obj instanceof DataCd98Vo){
            DataCd98Vo vo = (DataCd98Vo)obj ;
            po.setResult((byte)1);
            po.setResultTime(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt));
            //po.setResultText((JSONObject) JSON.toJSON(vo));
            po.setResultText(vo.toString());
            po.setResultText(vo.comLog());
        }else if(obj instanceof DataCd92Vo){
            DataCd92Vo vo = (DataCd92Vo)obj ;
            po.setResult((byte)1);
            po.setResultTime(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt)) ;
            //po.setResultText((JSONObject) JSON.toJSON(vo));
            po.setResultText(vo.toString());
            po.setResultText(vo.comLog());
        }else if(obj instanceof DataCd93Vo){
            DataCd93Vo vo = (DataCd93Vo)obj ;
            po.setResult((byte)1);
            po.setResultTime(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt)) ;
            //po.setResultText((JSONObject) JSON.toJSON(vo));
            po.setResultText(vo.toString());
            po.setResultText(vo.comLog());
        }
        return po ;
    }