From 4297d17c914dc6b2d64388776ba0db7fb093c1b9 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期六, 29 三月 2025 08:32:03 +0800
Subject: [PATCH] 轮灌组添加接口、删除接口
---
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerCtrl.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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 5c481f2..d252cd4 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
@@ -102,6 +102,7 @@
prController.setIntakeId(intakeId);
prController.setRtuAddr(prControllerTramp.getRtuAddr());
prController.setProtocol(prControllerTramp.getProtocol());
+ prController.setProtocolVersion(prControllerTramp.getProtocolVersion());
prController.setFindDt(prControllerTramp.getFindDt());
prController.setOrgTag(prControllerTramp.getOrgTag());
prController.setAddWays((byte) 1);
@@ -311,7 +312,7 @@
pct.setFindDt(new Date());
Integer rows = intakeControllerSv.addTrampController(pct);
if (rows == 0) {
- return BaseResponseUtils.buildFail(ProjectResultCode.ADD_TRAMP_CONTROLLER_FAIL.getMessage());
+ return BaseResponseUtils.buildErrorMsg(ProjectResultCode.ADD_TRAMP_CONTROLLER_FAIL.getMessage());
}
return BaseResponseUtils.buildSuccess(true);
}
@@ -322,19 +323,19 @@
* @param id
* @return
*/
- @PostMapping("deleteTrampController")
+ @GetMapping("deleteTrampController")
@Transactional(rollbackFor = Exception.class)
@SsoAop()
public BaseResponse<Boolean> deleteTrampController(Long id) {
PrControllerTramp controllerInfo = intakeControllerSv.getTrampControllerInfo(id);
if (controllerInfo == null) {
- return BaseResponseUtils.buildFail(ProjectResultCode.NO_EXIST_TRAMP_CONTROLLER.getMessage());
+ return BaseResponseUtils.buildErrorMsg(ProjectResultCode.NO_EXIST_TRAMP_CONTROLLER.getMessage());
}
Integer rows = intakeControllerSv.deleteTrampController(id);
- if (rows == 0) {
- return BaseResponseUtils.buildFail(ProjectResultCode.DELETE_TRAMP_CONTROLLER_FAIL.getMessage());
- }
+// if (rows == 0) {
+// return BaseResponseUtils.buildErrorMsg(ProjectResultCode.DELETE_TRAMP_CONTROLLER_FAIL.getMessage());
+// }
return BaseResponseUtils.buildSuccess(true);
}
@@ -351,7 +352,7 @@
Integer rows = intakeControllerSv.emptyTrampController();
if (rows == 0) {
- return BaseResponseUtils.buildFail(ProjectResultCode.DELETE_TRAMP_CONTROLLER_FAIL.getMessage());
+ return BaseResponseUtils.buildErrorMsg(ProjectResultCode.DELETE_TRAMP_CONTROLLER_FAIL.getMessage());
}
return BaseResponseUtils.buildSuccess(true);
}
--
Gitblit v1.8.0