From d79d2f12c82cac10ba28117a9ee49bc5fdc2842d Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 13 十一月 2024 16:05:28 +0800
Subject: [PATCH] 1、完善通信中间件远程升级任务模块； 2、web端实现升级任务发布执行功能； 3、web端实现升级任务执行监视功能； 4、web端添加模拟升级过程逻辑。
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/web/comResult/CommandResultDeal.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/web/comResult/CommandResultDeal.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/web/comResult/CommandResultDeal.java
index b867a3f..4049247 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/web/comResult/CommandResultDeal.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/web/comResult/CommandResultDeal.java
@@ -1,7 +1,9 @@
package com.dy.rtuMw.web.comResult;
+import com.dy.common.mw.protocol.Command;
import com.dy.common.mw.protocol.Data;
-import lombok.extern.slf4j.Slf4j;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.*;
import org.springframework.http.converter.StringHttpMessageConverter;
@@ -17,9 +19,10 @@
* @LastEditTime 2023/12/21 20:28
* @Description
*/
-@Slf4j
@Component()
public class CommandResultDeal {
+
+ private static final Logger log = LogManager.getLogger(CommandResultDeal.class.getName());
private RestTemplate restTemplate;
@@ -29,7 +32,9 @@
}
public void deal(Data data) {
- if (data.rtuResultSendWebUrl != null && !data.rtuResultSendWebUrl.trim().equals("")) {
+ if (data.rtuResultSendWebUrl != null
+ && !data.rtuResultSendWebUrl.trim().equals("")
+ && !data.rtuResultSendWebUrl.trim().equals(Command.ignoreRtuResultSendWebUrl)) {
String url = UriComponentsBuilder.fromUriString(data.rtuResultSendWebUrl)
.build()
.toUriString();
@@ -42,6 +47,7 @@
// 閫氳繃Post鏂瑰紡璋冪敤鎺ュ彛
response = restTemplate.exchange(url, HttpMethod.POST, httpEntity, WebResponseVo.class);
} catch (Exception e) {
+ log.error("鍛戒护缁撴灉鍥炶皟鍙戠敓寮傚父", e);
e.printStackTrace();
}
//assert response != null;
--
Gitblit v1.8.0