From bf1b78168478f802a7413d438b16ab64b27b7f4a Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期三, 02 四月 2025 14:32:38 +0800 Subject: [PATCH] 代码优化 --- pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/flowMonitoring/MoniFlowCtrl.java | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/flowMonitoring/MoniFlowCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/flowMonitoring/MoniFlowCtrl.java index fe2fd37..79b50a8 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/flowMonitoring/MoniFlowCtrl.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/flowMonitoring/MoniFlowCtrl.java @@ -5,6 +5,7 @@ import com.dy.common.webUtil.BaseResponseUtils; import com.dy.common.webUtil.ResultCodeMsg; import com.dy.pipIrrGlobal.pojoPr.PrFlowMonitoring; +import com.dy.pipIrrGlobal.pojoPr.PrFlowmeter; import com.dy.pipIrrGlobal.pojoPr.PrMonitoringFlowmeter; import com.dy.pipIrrProject.result.ProjectResultCode; import io.swagger.v3.oas.annotations.Operation; @@ -85,8 +86,15 @@ prMonitoringFlowmeter.setOperatedt(operateTime); prMonitoringFlowmeter.setOperatetype((byte) 1); + PrFlowmeter flowmeter = new PrFlowmeter(); + flowmeter.setMonitoringId(po.getMonitoringId().toString()); + flowmeter.setId(po.getFlowmeterId()); + flowmeter.setOperator(po.getOperator()); + flowmeter.setOperateDt(operateTime); + Integer shu = flowmeterSv.flowmeterAddMonId(flowmeter); + Integer rec = Optional.ofNullable(moniFlowSv.addRecord(prMonitoringFlowmeter)).orElse(0); - if (rec == 0) { + if (rec == 0 || shu == 0) { return BaseResponseUtils.buildFail(ProjectResultCode.MONITORING_FLOWMETER_BIND_FAIL.getMessage()); } return BaseResponseUtils.buildSuccess(true); @@ -127,8 +135,15 @@ prMonitoringFlowmeter.setOperatedt(operateTime); prMonitoringFlowmeter.setOperatetype((byte) 2); + PrFlowmeter flowmeter = new PrFlowmeter(); + flowmeter.setMonitoringId(null); + flowmeter.setId(po.getFlowmeterId()); + flowmeter.setOperator(po.getOperator()); + flowmeter.setOperateDt(operateTime); + Integer shu = flowmeterSv.flowmeterAddMonId(flowmeter); + Integer rec = Optional.ofNullable(moniFlowSv.addRecord(prMonitoringFlowmeter)).orElse(0); - if (rec == 0) { + if (rec == 0 || shu == 0) { return BaseResponseUtils.buildFail(ProjectResultCode.MONITORING_FLOWMETER_BIND_FAIL.getMessage()); } return BaseResponseUtils.buildSuccess(true); -- Gitblit v1.8.0