1、实现参数设置模块pipIrr-param-set; 2、相关模块配置文件适应性调整。

liurunyu

2025-05-29 fcc1cf275578bd3aa08ef50c6a611fb206b7aac9

 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealCloseValveReportV202404.java

@@ -21,6 +21,9 @@
 * @LastEditTime 2024-06-20 13:48
 * @Description
 */
/**
 * 处理控制器关阀上报
 */
public class TkDealCloseValveReportV202404 extends TaskSurpport {
    private static final Logger log = LogManager.getLogger(TkDealCloseValveReportV202404.class.getName());

@@ -29,7 +32,6 @@

    /**
     * 执行节点任务：关阀上报
     *
     * @param data 需要处理的数据
     */
    @Override
@@ -94,8 +96,8 @@
            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(dataCd85Vo.endDt))
            if(poLast.clOrderNo != null && poLast.clIcCardAddr != null && poLast.clIcCardNo != null){
                if(poLast.clOrderNo.equals(dataCd85Vo.orderNo)
                        && poLast.clIcCardAddr.equals(dataCd85Vo.icCardAddr)
                        && poLast.clIcCardNo.equals(dataCd85Vo.icCardNo)){
                    //重复上报，原因是下行数据处理慢了，就重复上报了
@@ -114,20 +116,15 @@
                    if(poLast.lastHistoryId != null){
                        poHistory = sv.getRmOpenCloseValveHistory(poLast.lastHistoryId) ;
                        if(poHistory != null){
                            if(poHistory.openDt != null){
                                //上面已经判断了poLast.openDt == null，所以此处一般会是poHistory.openDt != null
                                if(poHistory.openDt.equals(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd85Vo.startDt))){
                            if(poHistory.opOrderNo != null){
                                if(poHistory.opOrderNo.equals(dataCd85Vo.orderNo)){
                                    //匹配成功
                                    //当前关阀是原记录中开阀的对应关阀
                                    this.updateCloseValve(clientVo, controller, poLast, poHistory, dV202404, dataCd85Vo, false) ;
                                    this.updateCloseValve(clientVo, controller, rtuAddr, poLast, poHistory, dV202404, dataCd85Vo, false) ;
                                    sv.updateRmOpenCloseValveHistory(poHistory);
                                }else if(poHistory.openDt.after(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd85Vo.startDt))){
                                    //匹配失败(对于after:等于或晚于都返回true)
                                    //本地最新数据中的开阀时间晚于当前关阀上报中的开阀时间，说明是补报
                                    this.dealSupplyReport() ;
                                }else{
                                    //匹配失败
                                    //本地最新数据中的开阀时间早于当前关阀上报中的开阀时间，说明是新的一次关阀报，而且对应关阀报的上一次开阀报未收到
                                    //当前关阀不是原记录中开阀的对应关阀，说明是新的一次关阀报，而且对应关阀报的上一次开阀报未收到
                                    this.newHistoryDataDeal(sv, clientVo, controller, rtuAddr, dV202404, dataCd85Vo, poLast, true);
                                }
                            }else{
@@ -145,12 +142,9 @@
                    }
                }
            }else if(poLast.opType != null){
                //原记录存在关阀数据，也存在开阀数据，首先进行开关阀时间对比
                if(poLast.closeDt != null && poLast.closeDt.equals(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd85Vo.endDt))){
                //原记录存在关阀数据，也存在开阀数据，首先进行对比
                if(poLast.clOrderNo != null && poLast.clOrderNo.equals(dataCd85Vo.orderNo)){
                    //重复上报了，不进行处理
                }else if(poLast.closeDt != null && poLast.closeDt.after(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd85Vo.endDt))){
                    //补报的许久之前的数据(对于after:等于或晚于都返回true)
                    this.dealSupplyReport() ;
                }else {
                    //是新的上报关阀数据
                    //进行历史数据匹配
@@ -158,30 +152,35 @@
                    if(poLast.lastHistoryId != null) {
                        poHistory = sv.getRmOpenCloseValveHistory(poLast.lastHistoryId);
                        if (poHistory != null) {
                            if(poHistory.openDt.equals(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd85Vo.startDt))){
                                //匹配上了
                                this.updateCloseValve(clientVo, controller, poLast, poHistory, dV202404, dataCd85Vo, false) ;
                                sv.updateRmOpenCloseValveHistory(poHistory);
                            if(poHistory.clOrderNo.equals(dataCd85Vo.orderNo)){
                                //重复上报了，不进行处理
                            }else{
                                //上个关阀报未上报
                                this.updateCloseValve(clientVo, controller, poLast, null, dV202404, dataCd85Vo, true) ;
                                this.newHistoryDataDeal(sv, clientVo, controller, rtuAddr, dV202404, dataCd85Vo, poLast, null);
                                if(poLast.closeDt != null && poLast.closeDt.equals(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd85Vo.endDt))){
                                    //重复上报了，不进行处理
                                }else if(poLast.closeDt != null && poLast.closeDt.after(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd85Vo.endDt))){
                                    //补报的许久之前的数据(对于after:等于或晚于都返回true)
                                    this.dealSupplyReport() ;
                                }else {
                                    //上个开阀报未上报
                                    this.updateCloseValve(clientVo, controller, rtuAddr, poLast, null, dV202404, dataCd85Vo, true) ;
                                    this.newHistoryDataDeal(sv, clientVo, controller, rtuAddr, dV202404, dataCd85Vo, poLast, null);
                                }
                            }
                        }else{
                            //这种情况不存在，但为安全也进行处理，也认为上个关阀报未上报
                            this.updateCloseValve(clientVo, controller, poLast, null, dV202404, dataCd85Vo, true) ;
                            this.updateCloseValve(clientVo, controller, rtuAddr, poLast, null, dV202404, dataCd85Vo, true) ;
                            this.newHistoryDataDeal(sv, clientVo, controller, rtuAddr, dV202404, dataCd85Vo, poLast, null);
                        }
                    }else{
                        //这种情况不存在，但为安全也进行处理，也认为上个关阀报未上报
                        this.updateCloseValve(clientVo, controller, poLast, null, dV202404, dataCd85Vo, true) ;
                        this.updateCloseValve(clientVo, controller, rtuAddr, poLast, null, dV202404, dataCd85Vo, true) ;
                        this.newHistoryDataDeal(sv, clientVo, controller, rtuAddr, dV202404, dataCd85Vo, poLast, null);
                    }
                }
            }else{
                //if(po.opType == null)
                //原记录不存在开阀数据也不存在关阀数据，这种情况不存在，但为安全也进行处理，也认为上个关阀报未上报
                this.updateCloseValve(clientVo, controller, poLast, null, dV202404, dataCd85Vo, true) ;
                this.updateCloseValve(clientVo, controller, rtuAddr, poLast, null, dV202404, dataCd85Vo, true) ;
                //生成并保存新的关阀上报历史数据记录，没有对应的开发数据
                this.newHistoryDataDeal(sv, clientVo, controller, rtuAddr, dV202404, dataCd85Vo, poLast, null);
            }
@@ -289,6 +288,7 @@
     */
    private void updateCloseValve(SeClient clientVo,
                                  PrController controller,
                                  String rtuAddr,
                                  RmOpenCloseValveLast poLast,
                                  RmOpenCloseValveHistory poHistory,
                                  DataV202404 dV202404,
@@ -298,17 +298,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(dV202404, dataCd85Vo, 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(dV202404, dataCd85Vo, false);
        }
    }

}