From e8937f27fce194d015ce6c27d286e7fc89f5e580 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 23 四月 2025 17:29:47 +0800
Subject: [PATCH] 查询开关阀记录相关修改
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeCtrl.java | 43 +++++++++++++++++++++++++------------------
1 files changed, 25 insertions(+), 18 deletions(-)
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 96d08ce..8bba068 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
@@ -12,7 +12,8 @@
import com.dy.pipIrrGlobal.pojoUg.UgRtuProgram;
import com.dy.pipIrrGlobal.pojoUg.UgRtuTask;
import com.dy.pipIrrGlobal.rtuMw.Web2RtuMw;
-import com.dy.pipIrrGlobal.voUg.VoUgRtuResult;
+import com.dy.pipIrrGlobal.voUg.VoUgRtuResult4Failure;
+import com.dy.pipIrrGlobal.voUg.VoUgRtuResult4Success;
import com.dy.pipIrrGlobal.voUg.VoWatch;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
@@ -50,7 +51,7 @@
private RtuUpgradeSv sv ;
@Autowired
- RtuUpgradeResSv resSv ;
+ private RtuUpgradeResSv resSv ;
@Autowired
private Environment env;
@@ -106,7 +107,7 @@
vo.callbackWebUrl = ugCallbackUrl_rm ;
String rqUrl = this.get2MwRequestUrl(this.env, ContextUgTaskSend) ;
- BaseResponse res = sendRequest2Mw(restTemplate, rqUrl, vo) ;
+ BaseResponse res = sendPostRequest2Mw(restTemplate, rqUrl, vo) ;
if(res != null){
if(res.isSuccess()){
this.sv.setUpgradeTaskExecuted(id);
@@ -116,8 +117,8 @@
if(msg == null){
msg = res.getMsg() ;
}
- log.error("閫氫俊涓棿浠舵墽琛屼笅鍙戝崌绾т换鍔″け璐�" + msg) ;
- return BaseResponseUtils.buildErrorMsg("閫氫俊涓棿浠舵墽琛屽け璐�" + msg) ;
+ log.error("閫氫俊涓棿浠舵墽琛屼笅鍙戝崌绾т换鍔″け璐ワ紝" + msg) ;
+ return BaseResponseUtils.buildErrorMsg("閫氫俊涓棿浠舵墽琛屽け璐ワ紝" + msg) ;
}
}else{
log.error("閫氫俊涓棿浠惰繑鍥炵粨鏋滀负null") ;
@@ -125,10 +126,10 @@
}
}
/**
- * 涓嬪彂寮哄埗鍋滄褰撳墠rtu杩滅▼鍗囩骇浠诲姟
+ * 涓嬪彂寮哄埗缁撴潫褰撳墠rtu杩滅▼鍗囩骇浠诲姟
* @return 鎿嶄綔缁撴灉
*/
- @Operation(summary = "涓嬪彂寮哄埗鍋滄褰撳墠rtu杩滅▼鍗囩骇浠诲姟", description = "涓嬪彂寮哄埗鍋滄褰撳墠rtu杩滅▼鍗囩骇浠诲姟")
+ @Operation(summary = "涓嬪彂寮哄埗缁撴潫褰撳墠rtu杩滅▼鍗囩骇浠诲姟", description = "涓嬪彂寮哄埗缁撴潫褰撳墠rtu杩滅▼鍗囩骇浠诲姟")
@ApiResponses(value = {
@ApiResponse(
responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
@@ -137,27 +138,33 @@
schema = @Schema(implementation = String.class))}
)
})
- @GetMapping(path = "/forceStop")
+ @GetMapping(path = "/forceOver")
@SsoAop()
- public BaseResponse<String> forceStop() {
- String rqUrl = this.get2MwRequestUrl(this.env, ContextUgForceStop) ;
- BaseResponse res = sendRequest2Mw(restTemplate, rqUrl, null) ;
+ public BaseResponse<String> forceOver() {
+ String rqUrl = this.get2MwRequestUrl(this.env, ContextUgForceOver) ;
+ BaseResponse res = sendGetRequest2Mw(restTemplate, rqUrl) ;
if(res != null){
if(res.isSuccess()){
- return BaseResponseUtils.buildSuccess(true) ;
+ RtuUpgradeStateReceiverCtrl.afterMwForceOverCurUgTask();
+ String msg = res.getContent()==null?null:(String)res.getContent() ;
+ if(msg == null){
+ msg = res.getMsg() ;
+ }
+ return BaseResponseUtils.buildResult(ResultCodeMsg.RsCode.SUCCESS_CODE, msg, msg) ;
}else{
String msg = res.getContent()==null?null:(String)res.getContent() ;
if(msg == null){
msg = res.getMsg() ;
}
- log.error("閫氫俊涓棿浠舵墽琛屼笅鍙戝己鍒跺仠姝㈠綋鍓峳tu杩滅▼鍗囩骇浠诲姟澶辫触锛�" + msg) ;
- return BaseResponseUtils.buildErrorMsg("閫氫俊涓棿浠舵墽琛屽己鍒跺仠姝㈠綋鍓峳tu杩滅▼鍗囩骇浠诲姟澶辫触锛�" + msg) ;
+ log.error("閫氫俊涓棿浠舵墽琛屼笅鍙戝己鍒剁粨鏉熷綋鍓峳tu杩滅▼鍗囩骇浠诲姟澶辫触锛�" + msg) ;
+ return BaseResponseUtils.buildErrorMsg("閫氫俊涓棿浠舵墽琛屽己鍒剁粨鏉熷綋鍓峳tu杩滅▼鍗囩骇浠诲姟澶辫触锛�" + msg) ;
}
}else{
log.error("閫氫俊涓棿浠惰繑鍥炵粨鏋滀负null") ;
return BaseResponseUtils.buildErrorMsg("閫氫俊涓棿浠惰繑鍥炵粨鏋滀负null") ;
}
}
+
private void valueFromPo(UpgradeTaskVo vo, UgRtuTask tpo, UgRtuProgram ppo){
vo.id = "" + tpo.id ;
@@ -227,9 +234,9 @@
@RequestMapping(value = "/exportUgFail", method = RequestMethod.GET)
public void exportUgFail(HttpServletResponse response) throws Exception {
setExcelRespProp(response, "鍗囩骇澶辫触RTU鍒楄〃");
- List<VoUgRtuResult> rsList = resSv.exportUgFail();
+ List<VoUgRtuResult4Failure> rsList = resSv.exportUgFail();
EasyExcel.write(response.getOutputStream())
- .head(VoUgRtuResult.class)
+ .head(VoUgRtuResult4Failure.class)
.excelType(ExcelTypeEnum.XLSX)
.sheet("鍗囩骇澶辫触RTU鍒楄〃")
.doWrite(rsList);
@@ -243,9 +250,9 @@
@RequestMapping(value = "/exportUgSuccess", method = RequestMethod.GET)
public void exportUgSuccess(HttpServletResponse response) throws Exception {
setExcelRespProp(response, "鍗囩骇鎴愬姛RTU鍒楄〃");
- List<VoUgRtuResult> rsList = resSv.exportUgSuccess();
+ List<VoUgRtuResult4Success> rsList = resSv.exportUgSuccess();
EasyExcel.write(response.getOutputStream())
- .head(VoUgRtuResult.class)
+ .head(VoUgRtuResult4Success.class)
.excelType(ExcelTypeEnum.XLSX)
.sheet("鍗囩骇鎴愬姛RTU鍒楄〃")
.doWrite(rsList);
--
Gitblit v1.8.0