From 7d6231e5b07a59c37ed45e4d8acc66a63e647578 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 23 十一月 2024 11:44:10 +0800
Subject: [PATCH] 改一下

---
 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/program/UgRtuProgramCtrl.java    |   30 +++++++-------
 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeCtrl.java          |   18 ++++----
 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuResultCtrl.java        |    2 
 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuTaskCtrl.java          |   42 ++++++++++----------
 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuAddControllerCtrl.java |    8 ++--
 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuControllerCtrl.java    |   14 +++---
 6 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/program/UgRtuProgramCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/program/UgRtuProgramCtrl.java
index 21098a9..9cadf12 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/program/UgRtuProgramCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/program/UgRtuProgramCtrl.java
@@ -75,7 +75,7 @@
             }
             return BaseResponseUtils.buildSuccess(po);
         }else{
-            return BaseResponseUtils.buildException("鏈煡璇㈠埌瀵瑰簲鐨勮褰�") ;
+            return BaseResponseUtils.buildErrorMsg("鏈煡璇㈠埌瀵瑰簲鐨勮褰�") ;
         }
     }
     /**
@@ -99,7 +99,7 @@
             return BaseResponseUtils.buildSuccess(res);
         } catch (Exception e) {
             log.error("鏌ヨRTU鍗囩骇绋嬪簭寮傚父", e);
-            return BaseResponseUtils.buildException(e.getMessage()) ;
+            return BaseResponseUtils.buildErrorMsg(e.getMessage()) ;
         }
     }
 
@@ -124,7 +124,7 @@
             return BaseResponseUtils.buildSuccess(res);
         } catch (Exception e) {
             log.error("鏌ヨRTU鍗囩骇绋嬪簭寮傚父", e);
-            return BaseResponseUtils.buildException(e.getMessage()) ;
+            return BaseResponseUtils.buildErrorMsg(e.getMessage()) ;
         }
     }
 
@@ -146,26 +146,26 @@
     @SsoAop()
     public BaseResponse<Boolean> save(@Parameter(description = "form琛ㄥ崟鏁版嵁", required = true) @Valid VoRtuProgram 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());
         }
         if(vo.storeRamAddr == null
                 || vo.storeRamAddr.trim().equals("")
                 || vo.storeRamAddr.length() != 8
                 || !HexUtil.isHexNumber(vo.storeRamAddr)){
-            return BaseResponseUtils.buildFail("鍗囩骇绋嬪簭瀛樻斁鍦板潃(4瀛楄妭锛�8浣嶅崄鍏繘鍒舵暟)涓嶆纭�") ;
+            return BaseResponseUtils.buildErrorMsg("鍗囩骇绋嬪簭瀛樻斁鍦板潃(4瀛楄妭锛�8浣嶅崄鍏繘鍒舵暟)涓嶆纭�") ;
         }
         if(vo.startRamAddr == null
                 || vo.startRamAddr.trim().equals("")
                 || vo.startRamAddr.length() != 8
                 || !HexUtil.isHexNumber(vo.startRamAddr)){
-            return BaseResponseUtils.buildFail("绋嬪簭瑕嗙洊璧峰鍦板潃(4瀛楄妭锛�8浣嶅崄鍏繘鍒舵暟)涓嶆纭�") ;
+            return BaseResponseUtils.buildErrorMsg("绋嬪簭瑕嗙洊璧峰鍦板潃(4瀛楄妭锛�8浣嶅崄鍏繘鍒舵暟)涓嶆纭�") ;
         }
         if(vo.file == null){
-            return BaseResponseUtils.buildFail("RTU绋嬪簭鏂囦欢蹇呴』涓婁紶") ;
+            return BaseResponseUtils.buildErrorMsg("RTU绋嬪簭鏂囦欢蹇呴』涓婁紶") ;
         }
         String fileName = vo.file.getOriginalFilename() ;
         if(this.sv.existFileName(fileName)){
-            return BaseResponseUtils.buildFail("RTU绋嬪簭鏂囦欢鍚嶅凡瀛樺湪") ;
+            return BaseResponseUtils.buildErrorMsg("RTU绋嬪簭鏂囦欢鍚嶅凡瀛樺湪") ;
         }
 
         HexFileVo fileVo = null ;
@@ -178,7 +178,7 @@
             }
         }catch (Exception e){
             fileVo = null ;
-            return BaseResponseUtils.buildFail("瑙ｆ瀽RTU绋嬪簭鏂囦欢寮傚父锛�" + e.getMessage()) ;
+            return BaseResponseUtils.buildErrorMsg("瑙ｆ瀽RTU绋嬪簭鏂囦欢寮傚父锛�" + e.getMessage()) ;
         }
         if(fileVo != null){
             UgRtuProgram po = new UgRtuProgram();
@@ -197,15 +197,15 @@
                 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) ;
             }
         }else{
-            return BaseResponseUtils.buildFail("瑙ｆ瀽RTU绋嬪簭鏂囦欢寮傚父") ;
+            return BaseResponseUtils.buildErrorMsg("瑙ｆ瀽RTU绋嬪簭鏂囦欢寮傚父") ;
         }
     }
     /**
@@ -245,17 +245,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) ;
         }
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuAddControllerCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuAddControllerCtrl.java
index 1c3a5cf..be016ea 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuAddControllerCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuAddControllerCtrl.java
@@ -65,7 +65,7 @@
             return BaseResponseUtils.buildSuccess(res);
         } catch (Exception e) {
             log.error("鏌ヨRTU鍗囩骇浠诲姟寮傚父", e);
-            return BaseResponseUtils.buildException(e.getMessage()) ;
+            return BaseResponseUtils.buildErrorMsg(e.getMessage()) ;
         }
     }
 
@@ -129,7 +129,7 @@
             return BaseResponseUtils.buildSuccess(res);
         } catch (Exception e) {
             log.error("鏌ヨRTU鍗囩骇浠诲姟寮傚父", e);
-            return BaseResponseUtils.buildException(e.getMessage()) ;
+            return BaseResponseUtils.buildErrorMsg(e.getMessage()) ;
         }
     }
 
@@ -165,14 +165,14 @@
                 ugRtuController.setRtuAddr(rtuAddr) ;
                 int count = this.addedSv.save(ugRtuController);
                 if(count <= 0){
-                    return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�") ;
+                    return BaseResponseUtils.buildErrorMsg("鏁版嵁搴撳瓨鍌ㄥけ璐�") ;
                 }else{
                     return BaseResponseUtils.buildSuccess(true) ;
                 }
             }
         } catch (Exception e) {
             log.error("鏌ヨRTU鍗囩骇浠诲姟寮傚父", e);
-            return BaseResponseUtils.buildException(e.getMessage()) ;
+            return BaseResponseUtils.buildErrorMsg(e.getMessage()) ;
         }
     }
 }
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuControllerCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuControllerCtrl.java
index a084132..1b13aef 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuControllerCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuControllerCtrl.java
@@ -70,7 +70,7 @@
             return BaseResponseUtils.buildSuccess(res);
         } catch (Exception e) {
             log.error("鏌ヨRTU鍗囩骇浠诲姟寮傚父", e);
-            return BaseResponseUtils.buildException(e.getMessage()) ;
+            return BaseResponseUtils.buildErrorMsg(e.getMessage()) ;
         }
     }
 
@@ -92,17 +92,17 @@
     @SsoAop()
     public BaseResponse<Boolean> deleteAll(Long taskId){
         if(taskId == null){
-            return BaseResponseUtils.buildFail("浠诲姟id涓嶈兘涓虹┖") ;
+            return BaseResponseUtils.buildErrorMsg("浠诲姟id涓嶈兘涓虹┖") ;
         }
         int count;
         try {
             count = this.sv.deleteAll(taskId);
         } 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) ;
         }
@@ -127,17 +127,17 @@
     @SsoAop()
     public BaseResponse<Boolean> deleteOne(Long id){
         if(id == null){
-            return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖") ;
+            return BaseResponseUtils.buildErrorMsg("id涓嶈兘涓虹┖") ;
         }
         int count;
         try {
             count = this.sv.deleteOne(id);
         } 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) ;
         }
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuResultCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuResultCtrl.java
index 3a99797..a69188f 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuResultCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuResultCtrl.java
@@ -64,7 +64,7 @@
             return BaseResponseUtils.buildSuccess(res);
         } catch (Exception e) {
             log.error("鏌ヨRTU鍗囩骇浠诲姟寮傚父", e);
-            return BaseResponseUtils.buildException(e.getMessage());
+            return BaseResponseUtils.buildErrorMsg(e.getMessage());
         }
     }
 }
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 759e430..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()) ;
+            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) ;
         }
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeCtrl.java
index 7b0eb80..d5929d6 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeCtrl.java
@@ -79,28 +79,28 @@
     @SsoAop()
     public BaseResponse<Boolean> issuedTask(String id){
         if(id == null || id.trim().equals("")){
-            return BaseResponseUtils.buildError("浠诲姟id涓嶈兘涓虹┖") ;
+            return BaseResponseUtils.buildErrorMsg("浠诲姟id涓嶈兘涓虹┖") ;
         }
         UgRtuTask tpo = this.sv.selectTaskById(id) ;
         if(tpo == null){
-            return BaseResponseUtils.buildError("浠诲姟涓嶅瓨鍦�") ;
+            return BaseResponseUtils.buildErrorMsg("浠诲姟涓嶅瓨鍦�") ;
         }
         if(tpo.isExecute == 1){
-            return BaseResponseUtils.buildError("浠诲姟宸蹭笅鍙戯紝涓嶈兘閲嶅涓嬪彂浠诲姟") ;
+            return BaseResponseUtils.buildErrorMsg("浠诲姟宸蹭笅鍙戯紝涓嶈兘閲嶅涓嬪彂浠诲姟") ;
         }
         UgRtuProgram ppo = this.sv.selectProgramById(tpo.programId) ;
         if(ppo == null){
-            return BaseResponseUtils.buildError("浠诲姟瀵瑰簲鐨勭▼搴忎笉瀛樺湪") ;
+            return BaseResponseUtils.buildErrorMsg("浠诲姟瀵瑰簲鐨勭▼搴忎笉瀛樺湪") ;
         }
 
         List<String> taskRtuAddrs = this.sv.selectAllRtuAddrByTask(id) ;
         if(taskRtuAddrs == null || taskRtuAddrs.size() == 0){
-            return BaseResponseUtils.buildError("浠诲姟鎵�娑夊強鐨勬帶鍒跺櫒杩樻湭璁剧疆") ;
+            return BaseResponseUtils.buildErrorMsg("浠诲姟鎵�娑夊強鐨勬帶鍒跺櫒杩樻湭璁剧疆") ;
         }
 
         String ugCallbackUrl_rm = env.getProperty("mw.ugCallbackUrl_rm" );
         if(ugCallbackUrl_rm == null || ugCallbackUrl_rm.trim().equals("")){
-            return BaseResponseUtils.buildError("鏈厤缃崌绾т换鍔″洖璋冪綉鍧�") ;
+            return BaseResponseUtils.buildErrorMsg("鏈厤缃崌绾т换鍔″洖璋冪綉鍧�") ;
         }
 
         UpgradeTaskVo vo = new UpgradeTaskVo() ;
@@ -120,11 +120,11 @@
                     msg = res.getMsg() ;
                 }
                 log.error("閫氫俊涓棿浠舵墽琛屼笅鍙戝崌绾т换鍔″け璐�" + msg) ;
-                return BaseResponseUtils.buildFail("閫氫俊涓棿浠舵墽琛屽け璐�" + msg) ;
+                return BaseResponseUtils.buildErrorMsg("閫氫俊涓棿浠舵墽琛屽け璐�" + msg) ;
             }
         }else{
             log.error("閫氫俊涓棿浠惰繑鍥炵粨鏋滀负null") ;
-            return BaseResponseUtils.buildFail("閫氫俊涓棿浠惰繑鍥炵粨鏋滀负null") ;
+            return BaseResponseUtils.buildErrorMsg("閫氫俊涓棿浠惰繑鍥炵粨鏋滀负null") ;
         }
     }
 
@@ -180,7 +180,7 @@
             qvo.pageSize = 49 ;
         }
         if(RtuUpgradeStateReceiverCtrl.cache == null){
-            return BaseResponseUtils.buildError("褰撳墠娌℃湁鍗囩骇浠诲姟") ;
+            return BaseResponseUtils.buildErrorMsg("褰撳墠娌℃湁鍗囩骇浠诲姟") ;
             //姝ｅ紡杩愯鏃讹紝涓嬮潰涓よ鍘绘帀锛屼笂闈竴琛屾墦寮�
             //RtuUpgradeStateReceiverCtrl ctrl = SpringContextUtil.getBean(RtuUpgradeStateReceiverCtrl.class);
             //ctrl.demo();

--
Gitblit v1.8.0