From 39baeee8fe6d86d8898082c3f3100a810be91eec Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 29 十一月 2024 15:45:24 +0800
Subject: [PATCH] 强制停止请求成功后，返回信息重构
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeCtrl.java | 233 ++++++++++++++++++++++++++++++----------------------------
1 files changed, 120 insertions(+), 113 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 3398f3a..bd975f9 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
@@ -1,8 +1,8 @@
package com.dy.pipIrrRemote.rtuUpgrage;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.support.ExcelTypeEnum;
import com.dy.common.aop.SsoAop;
-import com.dy.common.multiDataSource.DataSourceContext;
-import com.dy.common.softUpgrade.state.UpgradeRtu;
import com.dy.common.softUpgrade.state.UpgradeTaskVo;
import com.dy.common.springUtil.SpringContextUtil;
import com.dy.common.webUtil.BaseResponse;
@@ -11,7 +11,8 @@
import com.dy.common.webUtil.ResultCodeMsg;
import com.dy.pipIrrGlobal.pojoUg.UgRtuProgram;
import com.dy.pipIrrGlobal.pojoUg.UgRtuTask;
-import com.dy.pipIrrGlobal.rtuMw.ToRtuMwCom;
+import com.dy.pipIrrGlobal.rtuMw.Web2RtuMw;
+import com.dy.pipIrrGlobal.voUg.VoUgRtuResult;
import com.dy.pipIrrGlobal.voUg.VoWatch;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
@@ -19,16 +20,20 @@
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.responses.ApiResponses;
import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.env.Environment;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.client.RestTemplate;
-import java.util.ArrayList;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.Base64;
import java.util.List;
/**
@@ -40,9 +45,12 @@
@Tag(name = "rtu杩滅▼鍗囩骇浠诲姟", description = "rtu杩滅▼鍗囩骇浠诲姟鐩稿叧鎿嶄綔")
@RestController
@RequestMapping(path = "rtuUpgrade")
-public class RtuUpgradeCtrl extends ToRtuMwCom {
+public class RtuUpgradeCtrl extends Web2RtuMw {
@Autowired
private RtuUpgradeSv sv ;
+
+ @Autowired
+ RtuUpgradeResSv resSv ;
@Autowired
private Environment env;
@@ -67,29 +75,29 @@
@GetMapping(path = "/issuedTask")
@SsoAop()
public BaseResponse<Boolean> issuedTask(String id){
- if(id == null || !id.trim().equals("")){
- return BaseResponseUtils.buildError("浠诲姟id涓嶈兘涓虹┖") ;
+ if(id == null || id.trim().equals("")){
+ 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." + DataSourceContext.get() + ".ugCallbackUrl_rm" );
+ 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() ;
@@ -97,34 +105,79 @@
vo.rtuAddrList = taskRtuAddrs ;
vo.callbackWebUrl = ugCallbackUrl_rm ;
- String ugSendUrl = this.getToMwUgUrl(this.env) ;
- BaseResponse res = sendUpgradeTask2Mw(restTemplate, ugSendUrl, vo) ;
+ String rqUrl = this.get2MwRequestUrl(this.env, ContextUgTaskSend) ;
+ BaseResponse res = sendPostRequest2Mw(restTemplate, rqUrl, vo) ;
if(res != null){
if(res.isSuccess()){
this.sv.setUpgradeTaskExecuted(id);
return BaseResponseUtils.buildSuccess(true) ;
}else{
- log.error("閫氫俊涓棿浠舵墽琛屼笅鍙戝崌绾т换鍔″け璐�" + (res.getMsg() == null? "" : ("锛�" + res.getMsg()))) ;
- return BaseResponseUtils.buildFail("閫氫俊涓棿浠舵墽琛屽け璐�" + (res.getMsg() == null? "" : ("锛�" + res.getMsg()))) ;
+ String msg = res.getContent()==null?null:(String)res.getContent() ;
+ if(msg == null){
+ msg = res.getMsg() ;
+ }
+ log.error("閫氫俊涓棿浠舵墽琛屼笅鍙戝崌绾т换鍔″け璐ワ紝" + msg) ;
+ return BaseResponseUtils.buildErrorMsg("閫氫俊涓棿浠舵墽琛屽け璐ワ紝" + msg) ;
}
}else{
log.error("閫氫俊涓棿浠惰繑鍥炵粨鏋滀负null") ;
- return BaseResponseUtils.buildFail("閫氫俊涓棿浠惰繑鍥炵粨鏋滀负null") ;
+ return BaseResponseUtils.buildErrorMsg("閫氫俊涓棿浠惰繑鍥炵粨鏋滀负null") ;
}
}
+ /**
+ * 涓嬪彂寮哄埗缁撴潫褰撳墠rtu杩滅▼鍗囩骇浠诲姟
+ * @return 鎿嶄綔缁撴灉
+ */
+ @Operation(summary = "涓嬪彂寮哄埗缁撴潫褰撳墠rtu杩滅▼鍗囩骇浠诲姟", description = "涓嬪彂寮哄埗缁撴潫褰撳墠rtu杩滅▼鍗囩骇浠诲姟")
+ @ApiResponses(value = {
+ @ApiResponse(
+ responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+ description = "杩斿洖鎿嶄綔鎴愬姛涓庡惁鏁版嵁锛圔aseResponse.content:Boolean锛�",
+ content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+ schema = @Schema(implementation = String.class))}
+ )
+ })
+ @GetMapping(path = "/forceOver")
+ @SsoAop()
+ public BaseResponse<String> forceOver() {
+ String rqUrl = this.get2MwRequestUrl(this.env, ContextUgForceOver) ;
+ BaseResponse res = sendGetRequest2Mw(restTemplate, rqUrl) ;
+ if(res != null){
+ if(res.isSuccess()){
+ 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) ;
+ }
+ }else{
+ log.error("閫氫俊涓棿浠惰繑鍥炵粨鏋滀负null") ;
+ return BaseResponseUtils.buildErrorMsg("閫氫俊涓棿浠惰繑鍥炵粨鏋滀负null") ;
+ }
+ }
+
private void valueFromPo(UpgradeTaskVo vo, UgRtuTask tpo, UgRtuProgram ppo){
vo.id = "" + tpo.id ;
vo.softFileName = ppo.hexFileName ;
vo.softStoreAddr = ppo.storeRamAddr ;
vo.softStartAddr = ppo.startRamAddr ;
- vo.softFileData = ppo.programBytes ;
+ vo.softFileData64 = Base64.getEncoder().encodeToString(ppo.programBytes) ;
+ //vo.softFileData = ppo.programBytes ;
vo.softBytesCalculate = ppo.programCalculateBytes ;
vo.softByteSrc16 = ppo.programCrc16 ;
}
+
+
/**
- * 鐩戣锛�
- * 閲嶇疆锛屾紨绀虹殑閲嶇疆
+ * 閲嶇疆杩滅▼鍗囩骇婕旂ず绋嬪簭
* @return 鎿嶄綔缁撴灉
*/
@GetMapping(path = "/demoReset")
@@ -160,104 +213,58 @@
if(qvo == null){
qvo = new QueryVo();
qvo.pageCurr = 1 ;
- qvo.pageSize = 50 ;
+ qvo.pageSize = 49 ;
}
if(RtuUpgradeStateReceiverCtrl.cache == null){
- //return BaseResponseUtils.buildError("褰撳墠娌℃湁鍗囩骇浠诲姟") ;
+ return BaseResponseUtils.buildErrorMsg("褰撳墠娌℃湁鍗囩骇浠诲姟") ;
//姝ｅ紡杩愯鏃讹紝涓嬮潰涓よ鍘绘帀锛屼笂闈竴琛屾墦寮�
- RtuUpgradeStateReceiverCtrl ctrl = SpringContextUtil.getBean(RtuUpgradeStateReceiverCtrl.class);
- ctrl.demo();
+ //RtuUpgradeStateReceiverCtrl ctrl = SpringContextUtil.getBean(RtuUpgradeStateReceiverCtrl.class);
+ //ctrl.demo();
}
-
- QueryResultVo<VoWatch> rsVo = new QueryResultVo();
- VoWatch vo = new VoWatch() ;
- List<UpgradeRtu> listFiltered = null ;
- if(RtuUpgradeStateReceiverCtrl.cache != null && RtuUpgradeStateReceiverCtrl.cache.ugTaskId != null){
- vo.upgrade = this.sv.selectTaskDetail(RtuUpgradeStateReceiverCtrl.cache.ugTaskId);
- vo.overall = RtuUpgradeStateReceiverCtrl.cache.ugOverallState ;
- vo.rtus = new ArrayList<>() ;
- if(RtuUpgradeStateReceiverCtrl.cache.ugRtuStateList != null && RtuUpgradeStateReceiverCtrl.cache.ugRtuStateList.size() > 0) {
- listFiltered = filterByQuery(qvo) ;
- if (listFiltered.size() > 0) {
- if(qvo.pageCurr < 1){
- qvo.pageCurr = 1 ;
- }
- int start = (qvo.pageCurr - 1) * qvo.pageSize ;
- if(start >= listFiltered.size()){
- if(listFiltered.size()%qvo.pageSize > 0){
- start = listFiltered.size() - listFiltered.size()%qvo.pageSize ;
- }else{
- start = listFiltered.size() - qvo.pageSize ;
- }
- }
- for(int i = start; i < (start + qvo.pageSize) && i < listFiltered.size(); i++){
- UpgradeRtu ugRtu = listFiltered.get(i) ;
- VoWatch.VoWatchRtu rtu = new VoWatch.VoWatchRtu() ;
- rtu.fromCache(ugRtu) ;
- vo.rtus.add(rtu) ;
- }
- }
- }
- }
-
- rsVo.obj = vo ;
- rsVo.pageSize = qvo.pageSize ;
- rsVo.pageCurr = qvo.pageCurr ;
- rsVo.calculateAndSet(0L + (listFiltered==null?0:listFiltered.size()), null);
+ QueryResultVo<VoWatch> rsVo = this.resSv.curUpgradeState(qvo) ;
return BaseResponseUtils.buildSuccess(rsVo) ;
}
- private List<UpgradeRtu> filterByQuery(QueryVo qvo){
- if (qvo.status != null || qvo.result != null) {
- final Integer qvoStatus = qvo.status ;
- final Integer qvoResult = qvo.result ;
- final String qvoRtuAddr = qvo.rtuAddr ;
- return RtuUpgradeStateReceiverCtrl.cache.ugRtuStateList.stream().filter(rtu -> {
- boolean ok = false;
- if (qvoStatus != null) {
- if (qvoStatus.intValue() == 1) {
- if (rtu.state == UpgradeRtu.STATE_RUNNING) {
- ok = true;
- }else{
- ok = false ;
- }
- } else if (qvoStatus.intValue() == 0) {
- if (rtu.isOver) {
- ok = true;
- }else{
- ok = false ;
- }
- }
- }
- if (qvoResult != null) {
- if (qvoResult.intValue() == 1) {
- if (rtu.state == UpgradeRtu.STATE_SUCCESS) {
- ok = true;
- }else{
- ok = false ;
- }
- } else if (qvoResult.intValue() == 0) {
- if (rtu.state == UpgradeRtu.STATE_OFFLINE
- || rtu.state == UpgradeRtu.STATE_FAILONE
- || rtu.state == UpgradeRtu.STATE_FAIL
- || rtu.state == UpgradeRtu.STATE_FAILOFFLINE) {
- ok = true;
- }else{
- ok = false ;
- }
- }
- }
- if(qvoRtuAddr != null && !qvoRtuAddr.trim().equals("")){
- if(rtu.rtuAddr.equals(qvoRtuAddr)){
- ok = true;
- }else{
- ok = false ;
- }
- }
- return ok;
- }).toList() ;
- }else{
- return RtuUpgradeStateReceiverCtrl.cache.ugRtuStateList ;
- }
+ /**
+ * 瀵煎嚭鍗囩骇澶辫触RTU鍒楄〃
+ * @param response
+ */
+ @RequestMapping(value = "/exportUgFail", method = RequestMethod.GET)
+ public void exportUgFail(HttpServletResponse response) throws Exception {
+ setExcelRespProp(response, "鍗囩骇澶辫触RTU鍒楄〃");
+ List<VoUgRtuResult> rsList = resSv.exportUgFail();
+ EasyExcel.write(response.getOutputStream())
+ .head(VoUgRtuResult.class)
+ .excelType(ExcelTypeEnum.XLSX)
+ .sheet("鍗囩骇澶辫触RTU鍒楄〃")
+ .doWrite(rsList);
}
+
+
+ /**
+ * 瀵煎嚭闀跨骇鎴愬姛RTU鍒楄〃
+ * @param response
+ */
+ @RequestMapping(value = "/exportUgSuccess", method = RequestMethod.GET)
+ public void exportUgSuccess(HttpServletResponse response) throws Exception {
+ setExcelRespProp(response, "鍗囩骇鎴愬姛RTU鍒楄〃");
+ List<VoUgRtuResult> rsList = resSv.exportUgSuccess();
+ EasyExcel.write(response.getOutputStream())
+ .head(VoUgRtuResult.class)
+ .excelType(ExcelTypeEnum.XLSX)
+ .sheet("鍗囩骇鎴愬姛RTU鍒楄〃")
+ .doWrite(rsList);
+ }
+
+
+ /**
+ * 璁剧疆excel涓嬭浇鍝嶅簲澶村睘鎬�
+ */
+ private void setExcelRespProp(HttpServletResponse response, String rawFileName) throws UnsupportedEncodingException {
+ response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+ response.setCharacterEncoding("utf-8");
+ String fileName = URLEncoder.encode(rawFileName, "UTF-8").replaceAll("\\+", "%20");
+ response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
+ }
+
}
--
Gitblit v1.8.0