实现协议中各种命令结果日志数据库永久更新保存功能

liurunyu

2024-07-18 18f9dc6d0f15cad4a74e68fcf87b1a9aa83b5e66

实现协议中各种命令结果日志数据库永久更新保存功能

 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_3D_Up.java

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

import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V1_0_0.*;
import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd3CVo;
import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd3DVo;
import com.dy.common.util.ByteUtilUnsigned;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -58,7 +58,7 @@
     */
    protected void doParse(byte[] bs, int bsLen, String dataCode, Data data) throws Exception {
        DataV1_0_1 dV1 = (DataV1_0_1)data.getSubData() ;
        DataCd3CVo cdData = new DataCd3CVo() ;
        DataCd3DVo cdData = new DataCd3DVo() ;
        dV1.subData = cdData ;
        int priceInt = ByteUtilUnsigned.bytes2Short_LE(bs, ProtocolConstantV206V1_0_0.dataIndex) ;
        cdData.price = priceInt/100.0D;

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

@@ -21,4 +21,13 @@

        return sb.toString() ;
    }

    public String comLog(){
        StringBuilder sb = new StringBuilder() ;
        sb.append("设置RTU地址命令回复:\n");
        sb.append("   地址：");
        sb.append(newRtuAddr);
        sb.append("\n");
        return sb.toString() ;
    }
}

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

@@ -15,7 +15,7 @@

    public String toString(){
        StringBuilder sb = new StringBuilder() ;
        sb.append("   设置IP应答:\n");
        sb.append("   设置服务端IP和端口应答:\n");
        sb.append("      IP：");
        sb.append(ip);
        sb.append("      端口：");
@@ -24,4 +24,15 @@

        return sb.toString() ;
    }

    public String comLog(){
        StringBuilder sb = new StringBuilder() ;
        sb.append("设置服务端IP和端口命令回复:\n");
        sb.append("   IP：");
        sb.append(ip);
        sb.append("   端口：");
        sb.append(port);
        sb.append("\n");
        return sb.toString() ;
    }
}

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

@@ -9,7 +9,7 @@

    public String toString(){
        StringBuilder sb = new StringBuilder() ;
        sb.append("  设置询IP地址和端口:\n");
        sb.append("  设置主信道IP和端口:\n");
        sb.append("      IP地址：");
        sb.append(ip);
        sb.append("\n");
@@ -18,4 +18,15 @@
        sb.append("\n");
        return sb.toString() ;
    }

    public String comLog(){
        StringBuilder sb = new StringBuilder() ;
        sb.append("设置主信道IP和端口命令回复:\n");
        sb.append("   IP：");
        sb.append(ip);
        sb.append("   端口：");
        sb.append(port==null?"":port);
        sb.append("\n");
        return sb.toString() ;
    }
}

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

@@ -1,5 +1,6 @@
package com.dy.common.mw.protocol.p206V1_0_0.upVos;

import com.dy.common.mw.protocol.p206V1_0_0.CodeV1_0_1;
import lombok.Data;

/**
@@ -21,4 +22,19 @@

        return sb.toString() ;
    }
    public String comLog(String code){
        StringBuilder sb = new StringBuilder() ;
        if(code.equals(CodeV1_0_1.cd_37)){
            sb.append("设置流量采集周期命令回复:\n");
            sb.append("   秒钟：");
            sb.append(second);
            sb.append("\n");
        } else if(code.equals(CodeV1_0_1.cd_67)){
            sb.append("查询流量采集周期命令回复:\n");
            sb.append("   秒钟：");
            sb.append(second);
            sb.append("\n");
        }
        return sb.toString() ;
    }
}

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

@@ -1,5 +1,6 @@
package com.dy.common.mw.protocol.p206V1_0_0.upVos;

import com.dy.common.mw.protocol.p206V1_0_0.CodeV1_0_1;
import lombok.Data;

/**
@@ -21,4 +22,20 @@

        return sb.toString() ;
    }

    public String comLog(String code){
        StringBuilder sb = new StringBuilder() ;
        if(code.equals(CodeV1_0_1.cd_38)){
            sb.append("设置用户余额报警值命令回复:\n");
            sb.append("   余额：");
            sb.append(remainMoneyAlarm);
            sb.append("\n");
        } else if(code.equals(CodeV1_0_1.cd_68)){
            sb.append("查询用户余额报警值命令回复:\n");
            sb.append("   余额：");
            sb.append(remainMoneyAlarm);
            sb.append("\n");
        }
        return sb.toString() ;
    }
}

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

@@ -1,5 +1,6 @@
package com.dy.common.mw.protocol.p206V1_0_0.upVos;

import com.dy.common.mw.protocol.p206V1_0_0.CodeV1_0_1;
import lombok.Data;

/**
@@ -21,4 +22,21 @@

        return sb.toString() ;
    }


    public String comLog(String code){
        StringBuilder sb = new StringBuilder() ;
        if(code.equals(CodeV1_0_1.cd_39)){
            sb.append("设置电池电压报警值命令回复:\n");
            sb.append("   电压报警值：");
            sb.append(batteryVoltAlarm);
            sb.append("\n");
        } else if(code.equals(CodeV1_0_1.cd_69)){
            sb.append("查询电池电压报警值命令回复:\n");
            sb.append("   电压报警值：");
            sb.append(batteryVoltAlarm);
            sb.append("\n");
        }
        return sb.toString() ;
    }
}

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

@@ -1,5 +1,6 @@
package com.dy.common.mw.protocol.p206V1_0_0.upVos;

import com.dy.common.mw.protocol.p206V1_0_0.CodeV1_0_1;
import lombok.Data;

/**
@@ -21,4 +22,21 @@

        return sb.toString() ;
    }


    public String comLog(String code){
        StringBuilder sb = new StringBuilder() ;
        if(code.equals(CodeV1_0_1.cd_3A)){
            sb.append("设置阀门堵转电流命令回复:\n");
            sb.append("   电流：");
            sb.append(current);
            sb.append("\n");
        } else if(code.equals(CodeV1_0_1.cd_6A)){
            sb.append("查询阀门堵转电流命令回复:\n");
            sb.append("   电流：");
            sb.append(current);
            sb.append("\n");
        }
        return sb.toString() ;
    }
}

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

@@ -1,5 +1,6 @@
package com.dy.common.mw.protocol.p206V1_0_0.upVos;

import com.dy.common.mw.protocol.p206V1_0_0.CodeV1_0_1;
import lombok.Data;

/**
@@ -21,4 +22,21 @@

        return sb.toString() ;
    }


    public String comLog(String code){
        StringBuilder sb = new StringBuilder() ;
        if(code.equals(CodeV1_0_1.cd_3B)){
            sb.append("设置阀门超时时间命令回复:\n");
            sb.append("   秒钟：");
            sb.append(second);
            sb.append("\n");
        } else if(code.equals(CodeV1_0_1.cd_6B)){
            sb.append("查询阀门超时时间命令回复:\n");
            sb.append("   秒钟：");
            sb.append(second);
            sb.append("\n");
        }
        return sb.toString() ;
    }
}

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

@@ -1,5 +1,6 @@
package com.dy.common.mw.protocol.p206V1_0_0.upVos;

import com.dy.common.mw.protocol.p206V1_0_0.CodeV1_0_1;
import lombok.Data;

/**
@@ -21,4 +22,20 @@

        return sb.toString() ;
    }
    public String comLog(String code){
        StringBuilder sb = new StringBuilder() ;
        if(code.equals(CodeV1_0_1.cd_3C)){
            sb.append("设置自报周期命令回复:\n");
            sb.append("   分钟：");
            sb.append(minute);
            sb.append("\n");
        } else if(code.equals(CodeV1_0_1.cd_65)){
            sb.append("查询自报周期命令回复:\n");
            sb.append("   分钟：");
            sb.append(minute);
            sb.append("\n");
        }

        return sb.toString() ;
    }
}

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

File was deleted

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

@@ -10,13 +10,24 @@
 */
@Data
public class DataCd3DVo {
    public String icCardNo ;
    public Double price ;

    public String toString(){
        StringBuilder sb = new StringBuilder() ;
        sb.append("   设置黑名单应答:\n");
        sb.append("      卡号：");
        sb.append(icCardNo);
        sb.append("   设置水价应答:\n");
        sb.append("      水价：");
        sb.append(price);
        sb.append("\n");

        return sb.toString() ;
    }


    public String comLog(){
        StringBuilder sb = new StringBuilder() ;
        sb.append("设置水价命令回复:\n");
        sb.append("   水价：");
        sb.append(price);
        sb.append("\n");

        return sb.toString() ;

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

New file
@@ -0,0 +1,34 @@
package com.dy.common.mw.protocol.p206V1_0_0.upVos;

import lombok.Data;

/**
 * @Author liurunyu
 * @Date 2024/4/10 18:44
 * @LastEditTime 2024/4/10 18:44
 * @Description
 */
@Data
public class DataCd3EVo {
    public String icCardNo ;

    public String toString(){
        StringBuilder sb = new StringBuilder() ;
        sb.append("   设置黑名单应答:\n");
        sb.append("      卡号：");
        sb.append(icCardNo);
        sb.append("\n");

        return sb.toString() ;
    }

    public String comLog(){
        StringBuilder sb = new StringBuilder() ;
        sb.append("设置黑名单命令回复:\n");
        sb.append("   卡号：");
        sb.append(icCardNo);
        sb.append("\n");

        return sb.toString() ;
    }
}

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

@@ -21,4 +21,15 @@

        return sb.toString() ;
    }


    public String comLog(){
        StringBuilder sb = new StringBuilder() ;
        sb.append("查询终端时钟命令回复:\n");
        sb.append("   时钟：");
        sb.append(rtuDt);
        sb.append("\n");
        return sb.toString() ;
    }

}

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

@@ -27,4 +27,18 @@
        }
        return sb.toString() ;
    }

    public String comLog(){
        StringBuilder sb = new StringBuilder() ;
        sb.append("   查询终端状态和报警状态命令回复:\n");
        if(alarmVo != null){
            sb.append(alarmVo.toString());
            sb.append("\n");
        }
        if(stateVo != null){
            sb.append(stateVo.toString());
            sb.append("\n");
        }
        return sb.toString() ;
    }
}

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

@@ -18,4 +18,16 @@
        sb.append("\n");
        return sb.toString() ;
    }

    public String comLog(){
        StringBuilder sb = new StringBuilder() ;
        sb.append("查询IP地址和端口命令回复:\n");
        sb.append("  IP地址：");
        sb.append(ip);
        sb.append("\n");
        sb.append("  端口号：");
        sb.append(port==null?"":port);
        sb.append("\n");
        return sb.toString() ;
    }
}

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

@@ -21,4 +21,13 @@

        return sb.toString() ;
    }

    public String comLog(){
        StringBuilder sb = new StringBuilder() ;
        sb.append("查询水价命令回复:\n");
        sb.append("   水价：");
        sb.append(price);
        sb.append("\n");
        return sb.toString() ;
    }
}

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

@@ -18,4 +18,14 @@

        return sb.toString() ;
    }

    public String comLog(){
        StringBuilder sb = new StringBuilder() ;
        sb.append("查询阀门状态命令回复:\n");
        sb.append("   阀门状态：");
        sb.append(state==null?"":state);
        sb.append(stateName==null?"":("(" + stateName + ")"));
        sb.append("\n");
        return sb.toString() ;
    }
}

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

@@ -25,7 +25,7 @@

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


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

@@ -23,7 +23,7 @@
    }
    public String comLog(){
        StringBuilder sb = new StringBuilder() ;
        sb.append("   强制无卡关阀一体阀回复:\n");
        sb.append("强制无卡关阀命令回复:\n");
        sb.append(success?"执行":"失败");
        sb.append("\n");


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

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


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

@@ -29,11 +29,11 @@

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


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

@@ -25,4 +25,17 @@

        return sb.toString() ;
    }


    public String comLog(){
        StringBuilder sb = new StringBuilder() ;
        sb.append("定时关阀开阀命令回复:\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/DataCdA0Vo.java

@@ -25,4 +25,17 @@

        return sb.toString() ;
    }


    public String comLog(){
        StringBuilder sb = new StringBuilder() ;
        sb.append("定量关阀开阀命令回复:\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

@@ -2,10 +2,7 @@

import com.dy.common.mw.protocol.Data;
import com.dy.common.mw.protocol.p206V1_0_0.DataV1_0_1;
import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd92Vo;
import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd93Vo;
import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd97Vo;
import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd98Vo;
import com.dy.common.mw.protocol.p206V1_0_0.upVos.*;
import com.dy.common.util.DateTime;
import com.dy.pipIrrGlobal.pojoRm.RmCommandHistory;
import com.dy.rtuMw.server.rtuData.TaskSurpport;
@@ -43,7 +40,7 @@
                try{
                    RmCommandHistory po = sv.getCommandLog(d.commandId) ;
                    if(po != null){
                        po = this.updateCommandLogPo(po, dV1_0_1, dV1_0_1.subData) ;
                        po = this.updateCommandLogPo(po, d.code, dV1_0_1, dV1_0_1.subData) ;
                        sv.updateCommandLog(po);
                    }else{
                        log.error("未得到命令日志（" + d.getCommandId() + ")");
@@ -55,26 +52,74 @@
        }
    }

    public RmCommandHistory updateCommandLogPo(RmCommandHistory po, DataV1_0_1 dV1_0_1, Object obj) throws Exception{
    public RmCommandHistory updateCommandLogPo(RmCommandHistory po, String code, DataV1_0_1 dV1_0_1, Object obj) throws Exception{
        po.setResult((byte)1);
        po.setResultTime(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt)) ;
        if(obj instanceof DataCd97Vo){
            DataCd97Vo vo = (DataCd97Vo)obj ;
            po.setResult((byte)1);
            po.setResultTime(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt)) ;
            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(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(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(vo.comLog());
        }else if(obj instanceof DataCd3AAnd6AVo){
            DataCd3AAnd6AVo vo = (DataCd3AAnd6AVo)obj ;
            po.setResultText(vo.comLog(code));
        }else if(obj instanceof DataCd3BAnd6BVo){
            DataCd3BAnd6BVo vo = (DataCd3BAnd6BVo)obj ;
            po.setResultText(vo.comLog(code));
        }else if(obj instanceof DataCd3BAnd6BVo){
            DataCd3CAnd65Vo vo = (DataCd3CAnd65Vo)obj ;
            po.setResultText(vo.comLog(code));
        }else if(obj instanceof DataCd3DVo){
            DataCd3DVo vo = (DataCd3DVo)obj ;
            po.setResultText(vo.comLog());
        }else if(obj instanceof DataCd3EVo){
            DataCd3EVo vo = (DataCd3EVo)obj ;
            po.setResultText(vo.comLog());
        }else if(obj instanceof DataCd5EVo){
            DataCd5EVo vo = (DataCd5EVo)obj ;
            po.setResultText(vo.comLog());
        }else if(obj instanceof DataCd6CVo){
            DataCd6CVo vo = (DataCd6CVo)obj ;
            po.setResultText(vo.comLog());
        }else if(obj instanceof DataCd10Vo){
            DataCd10Vo vo = (DataCd10Vo)obj ;
            po.setResultText(vo.comLog());
        }else if(obj instanceof DataCd21Vo){
            DataCd21Vo vo = (DataCd21Vo)obj ;
            po.setResultText(vo.comLog());
        }else if(obj instanceof DataCd36Vo){
            DataCd36Vo vo = (DataCd36Vo)obj ;
            po.setResultText(vo.comLog());
        }else if(obj instanceof DataCd37And67Vo){
            DataCd37And67Vo vo = (DataCd37And67Vo)obj ;
            po.setResultText(vo.comLog(code));
        }else if(obj instanceof DataCd38And68Vo){
            DataCd38And68Vo vo = (DataCd38And68Vo)obj ;
            po.setResultText(vo.comLog(code));
        }else if(obj instanceof DataCd39And69Vo){
            DataCd39And69Vo vo = (DataCd39And69Vo)obj ;
            po.setResultText(vo.comLog(code));
        }else if(obj instanceof DataCd51Vo){
            DataCd51Vo vo = (DataCd51Vo)obj ;
            po.setResultText(vo.comLog());
        }else if(obj instanceof DataCd66Vo){
            DataCd66Vo vo = (DataCd66Vo)obj ;
            po.setResultText(vo.comLog());
        }else if(obj instanceof DataCd71Vo){
            DataCd71Vo vo = (DataCd71Vo)obj ;
            po.setResultText(vo.comLog());
        }else if(obj instanceof DataCd99Vo){
            DataCd99Vo vo = (DataCd99Vo)obj ;
            po.setResultText(vo.comLog());
        }else if(obj instanceof DataCdA0Vo){
            DataCdA0Vo vo = (DataCdA0Vo)obj ;
            po.setResultText(vo.comLog());
        }
        return po ;