From 712e5e9038981588de2320371d87b6cffd27310f Mon Sep 17 00:00:00 2001
From: tangzh <tangzh@3721zh.com>
Date: Sun, 13 Jul 2025 10:34:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zhengjie/modules/system/service/WebSocketService.java | 3 ++-
 .../modules/system/service/impl/BusDeviceServiceImpl.java | 8 +++++---
 .../system/service/impl/WebSocketSdcpServiceImpl.java     | 4 ++++
 .../system/service/impl/WebSocketVueServiceImpl.java      | 2 --
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/WebSocketService.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/WebSocketService.java
index 8fd95f8..ebfbeb5 100644
--- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/WebSocketService.java
+++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/WebSocketService.java
@@ -4,6 +4,7 @@ import me.zhengjie.config.properties.FileProperties;
 import me.zhengjie.modules.system.domain.dto.ImageDataVo;
 import me.zhengjie.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
@@ -16,7 +17,7 @@ public class WebSocketService {
 
     public static BusDeviceService myDeviceService;
     public static FileProperties myFileProperties;
-    @Autowired private BusDeviceService deviceService;
+    @Autowired @Lazy private BusDeviceService deviceService;
     @Autowired private FileProperties fileProperties;
 
     // 初始化
diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/BusDeviceServiceImpl.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/BusDeviceServiceImpl.java
index e10862d..8ae9d7a 100644
--- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/BusDeviceServiceImpl.java
+++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/BusDeviceServiceImpl.java
@@ -32,6 +32,8 @@ import lombok.RequiredArgsConstructor;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import me.zhengjie.utils.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -56,9 +58,9 @@ public class BusDeviceServiceImpl extends ServiceImpl<BusDeviceMapper, BusDevice
     private final BusUserCommandMapper busUserCommandMapper;
     private final BusCommandLogMapper busCommandLogMapper;
     private final WeChatService weChatService;
-    private final WebSocketSdcpServiceImpl webSocketSdcpService;
-    private final WebSocketVueServiceImpl webSocketVueService;
-    private final RedisUtils redisUtils;
+    @Autowired @Lazy private WebSocketSdcpServiceImpl webSocketSdcpService;
+    @Autowired @Lazy private WebSocketVueServiceImpl webSocketVueService;
+    // private final RedisUtils redisUtils;
 
     @Override
     public BusDevice getByDeviceCode(String deviceCode) {
diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/WebSocketSdcpServiceImpl.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/WebSocketSdcpServiceImpl.java
index 16f80b1..d6b1672 100644
--- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/WebSocketSdcpServiceImpl.java
+++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/WebSocketSdcpServiceImpl.java
@@ -109,6 +109,10 @@ public class WebSocketSdcpServiceImpl extends WebSocketService {
     // 初始状态刷新消息(Cmd:0) 指令
     private void pushDeviceStatus(String deviceSn) {
         WebSocketService socket = getSocket(WebSocketConfig.TOPIC_PREFIX);
+        if (null == socket || null == socket.session || !socket.session.isOpen()) {
+            log.info("<<< 第三方未连接，无法初始化，略过");
+            return;
+        }
         long currentTimeLong = System.currentTimeMillis();
         Map<String, Object> dataParam = new HashMap<>();
         dataParam.put("UserId", socket.session.getId());
diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/WebSocketVueServiceImpl.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/WebSocketVueServiceImpl.java
index aca9976..7ec2413 100644
--- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/WebSocketVueServiceImpl.java
+++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/WebSocketVueServiceImpl.java
@@ -35,8 +35,6 @@ public class WebSocketVueServiceImpl extends WebSocketService {
         log.info("<<< 设备初始化");
     }
 
-    // 每30秒刷新设备
-    @Scheduled(fixedRate = 30000)
     public void refreshDeviceList() {
         deviceList = new ArrayList<>();
         List<BusDevice> devices = myDeviceService.queryAll(new BusDeviceQueryCriteria());