From ea58523b67ad59002a1191c3c564258c5b81f6f2 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 06 五月 2025 17:35:16 +0800
Subject: [PATCH] Revert "1、实现万用token（0000-0000-1234-9876-5）； 2、web端单独实现命令结果等待器，并修改相关部分； 3、web端实现透传命令； 4、修改一些不当注释； 5、优化一些代码。"
---
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuControllerCtrl.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
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 c743bd7..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
@@ -11,7 +11,7 @@
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.common.webUtil.ResultCodeMsg;
-import com.dy.pipIrrGlobal.pojoRm.UgRtuTask;
+import com.dy.pipIrrGlobal.pojoUg.UgRtuTask;
import com.dy.pipIrrGlobal.voPr.VoController;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
@@ -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) ;
}
--
Gitblit v1.8.0