pipIrr-SV.git - Gitblit

parent: 3878bfa2 | 补丁 | 提交 | ignore whitespace

liurunyu

2025-06-27 297c8080c475244fd142694c396a2e6fe5d3a7bd

remote模块远程开关阀逻辑修改

2个文件已修改

	pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/p202404V201/cd92/CdCtrl.java	19 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/p202404V201/cdA2/CdCtrl.java	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/p202404V201/cd92/CdCtrl.java

@@ -122,17 +122,16 @@
                                        sv.addOrUpdateOftenUseIntake(dto.getOperator(), dto.getIntakeId()) ;
                                        //开阀成功，虚拟卡记录上标记已被占用
                                        sv.setVcUsed(vcPo.getId(), dto.getIntakeId());
                                        //记录开阀命令，以备远程关阀
                                        RmCommandOpen comOpen = sv.getCommandOpen(dto.getIntakeId());
                                        if(comOpen == null){
                                            RmCommandOpen po = newRmCommandOpen(comId, ctrlPo.getProtocol(), ComCode, comName, dto.getIntakeId(), ctrlPo.getRtuAddr(), vcPo.getVcNum(), orderNo, dto.getOperator()) ;
                                            sv.saveCommandOpen(po);
                                        }else{
                                            setRmCommandOpen(comOpen, comId, ctrlPo.getProtocol(), ComCode, comName, dto.getIntakeId(), ctrlPo.getRtuAddr(), vcPo.getVcNum(), orderNo, dto.getOperator()) ;
                                            sv.updateCommandOpen(comOpen);
                                        }
                                    }
                                    //记录开阀命令，以备远程关阀
                                    RmCommandOpen comOpen = sv.getCommandOpen(dto.getIntakeId());
                                    if(comOpen == null){
                                        RmCommandOpen po = newRmCommandOpen(comId, ctrlPo.getProtocol(), ComCode, comName, dto.getIntakeId(), ctrlPo.getRtuAddr(), vcPo.getVcNum(), orderNo, dto.getOperator()) ;
                                        sv.saveCommandOpen(po);
                                    }else{
                                        setRmCommandOpen(comOpen, comId, ctrlPo.getProtocol(), ComCode, comName, dto.getIntakeId(), ctrlPo.getRtuAddr(), vcPo.getVcNum(), orderNo, dto.getOperator()) ;
                                        sv.updateCommandOpen(comOpen);
                                    }

                                }
                                @Override
                                public void call(Object... objs) {

 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/p202404V201/cdA2/CdCtrl.java

@@ -122,15 +122,15 @@
                                        sv.addOrUpdateOftenUseIntake(dto.getOperator(), dto.getIntakeId()) ;
                                        //开阀成功，虚拟卡记录上标记已被占用
                                        sv.setVcUsed(vcPo.getId(), dto.getIntakeId());
                                    }
                                    //记录开阀命令，以备远程关阀
                                    RmCommandOpen comOpen = sv.getCommandOpen(dto.getIntakeId());
                                    if(comOpen == null){
                                        RmCommandOpen po = newRmCommandOpen(comId, ctrlPo.getProtocol(), ComCode, comName, dto.getIntakeId(), ctrlPo.getRtuAddr(), vcPo.getVcNum(), orderNo, dto.getOperator()) ;
                                        sv.saveCommandOpen(po);
                                    }else{
                                        setRmCommandOpen(comOpen, comId, ctrlPo.getProtocol(), ComCode, comName, dto.getIntakeId(), ctrlPo.getRtuAddr(), vcPo.getVcNum(), orderNo, dto.getOperator()) ;
                                        sv.updateCommandOpen(comOpen);
                                        //记录开阀命令，以备远程关阀
                                        RmCommandOpen comOpen = sv.getCommandOpen(dto.getIntakeId());
                                        if(comOpen == null){
                                            RmCommandOpen po = newRmCommandOpen(comId, ctrlPo.getProtocol(), ComCode, comName, dto.getIntakeId(), ctrlPo.getRtuAddr(), vcPo.getVcNum(), orderNo, dto.getOperator()) ;
                                            sv.saveCommandOpen(po);
                                        }else{
                                            setRmCommandOpen(comOpen, comId, ctrlPo.getProtocol(), ComCode, comName, dto.getIntakeId(), ctrlPo.getRtuAddr(), vcPo.getVcNum(), orderNo, dto.getOperator()) ;
                                            sv.updateCommandOpen(comOpen);
                                        }
                                    }
                                }
                                @Override

			@@ -122,17 +122,16 @@
			sv.addOrUpdateOftenUseIntake(dto.getOperator(), dto.getIntakeId()) ;
			//开阀成功，虚拟卡记录上标记已被占用
			sv.setVcUsed(vcPo.getId(), dto.getIntakeId());
			//记录开阀命令，以备远程关阀
			RmCommandOpen comOpen = sv.getCommandOpen(dto.getIntakeId());
			if(comOpen == null){
			RmCommandOpen po = newRmCommandOpen(comId, ctrlPo.getProtocol(), ComCode, comName, dto.getIntakeId(), ctrlPo.getRtuAddr(), vcPo.getVcNum(), orderNo, dto.getOperator()) ;
			sv.saveCommandOpen(po);
			}else{
			setRmCommandOpen(comOpen, comId, ctrlPo.getProtocol(), ComCode, comName, dto.getIntakeId(), ctrlPo.getRtuAddr(), vcPo.getVcNum(), orderNo, dto.getOperator()) ;
			sv.updateCommandOpen(comOpen);
			}
			}
			//记录开阀命令，以备远程关阀
			RmCommandOpen comOpen = sv.getCommandOpen(dto.getIntakeId());
			if(comOpen == null){
			RmCommandOpen po = newRmCommandOpen(comId, ctrlPo.getProtocol(), ComCode, comName, dto.getIntakeId(), ctrlPo.getRtuAddr(), vcPo.getVcNum(), orderNo, dto.getOperator()) ;
			sv.saveCommandOpen(po);
			}else{
			setRmCommandOpen(comOpen, comId, ctrlPo.getProtocol(), ComCode, comName, dto.getIntakeId(), ctrlPo.getRtuAddr(), vcPo.getVcNum(), orderNo, dto.getOperator()) ;
			sv.updateCommandOpen(comOpen);
			}

			}
			@Override
			public void call(Object... objs) {

			@@ -122,15 +122,15 @@
			sv.addOrUpdateOftenUseIntake(dto.getOperator(), dto.getIntakeId()) ;
			//开阀成功，虚拟卡记录上标记已被占用
			sv.setVcUsed(vcPo.getId(), dto.getIntakeId());
			}
			//记录开阀命令，以备远程关阀
			RmCommandOpen comOpen = sv.getCommandOpen(dto.getIntakeId());
			if(comOpen == null){
			RmCommandOpen po = newRmCommandOpen(comId, ctrlPo.getProtocol(), ComCode, comName, dto.getIntakeId(), ctrlPo.getRtuAddr(), vcPo.getVcNum(), orderNo, dto.getOperator()) ;
			sv.saveCommandOpen(po);
			}else{
			setRmCommandOpen(comOpen, comId, ctrlPo.getProtocol(), ComCode, comName, dto.getIntakeId(), ctrlPo.getRtuAddr(), vcPo.getVcNum(), orderNo, dto.getOperator()) ;
			sv.updateCommandOpen(comOpen);
			//记录开阀命令，以备远程关阀
			RmCommandOpen comOpen = sv.getCommandOpen(dto.getIntakeId());
			if(comOpen == null){
			RmCommandOpen po = newRmCommandOpen(comId, ctrlPo.getProtocol(), ComCode, comName, dto.getIntakeId(), ctrlPo.getRtuAddr(), vcPo.getVcNum(), orderNo, dto.getOperator()) ;
			sv.saveCommandOpen(po);
			}else{
			setRmCommandOpen(comOpen, comId, ctrlPo.getProtocol(), ComCode, comName, dto.getIntakeId(), ctrlPo.getRtuAddr(), vcPo.getVcNum(), orderNo, dto.getOperator()) ;
			sv.updateCommandOpen(comOpen);
			}
			}
			}
			@Override