p206V1.0.0协议与硬件联调，并修改完善代码。

liurunyu

2024-07-05 514efa8c5ef56d243f9f1aa1bfd95e661304edd9

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

@@ -1,14 +1,15 @@
package com.dy.rtuMw.server.rtuData.p206V1_0_0;

import com.dy.rtuMw.server.rtuData.TaskSurpport;
import com.dy.rtuMw.server.rtuData.dbSv.DbSv;
import com.dy.common.mw.protocol.Data;
import com.dy.common.mw.protocol.p206V1_0_0.DataCd83CloseVo;
import com.dy.common.mw.protocol.p206V1_0_0.DataV1_0_1;
import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd83CloseVo;
import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd83OpenVo;
import com.dy.common.util.DateTime;
import com.dy.pipIrrGlobal.pojoPr.PrController;
import com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveHistory;
import com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveLast;
import com.dy.rtuMw.server.rtuData.TaskSurpport;
import com.dy.rtuMw.server.rtuData.dbSv.DbSv;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

@@ -27,7 +28,6 @@

    //类ID，一定与Tree.xml配置文件中配置一致
    public static final String taskId = "TkDealCloseValveReport" ;

    /**
     * 执行节点任务: 处理控制器关阀上报
     * @param data 需要处理的数据
@@ -35,21 +35,20 @@
    @Override
    public void execute(Object data) {
        Data d = (Data) data;
        Object subD = d.getSubData();
        if (subD != null) {
            DataV1_0_1 dV1_0_1 = (DataV1_0_1) subD;
//            if (dV1_0_1 != null && dV1_0_1.dataCd83CloseVo != null) {
//                Object[] objs = this.getTaskResults(TkPreGenObjs.taskId) ;
//                DbSv sv = (DbSv)objs[0] ;
//                PrController controller = (PrController)objs[1] ;
//                try{
//                    this.doDeal(sv, controller, d.getRtuAddr(), dV1_0_1, dV1_0_1.dataCd83CloseVo) ;
//                }catch (Exception e){
//                    log.error("保存控制器关阀上报时发生异常", e);
//                }
//            }
        DataV1_0_1 dV1_0_1 = (DataV1_0_1) d.getSubData();
        Object cdObj = dV1_0_1.subData;
        if (cdObj != null && cdObj instanceof DataCd83CloseVo) {
            Object[] objs = this.getTaskResults(TkPreGenObjs.taskId) ;
            DbSv sv = (DbSv)objs[0] ;
            PrController controller = (PrController)objs[1] ;
            try{
                this.doDeal(sv, controller, d.getRtuAddr(), dV1_0_1, (DataCd83CloseVo)cdObj) ;
            }catch (Exception e){
                log.error("保存控制器开阀上报时发生异常", e);
            }
        }
    }

    /**
     * 保存数据
     * @param sv 服务
@@ -59,7 +58,7 @@
     * @param dataCd83CloseVo 关阀上报数据对象
     */
    private void doDeal(DbSv sv, PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCd83CloseVo dataCd83CloseVo) throws Exception {
        RmOpenCloseValveLast poLast = sv.getRmOpenCloseValveLast(rtuAddr) ;
        RmOpenCloseValveLast poLast = sv.getRmOpenCloseValveLast(controller.getIntakeId()) ;
        if(poLast == null){
            //数据库中不存在该控制器的开关阀数据
            //首先生成最新数据及历史数据，并先保存
@@ -69,8 +68,7 @@
            sv.saveRmOpenCloseValveLast(poLast);
        }else{
            if(poLast.clType == null){
                //原记录不存在关阀数据，所以当前关阀上报是新的一次关阀，保留原记录中的开阀数据
                this.updateCloseValve(controller, poLast, null, dV1_0_1, dataCd83CloseVo, false) ;
                //原记录不存在关阀数据，所以当前关阀上报是新的一次关阀
                if(poLast.opType == null){
                    //原记录中不存在开阀数据，没办法进行匹配
                    //生成并保存新的关阀上报历史数据记录
@@ -81,6 +79,8 @@
                    if(poLast.lastHistoryId != null){
                        poHistory = sv.getRmOpenCloseValveHistory(poLast.lastHistoryId) ;
                        if(poHistory != null){
                            //当前关阀上报是新的一次关阀，保留原记录中的开阀数据
                            this.updateCloseValve(controller, poLast, poHistory, dV1_0_1, dataCd83CloseVo, false) ;
                            sv.updateRmOpenCloseValveHistory(poHistory);
                        }else{
                            //没有历史数据，生成并保存新的关阀上报历史数据记录
@@ -99,12 +99,13 @@
                    //重复上报了，不进行处理
                }else {
                    //当前上报的关阀数据晚于原来的关阀数据，是新的上报关阀数据
                    this.updateCloseValve(controller, poLast, null, dV1_0_1, dataCd83CloseVo, false) ;
                    this.newHistoryDataDeal(sv, controller, rtuAddr, dV1_0_1, dataCd83CloseVo, poLast);
                }
            }else{
                //if(po.opType == null)
                //原记录不存在开阀数据也不存在关阀数据，这种情况不存在，但为安全也进行处理
                this.updateCloseValve(controller,poLast, null, dV1_0_1, dataCd83CloseVo, false) ;
                this.updateCloseValve(controller, poLast, null, dV1_0_1, dataCd83CloseVo, false) ;
                //生成并保存新的关阀上报历史数据记录
                this.newHistoryDataDeal(sv, controller, rtuAddr, dV1_0_1, dataCd83CloseVo, poLast);
            }
@@ -140,20 +141,11 @@
     * @throws Exception
     */
    private RmOpenCloseValveLast newRmOpenCloseValveLast(PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCd83CloseVo dataCd83CloseVo)throws Exception {
        RmOpenCloseValveLast po = new RmOpenCloseValveLast(null, null, controller==null?null:controller.getId(), controller==null?null:controller.getIntakeId(),
                rtuAddr,
                null, null, null, null, null, null,null,
                DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt),
                dataCd83CloseVo.type,
                dataCd83CloseVo.totalAmount,
                dataCd83CloseVo.icCardNo,
                dataCd83CloseVo.icCardAddr,
                dataCd83CloseVo.remainMoney,
                dataCd83CloseVo.thisAmount,
                dataCd83CloseVo.thisMoney,
                dataCd83CloseVo.thisTime,
                DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.openDt),
                DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.closeDt)) ;
        RmOpenCloseValveLast po = new RmOpenCloseValveLast() ;
        po.controllerId = controller==null?null:controller.getId() ;
        po.intakeId = controller==null?null:controller.getIntakeId() ;
        po.rtuAddr = rtuAddr ;
        po.valueFrom(dV1_0_1, dataCd83CloseVo);
        return po ;
    }

@@ -168,20 +160,11 @@
     * @throws Exception
     */
    private RmOpenCloseValveHistory newRmOpenCloseValveHistory(PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCd83CloseVo dataCd83CloseVo)throws Exception {
        RmOpenCloseValveHistory po = new RmOpenCloseValveHistory(null, controller==null?null:controller.getId(), controller==null?null:controller.getIntakeId(),
                rtuAddr,
                null, null, null, null, null, null,null,
                DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt),
                dataCd83CloseVo.type,
                dataCd83CloseVo.totalAmount,
                dataCd83CloseVo.icCardNo,
                dataCd83CloseVo.icCardAddr,
                dataCd83CloseVo.remainMoney,
                dataCd83CloseVo.thisAmount,
                dataCd83CloseVo.thisMoney,
                dataCd83CloseVo.thisTime,
                DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.openDt),
                DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.closeDt)) ;
        RmOpenCloseValveHistory po = new RmOpenCloseValveHistory() ;
        po.controllerId = controller==null?null:controller.getId() ;
        po.intakeId = controller==null?null:controller.getIntakeId() ;
        po.rtuAddr = rtuAddr ;
        po.valueFrom(dV1_0_1, dataCd83CloseVo);
        return po ;
    }

@@ -200,53 +183,14 @@
        poLast.controllerId = controller==null?null:controller.getId();
        poLast.intakeId = controller==null?null:controller.getIntakeId();

        poLast.clDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt);
        poLast.clType = dataCd83CloseVo.type;
        poLast.clTotalAmount = dataCd83CloseVo.totalAmount;
        poLast.clIcCardNo = dataCd83CloseVo.icCardNo;
        poLast.clIcCardAddr = dataCd83CloseVo.icCardAddr;
        poLast.clRemainMoney = dataCd83CloseVo.remainMoney;
        poLast.clThisAmount = dataCd83CloseVo.thisAmount;
        poLast.clThisMoney = dataCd83CloseVo.thisMoney;
        poLast.clThisTime = dataCd83CloseVo.thisTime;
        poLast.clOpenDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.openDt);
        poLast.closeDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.closeDt) ;
        poLast.updateFrom(dV1_0_1, dataCd83CloseVo, clearOpenValve);

        if(poHistory != null){
            poHistory.controllerId = controller==null?null:controller.getId();
            poHistory.intakeId = controller==null?null:controller.getIntakeId();

            poHistory.clDt = poLast.clDt;
            poHistory.clType = dataCd83CloseVo.type;
            poHistory.clTotalAmount = dataCd83CloseVo.totalAmount;
            poHistory.clIcCardNo = dataCd83CloseVo.icCardNo;
            poHistory.clIcCardAddr = dataCd83CloseVo.icCardAddr;
            poHistory.clRemainMoney = dataCd83CloseVo.remainMoney;
            poHistory.clThisAmount = dataCd83CloseVo.thisAmount;
            poHistory.clThisMoney = dataCd83CloseVo.thisMoney;
            poHistory.clThisTime = dataCd83CloseVo.thisTime;
            poHistory.clOpenDt = poLast.clOpenDt;
            poHistory.closeDt = poLast.closeDt ;
            poHistory.updateFrom(dV1_0_1, dataCd83CloseVo, clearOpenValve);
        }

        if(clearOpenValve){
            poLast.opDt = null ;
            poLast.opType = null ;
            poLast.opTotalAmount = null ;
            poLast.opIcCardNo = null ;
            poLast.opIcCardAddr = null ;
            poLast.opRemainMoney = null ;
            poLast.openDt = null ;

            if(poHistory != null) {
                poHistory.opDt = null ;
                poHistory.opType = null ;
                poHistory.opTotalAmount = null ;
                poHistory.opIcCardNo = null ;
                poHistory.opIcCardAddr = null ;
                poHistory.opRemainMoney = null ;
                poHistory.openDt = null ;
            }
        }
    }
}