From 5bfa227109b90b20b09345722b3232fac77a1ab1 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 11 九月 2024 11:41:53 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerCtrl.java | 39 ++++++++++++++++++++++++++-------------
1 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerCtrl.java
index 252376c..8bc4a6b 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerCtrl.java
@@ -104,6 +104,7 @@
prController.setRtuAddr(prControllerTramp.getRtuAddr());
prController.setProtocol(prControllerTramp.getProtocol());
prController.setFindDt(prControllerTramp.getFindDt());
+ prController.setOrgTag(prControllerTramp.getOrgTag());
prController.setAddWays((byte) 1);
prController.setOperator(operator);
Date operateTime = new Date();
@@ -113,17 +114,18 @@
if (rec_addController == 0) {
return BaseResponseUtils.buildFail(ProjectResultCode.BIND_FAIL.getMessage());
}
+// if (remarks != null || remarks !=""){
+// // 淇敼缁戝畾璁板綍
+// PrIntakeController prIntakeController = new PrIntakeController();
+// prIntakeController.setRemarks(remarks);
+// prIntakeController.setIntakeid(intakeId);
+//
+// Integer rec = Optional.ofNullable(intakeControllerSv.updateBindRecord(prIntakeController)).orElse(0);
+// if (rec == 0) {
+// return BaseResponseUtils.buildFail(ProjectResultCode.BIND_FAIL.getMessage());
+// }
+// }
-
- // 淇敼缁戝畾璁板綍
- PrIntakeController prIntakeController = new PrIntakeController();
- prIntakeController.setRemarks(remarks);
- prIntakeController.setIntakeid(intakeId);
-
- Integer rec = Optional.ofNullable(intakeControllerSv.updateBindRecord(prIntakeController)).orElse(0);
- if (rec == 0) {
- return BaseResponseUtils.buildFail(ProjectResultCode.BIND_FAIL.getMessage());
- }
// 鏍规嵁娴佹氮鎺у埗鍣ㄧ紪鍙峰垹闄ゆ祦娴帶鍒跺櫒璁板綍
intakeControllerSv.deleteTrampController(trampControllerId);
@@ -176,13 +178,24 @@
Date operateTime = new Date();
prIntakeController.setOperatedt(operateTime);
prIntakeController.setOperatetype((byte) 2);
+ prIntakeController.setRemarks("瑙ｇ粦");
Integer rec = Optional.ofNullable(intakeControllerSv.addRecord(prIntakeController)).orElse(0);
if (rec == 0) {
return BaseResponseUtils.buildFail(ProjectResultCode.BIND_FAIL.getMessage());
}
-
- // 鍒犻櫎鎺у埗鍣ㄥ閿�
- Integer rec_deleteIntakeId = Optional.ofNullable(controllerSv.deleteIntakeId(po.getControllerId())).orElse(0);
+ //娣诲姞鍒版祦娴帶鍒跺櫒
+ PrController ControllerList = controllerSv.getByControllerId(po.getControllerId());
+ PrControllerTramp prControllerTramp = new PrControllerTramp();
+ prControllerTramp.setRtuAddr(ControllerList.getRtuAddr());
+ prControllerTramp.setProtocol(ControllerList.getProtocol());
+ prControllerTramp.setFindDt(new Date());
+ prControllerTramp.setOrgTag(ControllerList.getOrgTag());
+ Integer rec_addControllerTramp = Optional.ofNullable(intakeControllerSv.addTrampController(prControllerTramp)).orElse(0);
+ if (rec_addControllerTramp == 0) {
+ return BaseResponseUtils.buildFail(ProjectResultCode.ADD_TRAMP_CONTROLLER_FAIL.getMessage());
+ }
+ // 鍒犻櫎鎺у埗鍣�
+ Integer rec_deleteIntakeId = Optional.ofNullable(controllerSv.deleteControllerByIdTwo(po.getControllerId())).orElse(0);
if (rec_deleteIntakeId == 0) {
return BaseResponseUtils.buildFail(ProjectResultCode.BIND_FAIL.getMessage());
}
--
Gitblit v1.8.0