From d5dab07dc674de7edbbc1bd6ade0486f54fbdb26 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 06 五月 2025 19:19:35 +0800
Subject: [PATCH] 1、实现万用token(0000-0000-1234-9876-5); 2、web端单独实现命令结果等待器,并修改相关部分; 3、web端实现透传命令; 4、修改一些不当注释; 5、优化一些代码。

---
 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/web/webRequest/WebRequestDeal.java |   64 ++++++++++++++++++++++++++++++++
 1 files changed, 64 insertions(+), 0 deletions(-)

diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/web/webRequest/WebRequestDeal.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/web/webRequest/WebRequestDeal.java
new file mode 100644
index 0000000..e07ad00
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/web/webRequest/WebRequestDeal.java
@@ -0,0 +1,64 @@
+package com.dy.rtuMw.web.webRequest;
+
+import com.dy.common.contant.Constant;
+import com.dy.common.mw.protocol.Command;
+import com.dy.common.webUtil.BaseResponse;
+import com.dy.rtuMw.server.ServerProperties;
+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;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestTemplate;
+import org.springframework.web.util.UriComponentsBuilder;
+
+import java.nio.charset.StandardCharsets;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2024/11/11 16:29
+ * @Description 閫氫俊涓棿浠跺澶栧彂鍑虹殑web璇锋眰
+ */
+@Component()
+public class WebRequestDeal {
+
+    private static final Logger log = LogManager.getLogger(WebRequestDeal.class.getName());
+
+    private RestTemplate restTemplate;
+
+    @Autowired
+    public void setRestTemplate(RestTemplate restTemplate){
+        this.restTemplate = restTemplate ;
+    }
+
+    /**
+     * 澶勭悊涓棿浠朵富鍔ㄥ彂璧风殑web璇锋眰
+     * @param webUrl
+     * @param obj
+     */
+    public void deal(String webUrl, Object obj) {
+        if (webUrl != null
+                && !webUrl.trim().equals("")
+                && !webUrl.trim().equals(Command.ignoreRtuResultSendWebUrl)) {
+            String url = UriComponentsBuilder.fromUriString(webUrl)
+                    .build()
+                    .toUriString();
+            restTemplate.getMessageConverters().set(1,new StringHttpMessageConverter(StandardCharsets.UTF_8));
+            HttpHeaders headers = new HttpHeaders();
+            headers.setContentType(MediaType.parseMediaType("application/json;charset=UTF-8"));
+            headers.set(Constant.UserTokenKeyInHeader, ServerProperties.orgTag);
+            HttpEntity<?> httpEntity = new HttpEntity<>(obj, headers);
+            ResponseEntity<BaseResponse> response = null;
+            try {
+                // 閫氳繃Post鏂瑰紡璋冪敤鎺ュ彛
+                response = restTemplate.exchange(url, HttpMethod.POST, httpEntity, BaseResponse.class);
+            } catch (Exception e) {
+                log.error("web璁块棶璇锋眰鍙戠敓寮傚父", e);
+            }
+            //assert response != null;
+        } else {
+            log.error("涓ラ噸閿欒锛寃eb璁块棶鐨刄RL涓虹┖");
+        }
+    }
+}

--
Gitblit v1.8.0