From 203223860baa19deb6860eb2ba3181910d662980 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 17 四月 2025 14:22:59 +0800
Subject: [PATCH] 1. 轮灌组被终止时灌溉时长为实际数值。2. 计划历史表按照创建时间倒排序。3. 发布计划时判断是否同项目下未完成计划，是否其他项目下使用了本计划的轮灌组且计划未完成。4. 根据计划ID获取计划最新状态。

---
 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuTaskCtrl.java |   44 ++++++++++++++++++++++----------------------
 1 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuTaskCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuTaskCtrl.java
index 459728b..3e6cc53 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuTaskCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuTaskCtrl.java
@@ -85,7 +85,7 @@
             return BaseResponseUtils.buildSuccess(res);
         } catch (Exception e) {
             log.error("鏌ヨRTU鍗囩骇浠诲姟寮傚父", e);
-            return BaseResponseUtils.buildException(e.getMessage()) ;
+            return BaseResponseUtils.buildErrorMsg(e.getMessage()) ;
         }
     }
 
@@ -110,7 +110,7 @@
             return BaseResponseUtils.buildSuccess(res);
         } catch (Exception e) {
             log.error("鏌ヨRTU鍗囩骇浠诲姟寮傚父", e);
-            return BaseResponseUtils.buildException(e.getMessage()) ;
+            return BaseResponseUtils.buildErrorMsg(e.getMessage()) ;
         }
     }
 
@@ -132,7 +132,7 @@
     @SsoAop()
     public BaseResponse<Boolean> save(@Parameter(description = "form琛ㄥ崟鏁版嵁", required = true) @Valid VoRtuTask vo, @Parameter(hidden = true) BindingResult bindingResult){
         if(bindingResult != null && bindingResult.hasErrors()){
-            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+            return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
         }
         UgRtuTask po = new UgRtuTask();
         vo.toPo(po);
@@ -142,10 +142,10 @@
             count = this.sv.save(po);
         } catch (Exception e) {
             log.error("淇濆瓨RTU鍗囩骇浠诲姟寮傚父", e);
-            return BaseResponseUtils.buildException(e.getMessage()) ;
+            return BaseResponseUtils.buildErrorMsg(e.getMessage()) ;
         }
         if(count <= 0){
-            return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�") ;
+            return BaseResponseUtils.buildErrorMsg("鏁版嵁搴撳瓨鍌ㄥけ璐�") ;
         }else{
             return BaseResponseUtils.buildSuccess(true) ;
         }
@@ -168,20 +168,20 @@
      @SsoAop()
      public BaseResponse<Boolean> update(@Parameter(description = "form琛ㄥ崟鏁版嵁", required = true) @Valid UgRtuTask po, @Parameter(hidden = true) BindingResult bindingResult){
          if(bindingResult != null && bindingResult.hasErrors()){
-             return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+             return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
          }
          if(po.id == null){
-             return BaseResponseUtils.buildFail("鏃犳暟鎹疄浣揑D") ;
+             return BaseResponseUtils.buildErrorMsg("鏃犳暟鎹疄浣揑D") ;
          }
          int count;
          try {
              count = this.sv.update(po);
          } catch (Exception e) {
              log.error("淇濆瓨瀹炰綋鏁版嵁寮傚父", e);
-             return BaseResponseUtils.buildException(e.getMessage()) ;
+             return BaseResponseUtils.buildErrorMsg(e.getMessage()) ;
          }
          if(count <= 0){
-             return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�") ;
+             return BaseResponseUtils.buildErrorMsg("鏁版嵁搴撳瓨鍌ㄥけ璐�") ;
          }else{
              return BaseResponseUtils.buildSuccess(true) ;
          }
@@ -206,25 +206,25 @@
     @SsoAop()
     public BaseResponse<Boolean> execute(Long id){
         if(id == null){
-            return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖") ;
+            return BaseResponseUtils.buildErrorMsg("id涓嶈兘涓虹┖") ;
         }
         int count;
         try {
             count = this.sv.isOver(id) ;
             if(count > 0){
-                return BaseResponseUtils.buildError("浠诲姟宸茬粡缁撴潫锛屼笉鑳藉啀鎵ц") ;
+                return BaseResponseUtils.buildErrorMsg("浠诲姟宸茬粡缁撴潫锛屼笉鑳藉啀鎵ц") ;
             }
             count = this.sv.isExecute(id) ;
             if(count > 0){
-                return BaseResponseUtils.buildError("浠诲姟宸茬粡鎵ц锛屼笉鑳藉啀鎵ц") ;
+                return BaseResponseUtils.buildErrorMsg("浠诲姟宸茬粡鎵ц锛屼笉鑳藉啀鎵ц") ;
             }
             count = this.sv.execute(id);
         } catch (Exception e) {
-            log.error("缁撴潫RTU鍗囩骇浠诲姟寮傚父", e);
-            return BaseResponseUtils.buildException(e.getMessage()) ;
+            log.error("鎵цRTU鍗囩骇浠诲姟寮傚父", e);
+            return BaseResponseUtils.buildErrorMsg(e.getMessage()) ;
         }
         if(count <= 0){
-            return BaseResponseUtils.buildFail("鏁版嵁搴撴搷浣滃け璐�") ;
+            return BaseResponseUtils.buildErrorMsg("鏁版嵁搴撴搷浣滃け璐�") ;
         }else{
             return BaseResponseUtils.buildSuccess(true) ;
         }
@@ -248,20 +248,20 @@
     @SsoAop()
     public BaseResponse<Boolean> over(Long id){
         if(id == null){
-            return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖") ;
+            return BaseResponseUtils.buildErrorMsg("id涓嶈兘涓虹┖") ;
         }
         int count;
         try {count = this.sv.isOver(id) ;
             if(count > 0){
-                return BaseResponseUtils.buildError("浠诲姟宸茬粡缁撴潫锛屼笉鐢ㄥ啀缁撴潫") ;
+                return BaseResponseUtils.buildErrorMsg("浠诲姟宸茬粡缁撴潫锛屼笉鐢ㄥ啀缁撴潫") ;
             }
             count = this.sv.over(id);
         } catch (Exception e) {
             log.error("缁撴潫RTU鍗囩骇浠诲姟寮傚父", e);
-            return BaseResponseUtils.buildException(e.getMessage()) ;
+            return BaseResponseUtils.buildErrorMsg(e.getMessage()) ;
         }
         if(count <= 0){
-            return BaseResponseUtils.buildFail("鏁版嵁搴撴搷浣滃け璐�") ;
+            return BaseResponseUtils.buildErrorMsg("鏁版嵁搴撴搷浣滃け璐�") ;
         }else{
             return BaseResponseUtils.buildSuccess(true) ;
         }
@@ -285,17 +285,17 @@
     @SsoAop()
     public BaseResponse<Boolean> delete(Long id){
         if(id == null){
-            return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖") ;
+            return BaseResponseUtils.buildErrorMsg("id涓嶈兘涓虹┖") ;
         }
         int count;
         try {
             count = this.sv.delete(id);
         } catch (Exception e) {
             log.error("鍒犻櫎RTU鍗囩骇浠诲姟寮傚父", e);
-            return BaseResponseUtils.buildException(e.getMessage()) ;
+            return BaseResponseUtils.buildErrorMsg(e.getMessage()) ;
         }
         if(count <= 0){
-            return BaseResponseUtils.buildFail("鏁版嵁搴撴搷浣滃け璐�") ;
+            return BaseResponseUtils.buildErrorMsg("鏁版嵁搴撴搷浣滃け璐�") ;
         }else{
             return BaseResponseUtils.buildSuccess(true) ;
         }

--
Gitblit v1.8.0