Merge remote-tracking branch 'origin/master'

wuzeyu

2024-05-06 cd45cee236780a8e02244d8d8a916088ca002d3d

 pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkDealOpenValveReport.java

@@ -36,34 +36,36 @@
        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.dataCd83OpenVo != null) {
                Object[] objs = this.getTaskResults(TkPreGenObjs.taskId) ;
                DbSv sv = (DbSv)objs[0] ;
                PrController controller = (PrController)objs[1] ;
                try{
                    this.dealSave(sv, controller, d.getRtuAddr(), dV1_0_1, dV1_0_1.dataCd83OpenVo) ;
                }catch (Exception e){
                    log.error("保存控制器开阀上报时发生异常", e);
                }
            }
//            if (dV1_0_1 != null && dV1_0_1.dataCd83OpenVo != 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.dataCd83OpenVo) ;
//                }catch (Exception e){
//                    log.error("保存控制器开阀上报时发生异常", e);
//                }
//            }
        }
    }
    /**
     * 保存数据
     * 业务处理
     * @param sv 服务
     * @param controller 控制器对象
     * @param rtuAddr 控制器地址
     * @param dV1_0_1 上报数据
     * @param dataCd83OpenVo 开阀上报数据对象
     */
    private void dealSave(DbSv sv, PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCd83OpenVo dataCd83OpenVo) throws Exception {
    private void doDeal(DbSv sv, PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCd83OpenVo dataCd83OpenVo) throws Exception {
        RmOpenCloseValveLast poLast = sv.getRmOpenCloseValveLast(rtuAddr) ;
        if(poLast == null){
            //首先生成历史数据，并保存
            //数据库中不存在该控制器的开关阀数据
            //首先生成最新数据及历史数据，并先保存
            poLast = this.newRmOpenCloseValveLast(controller, rtuAddr, dV1_0_1, dataCd83OpenVo);
            this.newHistoryDataDeal(sv, controller, rtuAddr, dV1_0_1, dataCd83OpenVo, poLast);
            sv.saveRmOpenCloseValveLast(poLast);
        }else{
            //数据库中存在该控制器的开关阀数据
            if(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83OpenVo.openDt).equals(poLast.openDt)){
                //时间一致，重复上报数据，不进行任何处理
            }else{
@@ -75,7 +77,7 @@
                        //重复上报的开阀数据，不进行处理
                    }else{
                        //当前开阀上报是新的一次开阀，不管原记录是否存在关阀数据，一律清空关阀数据
                        this.updateOpenValve(poLast, null, dV1_0_1, dataCd83OpenVo, true) ;
                        this.updateOpenValve(controller, poLast, null, dV1_0_1, dataCd83OpenVo, true) ;
                        //生成并保存新的开阀上报历史数据记录
                        this.newHistoryDataDeal(sv, controller, rtuAddr, dV1_0_1, dataCd83OpenVo, poLast);
                    }
@@ -87,13 +89,13 @@
                        if(poLast.lastHistoryId != null){
                            poHistory = sv.getRmOpenCloseValveHistory(poLast.lastHistoryId) ;
                        }
                        this.updateOpenValve(poLast, poHistory, dV1_0_1, dataCd83OpenVo, false) ;
                        this.updateOpenValve(controller, poLast, poHistory, dV1_0_1, dataCd83OpenVo, false) ;
                        if(poHistory != null){
                            sv.updateRmOpenCloseValveHistory(poHistory);
                        }
                    }else if(poLast.closeDt != null && poLast.closeDt.before(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83OpenVo.openDt))){
                        //当前上报是新的开阀数据
                        this.updateOpenValve(poLast, null, dV1_0_1, dataCd83OpenVo, true) ;
                        //当前上报是新的开阀数据，把最新数据中的关阀内容清空
                        this.updateOpenValve(controller, poLast, null, dV1_0_1, dataCd83OpenVo, true) ;
                        //生成并保存新的开阀上报历史数据记录
                        this.newHistoryDataDeal(sv, controller, rtuAddr, dV1_0_1, dataCd83OpenVo, poLast);
                    }else {
@@ -102,7 +104,7 @@
                        if(poLast.lastHistoryId != null){
                            poHistory = sv.getRmOpenCloseValveHistory(poLast.lastHistoryId) ;
                        }
                        this.updateOpenValve(poLast, poHistory, dV1_0_1, dataCd83OpenVo, false) ;
                        this.updateOpenValve(controller, poLast, poHistory, dV1_0_1, dataCd83OpenVo, false) ;
                        if(poHistory != null){
                            sv.updateRmOpenCloseValveHistory(poHistory);
                        }
@@ -110,7 +112,7 @@
                }else{
                    //if(po.clType == null)
                    //原记录不存在开阀数据也不存在关阀数据，这种情况不存在，但为安全也进行处理
                    this.updateOpenValve(poLast, null, dV1_0_1, dataCd83OpenVo, true) ;
                    this.updateOpenValve(controller, poLast, null, dV1_0_1, dataCd83OpenVo, true) ;
                    //生成并保存新的开阀上报历史数据记录
                    this.newHistoryDataDeal(sv, controller, rtuAddr, dV1_0_1, dataCd83OpenVo, poLast);
                }
@@ -188,6 +190,7 @@

    /**
     * 更新数据
     * @param controller
     * @param poLast
     * @param poHistory
     * @param dV1_0_1
@@ -195,7 +198,10 @@
     * @param clearCloseValve
     * @throws Exception
     */
    private void updateOpenValve(RmOpenCloseValveLast poLast, RmOpenCloseValveHistory poHistory, DataV1_0_1 dV1_0_1, DataCd83OpenVo dataCd83OpenVo, boolean clearCloseValve) throws Exception {
    private void updateOpenValve(PrController controller, RmOpenCloseValveLast poLast, RmOpenCloseValveHistory poHistory, DataV1_0_1 dV1_0_1, DataCd83OpenVo dataCd83OpenVo, boolean clearCloseValve) throws Exception {
        poLast.controllerId = controller==null?null:controller.getId();
        poLast.intakeId = controller==null?null:controller.getIntakeId();

        poLast.opDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt);
        poLast.opType = dataCd83OpenVo.type ;
        poLast.opTotalAmount = dataCd83OpenVo.totalAmount ;
@@ -205,6 +211,9 @@
        poLast.openDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83OpenVo.openDt) ;

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

            poHistory.opDt = poLast.opDt;
            poHistory.opType = dataCd83OpenVo.type ;
            poHistory.opTotalAmount = dataCd83OpenVo.totalAmount ;