Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

liurunyu

2025-08-15 de31eed424e62a219d6378fe193e615a8584ae0c

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

@@ -8,6 +8,8 @@
import com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveHistory;
import com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveLast;
import com.dy.pipIrrGlobal.pojoSe.SeClient;
import com.dy.rtuMw.server.msCenter.MsCenterUnit;
import com.dy.rtuMw.server.msCenter.MsObj;
import com.dy.rtuMw.server.rtuData.TaskSurpport;
import com.dy.rtuMw.server.rtuData.dbSv.DbSv;
import org.apache.logging.log4j.LogManager;
@@ -43,6 +45,7 @@
            PrController controller = (PrController)objs[1] ;
            SeClient clientVo = (SeClient)objs[3] ;//这个值对象中只有id和name会有值
            try{
                this.toMsCenter(clientVo, controller, d.getRtuAddr(), dV1, (DataCd83CloseVo)cdObj) ;
                this.doDeal(sv, clientVo, controller, d.getRtuAddr(), dV1, (DataCd83CloseVo)cdObj) ;
            }catch (Exception e){
                log.error("保存控制器开阀上报时发生异常", e);
@@ -51,10 +54,32 @@
    }

    /**
     * 把开阀消息存入消息中心
     * @param clientVo
     * @param controller
     * @param rtuAddr
     * @param dV1
     * @param dataCd83CloseVo
     */
    private void toMsCenter(SeClient clientVo, PrController controller, String rtuAddr, DataV1 dV1, DataCd83CloseVo dataCd83CloseVo){
        if(clientVo != null && controller != null){
            MsObj msObj = new MsObj() ;
            msObj.put("name", "关阀");
            msObj.put("clientId", clientVo.getId());
            msObj.put("clientName", clientVo.getName());
            msObj.put("clientAddress", clientVo.getAddress());
            msObj.put("icCardNo", dataCd83CloseVo.icCardNo);
            msObj.put("rtuAddr", rtuAddr);
            msObj.put("intakeId", controller.getIntakeId());
            msObj.put("dt", dV1.dt);
            MsCenterUnit.getInstance().pushMs(msObj);
        }
    }

    /**
     * 保存数据
     * @param sv 服务
     * @param clientVo 农户对象（不为空时，只有id和name有值）
     * @param clientVo 农户对象
     * @param controller 控制器对象
     * @param rtuAddr 控制器地址
     * @param dV1 上报数据
@@ -96,7 +121,7 @@
                                if(poHistory.openDt.equals(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.openDt))){
                                    //匹配成功
                                    //当前关阀是原记录中开阀的对应关阀
                                    this.updateCloseValve(clientVo, controller, poLast, poHistory, dV1, dataCd83CloseVo, false) ;
                                    this.updateCloseValve(clientVo, controller, rtuAddr, poLast, poHistory, dV1, dataCd83CloseVo, false) ;
                                    sv.updateRmOpenCloseValveHistory(poHistory);
                                }else if(poHistory.openDt.after(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.openDt))){
                                    //匹配失败(对于after:等于或晚于都返回true)
@@ -137,28 +162,28 @@
                        if (poHistory != null) {
                            if(poHistory.openDt.equals(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.openDt))){
                                //匹配上了
                                this.updateCloseValve(clientVo, controller, poLast, poHistory, dV1, dataCd83CloseVo, false) ;
                                this.updateCloseValve(clientVo, controller, rtuAddr, poLast, poHistory, dV1, dataCd83CloseVo, false) ;
                                sv.updateRmOpenCloseValveHistory(poHistory);
                            }else{
                                //上个关阀报未上报
                                this.updateCloseValve(clientVo, controller, poLast, null, dV1, dataCd83CloseVo, true) ;
                                this.updateCloseValve(clientVo, controller, rtuAddr, poLast, null, dV1, dataCd83CloseVo, true) ;
                                this.newHistoryDataDeal(sv, clientVo, controller, rtuAddr, dV1, dataCd83CloseVo, poLast, null);
                            }
                        }else{
                            //这种情况不存在，但为安全也进行处理，也认为上个关阀报未上报
                            this.updateCloseValve(clientVo, controller, poLast, null, dV1, dataCd83CloseVo, true) ;
                            this.updateCloseValve(clientVo, controller, rtuAddr, poLast, null, dV1, dataCd83CloseVo, true) ;
                            this.newHistoryDataDeal(sv, clientVo, controller, rtuAddr, dV1, dataCd83CloseVo, poLast, null);
                        }
                    }else{
                        //这种情况不存在，但为安全也进行处理，也认为上个关阀报未上报
                        this.updateCloseValve(clientVo, controller, poLast, null, dV1, dataCd83CloseVo, true) ;
                        this.updateCloseValve(clientVo, controller, rtuAddr, poLast, null, dV1, dataCd83CloseVo, true) ;
                        this.newHistoryDataDeal(sv, clientVo, controller, rtuAddr, dV1, dataCd83CloseVo, poLast, null);
                    }
                }
            }else{
                //if(po.opType == null)
                //原记录不存在开阀数据也不存在关阀数据，这种情况不存在，但为安全也进行处理，也认为上个关阀报未上报
                this.updateCloseValve(clientVo, controller, poLast, null, dV1, dataCd83CloseVo, true) ;
                this.updateCloseValve(clientVo, controller, rtuAddr, poLast, null, dV1, dataCd83CloseVo, true) ;
                //生成并保存新的关阀上报历史数据记录，没有对应的开发数据
                this.newHistoryDataDeal(sv, clientVo, controller, rtuAddr, dV1, dataCd83CloseVo, poLast, null);
            }
@@ -266,6 +291,7 @@
     */
    private void updateCloseValve(SeClient clientVo,
                                  PrController controller,
                                  String rtuAddr,
                                  RmOpenCloseValveLast poLast,
                                  RmOpenCloseValveHistory poHistory,
                                  DataV1 dV1,
@@ -275,17 +301,15 @@
        poLast.clientName = clientVo==null?null:clientVo.getName() ;
        poLast.controllerId = controller==null?null:controller.getId();
        poLast.intakeId = controller==null?null:controller.getIntakeId();

        poLast.rtuAddr = rtuAddr;
        poLast.updateFrom(dV1, 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.rtuAddr = rtuAddr;
            poHistory.updateFrom(dV1, dataCd83CloseVo, false);
        }

    }
}