2024-08-30 朱宝民 修改配置文件bug

zhubaomin

2024-08-30 8910275656c9bf398832dc14957a03684a593e96

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

@@ -8,6 +8,7 @@
import com.dy.pipIrrGlobal.pojoPr.PrController;
import com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveHistory;
import com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveLast;
import com.dy.pipIrrGlobal.pojoSe.SeClient;
import com.dy.rtuMw.server.rtuData.TaskSurpport;
import com.dy.rtuMw.server.rtuData.dbSv.DbSv;
import org.apache.logging.log4j.LogManager;
@@ -41,8 +42,9 @@
            Object[] objs = this.getTaskResults(TkPreGenObjs.taskId) ;
            DbSv sv = (DbSv)objs[0] ;
            PrController controller = (PrController)objs[1] ;
            SeClient clientVo = (SeClient)objs[3] ;//这个值对象中只有id和name会有值
            try{
                this.doDeal(sv, controller, d.getRtuAddr(), dV1_0_1, (DataCd83CloseVo)cdObj) ;
                this.doDeal(sv, clientVo, controller, d.getRtuAddr(), dV1_0_1, (DataCd83CloseVo)cdObj) ;
            }catch (Exception e){
                log.error("保存控制器开阀上报时发生异常", e);
            }
@@ -52,66 +54,124 @@
    /**
     * 保存数据
     * @param sv 服务
     * @param clientVo 农户对象（不为空时，只有id和name有值）
     * @param clientVo 农户对象
     * @param controller 控制器对象
     * @param rtuAddr 控制器地址
     * @param dV1_0_1 上报数据
     * @param dataCd83CloseVo 关阀上报数据对象
     */
    private void doDeal(DbSv sv, PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCd83CloseVo dataCd83CloseVo) throws Exception {
    private void doDeal(DbSv sv, SeClient clientVo, PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCd83CloseVo dataCd83CloseVo) throws Exception {
        RmOpenCloseValveLast poLast = sv.getRmOpenCloseValveLast(controller.getIntakeId()) ;
        if(poLast == null){
            //数据库中不存在该控制器的开关阀数据
            //首先生成最新数据及历史数据，并先保存
            poLast = this.newRmOpenCloseValveLast(controller, rtuAddr, dV1_0_1, dataCd83CloseVo);
            this.newHistoryDataDeal(sv, controller, rtuAddr, dV1_0_1, dataCd83CloseVo, poLast);
            poLast = this.newRmOpenCloseValveLast(clientVo, controller, rtuAddr, dV1_0_1, dataCd83CloseVo);
            this.newHistoryDataDeal(sv, clientVo, controller, rtuAddr, dV1_0_1, dataCd83CloseVo, poLast, null);
            //保存最新数据
            sv.saveRmOpenCloseValveLast(poLast);
        }else{
            //数据库中存在该控制器的开关阀数据
            if(poLast.closeDt != null && poLast.clIcCardAddr != null && poLast.clIcCardNo != null){
                if(poLast.closeDt.equals(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.closeDt))
                        && poLast.clIcCardAddr.equals(dataCd83CloseVo.icCardAddr)
                        && poLast.clIcCardNo.equals(dataCd83CloseVo.icCardNo)){
                    //重复上报，原因是下行数据处理慢了，就重复上报了
                    return ;
                }
            }
            if(poLast.clType == null){
                //原记录不存在关阀数据，所以当前关阀上报是新的一次关阀
                if(poLast.opType == null){
                    //原记录中不存在开阀数据，没办法进行匹配
                if(poLast.opType == null || poLast.openDt == null){
                    //原记录中不存在开阀数据(即开阀与关阀数据都没有，这种情况一般不存在)，没办法进行匹配
                    //生成并保存新的关阀上报历史数据记录
                    this.newHistoryDataDeal(sv, controller, rtuAddr, dV1_0_1, dataCd83CloseVo, poLast);
                    this.newHistoryDataDeal(sv, clientVo, controller, rtuAddr, dV1_0_1, dataCd83CloseVo, poLast, null);
                }else{
                    //原记录中存在开阀数据，进行历史数据匹配
                    RmOpenCloseValveHistory poHistory = null ;
                    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);
                            if(poHistory.openDt != null){
                                //上面已经判断了poLast.openDt == null，所以此处一般会是poHistory.openDt != null
                                if(poHistory.openDt.equals(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.openDt))){
                                    //匹配成功
                                    //当前关阀是原记录中开阀的对应关阀
                                    this.updateCloseValve(clientVo, controller, poLast, poHistory, dV1_0_1, dataCd83CloseVo, false) ;
                                    sv.updateRmOpenCloseValveHistory(poHistory);
                                }else if(poHistory.openDt.after(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.openDt))){
                                    //匹配失败(对于after:等于或晚于都返回true)
                                    //本地最新数据中的开阀时间晚于当前关阀上报中的开阀时间，说明是补报
                                    this.dealSupplyReport() ;
                                }else{
                                    //匹配失败
                                    //本地最新数据中的开阀时间早于当前关阀上报中的开阀时间，说明是新的一次关阀报，而且对应关阀报的上一次开阀报未收到
                                    this.newHistoryDataDeal(sv, clientVo, controller, rtuAddr, dV1_0_1, dataCd83CloseVo, poLast, true);
                                }
                            }else{
                                //这种情况不存在，认为匹配失败
                                //当前关阀不是原记录中开阀的对应关阀，生成并保存新的关阀上报历史数据记录
                                this.newHistoryDataDeal(sv, clientVo, controller, rtuAddr, dV1_0_1, dataCd83CloseVo, poLast, true);
                            }
                        }else{
                            //没有历史数据，生成并保存新的关阀上报历史数据记录
                            this.newHistoryDataDeal(sv, controller, rtuAddr, dV1_0_1, dataCd83CloseVo, poLast);
                            //没有历史数据，这种情况不存在，认为匹配失败，生成并保存新的关阀上报历史数据记录
                            this.newHistoryDataDeal(sv, clientVo, controller, rtuAddr, dV1_0_1, dataCd83CloseVo, poLast, true);
                        }
                    }else{
                        //没有历史数据，生成并保存新的关阀上报历史数据记录
                        this.newHistoryDataDeal(sv, controller, rtuAddr, dV1_0_1, dataCd83CloseVo, poLast);
                        //没有历史数据，这种情况不存在，认为匹配失败，生成并保存新的关阀上报历史数据记录
                        this.newHistoryDataDeal(sv, clientVo, controller, rtuAddr, dV1_0_1, dataCd83CloseVo, poLast, true);
                    }
                }
            }else if(poLast.opType != null){
                //原记录存在关阀数据，也存在开阀数据，首先进行开关阀时间对比
                if(poLast.closeDt != null && poLast.closeDt.after(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.closeDt))){
                    //补报的许久之前的数据，不进行处理
                }else if(poLast.closeDt != null && poLast.closeDt.equals(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.closeDt))){
                if(poLast.closeDt != null && poLast.closeDt.equals(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.closeDt))){
                    //重复上报了，不进行处理
                }else if(poLast.closeDt != null && poLast.closeDt.after(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.closeDt))){
                    //补报的许久之前的数据(对于after:等于或晚于都返回true)
                    this.dealSupplyReport() ;
                }else {
                    //当前上报的关阀数据晚于原来的关阀数据，是新的上报关阀数据
                    this.updateCloseValve(controller, poLast, null, dV1_0_1, dataCd83CloseVo, false) ;
                    this.newHistoryDataDeal(sv, controller, rtuAddr, dV1_0_1, dataCd83CloseVo, poLast);
                    //是新的上报关阀数据
                    //进行历史数据匹配
                    RmOpenCloseValveHistory poHistory = null ;
                    if(poLast.lastHistoryId != null) {
                        poHistory = sv.getRmOpenCloseValveHistory(poLast.lastHistoryId);
                        if (poHistory != null) {
                            if(poHistory.openDt.equals(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.openDt))){
                                //匹配上了
                                this.updateCloseValve(clientVo, controller, poLast, poHistory, dV1_0_1, dataCd83CloseVo, false) ;
                                sv.updateRmOpenCloseValveHistory(poHistory);
                            }else{
                                //上个关阀报未上报
                                this.updateCloseValve(clientVo, controller, poLast, null, dV1_0_1, dataCd83CloseVo, true) ;
                                this.newHistoryDataDeal(sv, clientVo, controller, rtuAddr, dV1_0_1, dataCd83CloseVo, poLast, null);
                            }
                        }else{
                            //这种情况不存在，但为安全也进行处理，也认为上个关阀报未上报
                            this.updateCloseValve(clientVo, controller, poLast, null, dV1_0_1, dataCd83CloseVo, true) ;
                            this.newHistoryDataDeal(sv, clientVo, controller, rtuAddr, dV1_0_1, dataCd83CloseVo, poLast, null);
                        }
                    }else{
                        //这种情况不存在，但为安全也进行处理，也认为上个关阀报未上报
                        this.updateCloseValve(clientVo, controller, poLast, null, dV1_0_1, dataCd83CloseVo, true) ;
                        this.newHistoryDataDeal(sv, clientVo, controller, rtuAddr, dV1_0_1, dataCd83CloseVo, poLast, null);
                    }
                }
            }else{
                //if(po.opType == null)
                //原记录不存在开阀数据也不存在关阀数据，这种情况不存在，但为安全也进行处理
                this.updateCloseValve(controller, poLast, null, dV1_0_1, dataCd83CloseVo, false) ;
                //生成并保存新的关阀上报历史数据记录
                this.newHistoryDataDeal(sv, controller, rtuAddr, dV1_0_1, dataCd83CloseVo, poLast);
                //原记录不存在开阀数据也不存在关阀数据，这种情况不存在，但为安全也进行处理，也认为上个关阀报未上报
                this.updateCloseValve(clientVo, controller, poLast, null, dV1_0_1, dataCd83CloseVo, true) ;
                //生成并保存新的关阀上报历史数据记录，没有对应的开发数据
                this.newHistoryDataDeal(sv, clientVo, controller, rtuAddr, dV1_0_1, dataCd83CloseVo, poLast, null);
            }

            sv.updateRmOpenCloseValveLast(poLast);
        }
    }

    /**
     * 处理补报，暂时无逻辑
     */
    private void dealSupplyReport(){
    }

    /**
@@ -122,17 +182,29 @@
     * @param dV1_0_1
     * @param dataCd83CloseVo
     * @param poLast
     * @param clearLastOpenValue
     * @throws Exception
     */
    private void newHistoryDataDeal(DbSv sv, PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCd83CloseVo dataCd83CloseVo, RmOpenCloseValveLast poLast)throws Exception {
        RmOpenCloseValveHistory poHistory = this.newRmOpenCloseValveHistory(controller, rtuAddr, dV1_0_1, dataCd83CloseVo) ;
    private void newHistoryDataDeal(DbSv sv,
                                   SeClient clientVo,
                                    PrController controller,
                                    String rtuAddr,
                                    DataV1_0_1 dV1_0_1,
                                    DataCd83CloseVo dataCd83CloseVo,
                                    RmOpenCloseValveLast poLast,
                                    Boolean clearLastOpenValue)throws Exception {
        RmOpenCloseValveHistory poHistory = this.newRmOpenCloseValveHistory(clientVo, controller, rtuAddr, dV1_0_1, dataCd83CloseVo) ;
        sv.saveRmOpenCloseValveHistory(poHistory);
        //由最新数据持有历史数据中的最新记录ID，以方便快速查询
        poLast.lastHistoryId = poHistory == null ? null: poHistory.id ;
        if(clearLastOpenValue != null && clearLastOpenValue.booleanValue()){
            poLast.clearOpenValue();
        }
    }

    /**
     * 生成新的关阀上报最新数据记录
     * @param clientVo
     * @param controller
     * @param rtuAddr
     * @param dV1_0_1
@@ -140,8 +212,14 @@
     * @return
     * @throws Exception
     */
    private RmOpenCloseValveLast newRmOpenCloseValveLast(PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCd83CloseVo dataCd83CloseVo)throws Exception {
    private RmOpenCloseValveLast newRmOpenCloseValveLast(SeClient clientVo,
                                                         PrController controller,
                                                         String rtuAddr,
                                                         DataV1_0_1 dV1_0_1,
                                                         DataCd83CloseVo dataCd83CloseVo)throws Exception {
        RmOpenCloseValveLast po = new RmOpenCloseValveLast() ;
        po.clientId = clientVo==null?null:clientVo.getId() ;
        po.clientName = clientVo==null?null:clientVo.getName() ;
        po.controllerId = controller==null?null:controller.getId() ;
        po.intakeId = controller==null?null:controller.getIntakeId() ;
        po.rtuAddr = rtuAddr ;
@@ -152,6 +230,7 @@

    /**
     * 生成新的关阀上报历史数据记录
     * @param clientVo
     * @param controller
     * @param rtuAddr
     * @param dV1_0_1
@@ -159,8 +238,14 @@
     * @return
     * @throws Exception
     */
    private RmOpenCloseValveHistory newRmOpenCloseValveHistory(PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCd83CloseVo dataCd83CloseVo)throws Exception {
    private RmOpenCloseValveHistory newRmOpenCloseValveHistory(SeClient clientVo,
                                                               PrController controller,
                                                               String rtuAddr,
                                                               DataV1_0_1 dV1_0_1,
                                                               DataCd83CloseVo dataCd83CloseVo)throws Exception {
        RmOpenCloseValveHistory po = new RmOpenCloseValveHistory() ;
        po.clientId = clientVo==null?null:clientVo.getId() ;
        po.clientName = clientVo==null?null:clientVo.getName() ;
        po.controllerId = controller==null?null:controller.getId() ;
        po.intakeId = controller==null?null:controller.getIntakeId() ;
        po.rtuAddr = rtuAddr ;
@@ -171,25 +256,36 @@

    /**
     * 更新数据
     * @param clientVo
     * @param controller
     * @param poLast
     * @param poHistory
     * @param dV1_0_1
     * @param dataCd83CloseVo
     * @param clearOpenValve
     * @param clearLastOpenValue
     * @throws Exception
     */
    private void updateCloseValve(PrController controller, RmOpenCloseValveLast poLast, RmOpenCloseValveHistory poHistory, DataV1_0_1 dV1_0_1, DataCd83CloseVo dataCd83CloseVo, boolean clearOpenValve) throws Exception {
    private void updateCloseValve(SeClient clientVo,
                                  PrController controller,
                                  RmOpenCloseValveLast poLast,
                                  RmOpenCloseValveHistory poHistory,
                                  DataV1_0_1 dV1_0_1,
                                  DataCd83CloseVo dataCd83CloseVo,
                                  boolean clearLastOpenValue) throws Exception {
        poLast.clientId = clientVo==null?null:clientVo.getId() ;
        poLast.clientName = clientVo==null?null:clientVo.getName() ;
        poLast.controllerId = controller==null?null:controller.getId();
        poLast.intakeId = controller==null?null:controller.getIntakeId();

        poLast.updateFrom(dV1_0_1, dataCd83CloseVo, clearOpenValve);
        poLast.updateFrom(dV1_0_1, dataCd83CloseVo, clearLastOpenValue);

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

            poHistory.updateFrom(dV1_0_1, dataCd83CloseVo, clearOpenValve);
            poHistory.updateFrom(dV1_0_1, dataCd83CloseVo, false);
        }

    }