From 7b38f4ec223e9480c4de2824782fe3695a25d848 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 06 十二月 2024 11:19:16 +0800
Subject: [PATCH] 修改升级过程逻辑，RTU上报数据后触发升级过程中，首先判断是否因为阀门是开启状态而不能升级
---
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuControllerCtrl.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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 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) ;
}
--
Gitblit v1.8.0