From a1744d0bf7f0ad8ac861d672cffd7c710dac4e7e Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 11 四月 2025 14:17:36 +0800
Subject: [PATCH] 获取未绑定轮灌组的取水口

---
 pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerCtrl.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 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 9e38b46..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);
@@ -322,7 +323,7 @@
      * @param id
      * @return
      */
-    @PostMapping("deleteTrampController")
+    @GetMapping("deleteTrampController")
     @Transactional(rollbackFor = Exception.class)
     @SsoAop()
     public BaseResponse<Boolean> deleteTrampController(Long id) {
@@ -332,9 +333,9 @@
         }
 
         Integer rows = intakeControllerSv.deleteTrampController(id);
-        if (rows == 0) {
-            return BaseResponseUtils.buildErrorMsg(ProjectResultCode.DELETE_TRAMP_CONTROLLER_FAIL.getMessage());
-        }
+//        if (rows == 0) {
+//            return BaseResponseUtils.buildErrorMsg(ProjectResultCode.DELETE_TRAMP_CONTROLLER_FAIL.getMessage());
+//        }
         return BaseResponseUtils.buildSuccess(true);
     }
 

--
Gitblit v1.8.0