From ae484ed8146f91cf448bbbcbd46d5ea75d6e3c7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=B7=E6=88=90=E4=BC=9F?= Date: Tue, 22 Oct 2024 13:10:22 +0800 Subject: [PATCH] =?UTF-8?q?websocket=E5=B9=B6=E5=8F=91=E5=8F=91=E9=80=81?= =?UTF-8?q?=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../node/controller/SysNodeController.java | 9 ++----- .../node/handler/NodeMessageHandler.java | 26 ++++--------------- .../das/modules/node/service/DataService.java | 2 +- .../node/service/impl/DataServiceImpl.java | 5 ++-- 4 files changed, 11 insertions(+), 31 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 7bbc6987..f6568784 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 @@ -14,15 +14,10 @@ import com.fasterxml.jackson.databind.JsonNode; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpHeaders; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import java.io.IOException; -import java.io.OutputStream; -import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; @@ -91,8 +86,8 @@ public class SysNodeController { /** 配置下发 */ @PostMapping("/configUpdate") public R configUpdate() { - JsonNode configUpdateData = dataService.getConfigUpdateInfo(Long.valueOf(1)); - return R.success(configUpdateData); + dataService.sendTerminalConfig(Long.valueOf(1)); + return R.success(); } diff --git a/das/src/main/java/com/das/modules/node/handler/NodeMessageHandler.java b/das/src/main/java/com/das/modules/node/handler/NodeMessageHandler.java index 2449928e..686b5610 100644 --- a/das/src/main/java/com/das/modules/node/handler/NodeMessageHandler.java +++ b/das/src/main/java/com/das/modules/node/handler/NodeMessageHandler.java @@ -1,8 +1,5 @@ package com.das.modules.node.handler; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.thread.ThreadUtil; -import cn.hutool.core.util.StrUtil; import com.das.common.utils.JsonUtils; import com.das.common.utils.SpringUtil; import com.das.modules.node.constant.NodeConstant; @@ -10,8 +7,6 @@ import com.das.modules.node.domain.bo.TerminalMessage; import com.das.modules.node.service.DataService; import com.fasterxml.jackson.databind.JsonNode; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.BeanFactoryUtils; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import org.springframework.web.socket.*; @@ -47,16 +42,18 @@ public class NodeMessageHandler extends TextWebSocketHandler { onlineSessions.put(nodeId, new ConcurrentWebSocketSessionDecorator(session, 5 * 1000, 2 * 1024 * 1024)); } + // 如果version是0，则需要调用一次configUpdate配置更新 + if (version == 0){ + dataService.sendTerminalConfig(Long.valueOf(nodeId)); + } + } @Override protected void handleTextMessage(WebSocketSession session, TextMessage message) throws Exception { TerminalMessage msg = JsonUtils.parseObject(message.getPayload(), TerminalMessage.class); String nodeId = session.getAttributes().get(NodeConstant.NODE_ID).toString(); - Long version = (Long)session.getAttributes().get(NodeConstant.VERSION); - String cmdId = msg.getCmdId(); String cmd = msg.getCmd(); - long time = msg.getTime(); JsonNode data = msg.getData(); log.info("收到 Node:{} 命令: {}", nodeId, cmd); log.debug("内容： {}", data.toString()); @@ -66,20 +63,7 @@ public class NodeMessageHandler extends TextWebSocketHandler { if (dataService != null){ dataService.pushMessage(msg); } - // 如果version是0，则需要调用一次configUpdate配置更新 - if (version == 0){ - JsonNode configUpdateData = dataService.getConfigUpdateInfo(Long.valueOf(nodeId)); - TerminalMessage configUpdate = TerminalMessage.builder() - .cmd("configUpdate") - .cmdId(nodeId) - .time(time) - .data(configUpdateData) - .build(); - ThreadUtil.execute(()->{ - sendActionMessage(Long.valueOf(nodeId), configUpdate); - }); - } } @Override diff --git a/das/src/main/java/com/das/modules/node/service/DataService.java b/das/src/main/java/com/das/modules/node/service/DataService.java index da2fedb6..ccddf197 100644 --- a/das/src/main/java/com/das/modules/node/service/DataService.java +++ b/das/src/main/java/com/das/modules/node/service/DataService.java @@ -7,7 +7,7 @@ public interface DataService { void pushMessage(TerminalMessage msg); - JsonNode getConfigUpdateInfo(Long nodeId); + JsonNode sendTerminalConfig(Long nodeId); void createTdStable(); void handleData(TerminalMessage data); diff --git a/das/src/main/java/com/das/modules/node/service/impl/DataServiceImpl.java b/das/src/main/java/com/das/modules/node/service/impl/DataServiceImpl.java index 5e57d30b..22eb2074 100644 --- a/das/src/main/java/com/das/modules/node/service/impl/DataServiceImpl.java +++ b/das/src/main/java/com/das/modules/node/service/impl/DataServiceImpl.java @@ -1,5 +1,6 @@ package com.das.modules.node.service.impl; +import cn.hutool.core.util.IdUtil; import com.das.common.constant.BaseIotModelType; import com.das.common.utils.AdminRedisTemplate; import com.das.modules.equipment.domain.vo.IotModelFieldVo; @@ -109,7 +110,7 @@ public class DataServiceImpl implements DataService { } @Override - public JsonNode getConfigUpdateInfo(Long nodeId) { + public JsonNode sendTerminalConfig(Long nodeId) { ConfigUpdateVo configUpdateVo = new ConfigUpdateVo(); List links = new ArrayList<>(); List equipments = new ArrayList<>(); @@ -203,7 +204,7 @@ public class DataServiceImpl implements DataService { TerminalMessage configUpdate = TerminalMessage.builder() .cmd("configUpdate") - .cmdId(String.valueOf(nodeId)) + .cmdId(IdUtil.nanoId()) .time(time) .data(jsonNode) .build();