From 84d715c130d6556795caa43516f489af9061d3d2 Mon Sep 17 00:00:00 2001
From: huguanghan <ghhul@isoftstone.com>
Date: Tue, 7 Jan 2025 09:54:32 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=B8=8B=E5=8F=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/das/modules/node/controller/SysNodeController.java   | 4 +++-
 .../com/das/modules/node/service/NodeMessageService.java     | 2 +-
 .../modules/node/service/impl/NodeMessageServiceImpl.java    | 5 ++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/das/src/main/java/com/das/modules/node/controller/SysNodeController.java b/das/src/main/java/com/das/modules/node/controller/SysNodeController.java
index f2fa9e6c..1cef87e9 100644
--- a/das/src/main/java/com/das/modules/node/controller/SysNodeController.java
+++ b/das/src/main/java/com/das/modules/node/controller/SysNodeController.java
@@ -19,6 +19,8 @@ import org.springframework.web.multipart.MultipartFile;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeoutException;
 
 /**
  * 物模型Controller
@@ -84,7 +86,7 @@ public class SysNodeController {
 
     /** 配置下发 */
     @PostMapping("/configUpdate")
-    public R<?> configUpdate(@RequestBody SysNodeDto sysNodeDto) {
+    public R<?> configUpdate(@RequestBody SysNodeDto sysNodeDto) throws ExecutionException, InterruptedException, TimeoutException {
         nodeMessageService.sendTerminalConfig(sysNodeDto.getId());
         return R.success();
     }
diff --git a/das/src/main/java/com/das/modules/node/service/NodeMessageService.java b/das/src/main/java/com/das/modules/node/service/NodeMessageService.java
index 73c5e1f9..ba373be5 100644
--- a/das/src/main/java/com/das/modules/node/service/NodeMessageService.java
+++ b/das/src/main/java/com/das/modules/node/service/NodeMessageService.java
@@ -12,7 +12,7 @@ import java.util.concurrent.TimeoutException;
 public interface NodeMessageService {
 
 
-    JsonNode sendTerminalConfig(Long nodeId);
+    JsonNode sendTerminalConfig(Long nodeId) throws ExecutionException, InterruptedException, TimeoutException;
 
     /**
      * 向指定采集节点发送指令(无返回值)
diff --git a/das/src/main/java/com/das/modules/node/service/impl/NodeMessageServiceImpl.java b/das/src/main/java/com/das/modules/node/service/impl/NodeMessageServiceImpl.java
index fb7030dd..afa1131d 100644
--- a/das/src/main/java/com/das/modules/node/service/impl/NodeMessageServiceImpl.java
+++ b/das/src/main/java/com/das/modules/node/service/impl/NodeMessageServiceImpl.java
@@ -119,7 +119,7 @@ public class NodeMessageServiceImpl extends TextWebSocketHandler implements Node
     }
 
     @Override
-    public JsonNode sendTerminalConfig(Long nodeId) {
+    public JsonNode sendTerminalConfig(Long nodeId) throws ExecutionException, InterruptedException, TimeoutException {
         ConfigUpdateVo configUpdateVo = new ConfigUpdateVo();
         List<LinkVo> links = new ArrayList<>();
         try {
@@ -216,8 +216,7 @@ public class NodeMessageServiceImpl extends TextWebSocketHandler implements Node
                 .time(time)
                 .data(jsonNode)
                 .build();
-        sendActionMessage(nodeId, configUpdate);
-        System.out.println(jsonNode);
+        sendTerminalMessageWithResult(nodeId,configUpdate);
         return jsonNode;
 
     }