1、首页内容清除，替换为查询已登录、未登录的调试宝设备

2、后台的登录用户（管理员）可以查看多个调试宝设备（本部门以及下面的数据），调试宝的登录用户（运维人员）只可以查看自己的调试宝设备
3、点击调试宝设备卡片，进行对应设备的操作

ruoyi-admin/src/main/java/com/ruoyi/web/controller/device/TsbDeviceController.java

@@ -34,6 +34,15 @@ public class TsbDeviceController extends BaseController
     private ITsbUserDeviceService tsbUserDeviceService;
 
     /**
+     * 首页调试宝设备卡片（已登录/未登录分组由前端处理）
+     */
+    @GetMapping("/home/list")
+    public AjaxResult homeList()
+    {
+        return success(tsbDeviceService.selectTsbDeviceHomeList(new TsbDevice()));
+    }
+
+    /**
      * 查询调试宝设备列表
      */
     @PreAuthorize("@ss.hasPermi('tsb:device:list')")

ruoyi-admin/src/main/java/com/ruoyi/web/controller/device/TsbWebSocketController.java

@@ -2,18 +2,18 @@ package com.ruoyi.web.controller.device;
 
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.device.domain.model.TsbUserDeviceBind;
-import com.ruoyi.device.mapper.TsbUserDeviceMapper;
+import com.ruoyi.device.websocket.TsbWebSocketService;
 import jakarta.annotation.Resource;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
- * 调试宝 WebSocket连接 辅助接口
- * 测试是否可以连接
+ * 调试宝 WebSocket连接 辅助接口（连接前的检测接口）
  *
  * @author lwm
  */
@@ -22,20 +22,23 @@ import org.springframework.web.bind.annotation.RestController;
 public class TsbWebSocketController extends BaseController
 {
     @Resource
-    private TsbUserDeviceMapper tsbUserDeviceMapper;
+    private TsbWebSocketService tsbWebSocketService;
 
     /**
-     * 当前登录用户的设备绑定信息（建立 WebSocket 前校验）
+     * WebSocket 连接预检（设备在线、操作权限、设备未被占用）
      */
     @GetMapping("/bind")
-    public AjaxResult bindInfo()
+    public AjaxResult bindInfo(@RequestParam Long deviceSn)
     {
         Long userId = SecurityUtils.getUserId();
-        TsbUserDeviceBind bind = tsbUserDeviceMapper.selectBindByUserId(userId);
-        if (bind == null || bind.getDeviceSn() == null || StringUtils.isEmpty(bind.getDeviceType()))
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        String precheckMsg = tsbWebSocketService.precheckConnect(userId, deviceSn, loginUser);
+        if (precheckMsg != null)
         {
-            return error("当前用户未绑定调试宝设备，无法建立实时连接");
+            logger.warn("设备连接预检失败：{}, userId={}, deviceSn={}", precheckMsg, userId, deviceSn);
+            return error(precheckMsg);
         }
+        TsbUserDeviceBind bind = tsbWebSocketService.buildOperateBind(deviceSn, loginUser);
         return success(bind);
     }
 }

ruoyi-device/src/main/java/com/ruoyi/device/domain/vo/TsbDeviceHomeVo.java

@@ -0,0 +1,167 @@
+package com.ruoyi.device.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.util.Date;
+
+/**
+ * 首页调试宝设备卡片
+ *
+ * @author lwm
+ */
+public class TsbDeviceHomeVo
+{
+    /** 设备信息 */
+    private Long deviceId;
+    private String imei;
+    private String deviceType;
+    private Long deviceSn;
+    private String status;
+
+    /** 部门信息 */
+    private Long deptId;
+    private String deptName;
+
+    /** 绑定用户 */
+    private Long bindUserId;
+    private String bindUserName;
+    private String bindNickName;
+
+    /** MQTT 登录状态（0离线 1在线） */
+    private Integer lineStatus;
+    /** MQTT 登录用户名 */
+    private String onlineUserName;
+    /** 心跳时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date heartbeatTime;
+
+    public Long getDeviceId()
+    {
+        return deviceId;
+    }
+
+    public void setDeviceId(Long deviceId)
+    {
+        this.deviceId = deviceId;
+    }
+
+    public String getImei()
+    {
+        return imei;
+    }
+
+    public void setImei(String imei)
+    {
+        this.imei = imei;
+    }
+
+    public String getDeviceType()
+    {
+        return deviceType;
+    }
+
+    public void setDeviceType(String deviceType)
+    {
+        this.deviceType = deviceType;
+    }
+
+    public Long getDeviceSn()
+    {
+        return deviceSn;
+    }
+
+    public void setDeviceSn(Long deviceSn)
+    {
+        this.deviceSn = deviceSn;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public String getDeptName()
+    {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName)
+    {
+        this.deptName = deptName;
+    }
+
+    public Long getBindUserId()
+    {
+        return bindUserId;
+    }
+
+    public void setBindUserId(Long bindUserId)
+    {
+        this.bindUserId = bindUserId;
+    }
+
+    public String getBindUserName()
+    {
+        return bindUserName;
+    }
+
+    public void setBindUserName(String bindUserName)
+    {
+        this.bindUserName = bindUserName;
+    }
+
+    public String getBindNickName()
+    {
+        return bindNickName;
+    }
+
+    public void setBindNickName(String bindNickName)
+    {
+        this.bindNickName = bindNickName;
+    }
+
+    public Integer getLineStatus()
+    {
+        return lineStatus;
+    }
+
+    public void setLineStatus(Integer lineStatus)
+    {
+        this.lineStatus = lineStatus;
+    }
+
+    public String getOnlineUserName()
+    {
+        return onlineUserName;
+    }
+
+    public void setOnlineUserName(String onlineUserName)
+    {
+        this.onlineUserName = onlineUserName;
+    }
+
+    public Date getHeartbeatTime()
+    {
+        return heartbeatTime;
+    }
+
+    public void setHeartbeatTime(Date heartbeatTime)
+    {
+        this.heartbeatTime = heartbeatTime;
+    }
+}

ruoyi-device/src/main/java/com/ruoyi/device/mapper/TsbDeviceMapper.java

@@ -1,6 +1,7 @@
 package com.ruoyi.device.mapper;
 
 import com.ruoyi.device.domain.entity.TsbDevice;
+import com.ruoyi.device.domain.vo.TsbDeviceHomeVo;
 
 import java.util.List;
 
@@ -22,6 +23,16 @@ public interface TsbDeviceMapper
     List<TsbDevice> selectTsbDeviceList(TsbDevice tsbDevice);
 
     /**
+     * 首页设备卡片列表（含绑定用户、部门）
+     */
+    List<TsbDeviceHomeVo> selectTsbDeviceHomeList(TsbDevice tsbDevice);
+
+    /**
+     * 按 SN码 查询当前用户有操作权限的设备
+     */
+    TsbDevice selectAccessibleDeviceBySn(TsbDevice tsbDevice);
+
+    /**
      * 按主键查询未删除的设备
      *
      * @param deviceId 设备主键

ruoyi-device/src/main/java/com/ruoyi/device/service/ITsbDeviceService.java

@@ -2,6 +2,7 @@ package com.ruoyi.device.service;
 
 import java.util.List;
 import com.ruoyi.device.domain.entity.TsbDevice;
+import com.ruoyi.device.domain.vo.TsbDeviceHomeVo;
 
 /**
  * 调试宝设备业务层
@@ -19,6 +20,20 @@ public interface ITsbDeviceService
     public List<TsbDevice> selectTsbDeviceList(TsbDevice tsbDevice);
 
     /**
+     * 首页设备卡片列表（使用部门数据权限区分）
+     * 本部门及以下数据权限 = 后台的登录用户（管理员）可以查看多个调试宝设备
+     * 仅本人数据权限 = 调试宝的登录用户（运维人员）只可以查看自己的调试宝设备
+     */
+    public List<TsbDeviceHomeVo> selectTsbDeviceHomeList(TsbDevice tsbDevice);
+
+    /**
+     * 按 SN 查询当前用户有操作权限的设备
+     * 后台的登录用户（管理员） = 查询是否在 部门及以下数据权限的调试宝设备 中
+     * 调试宝的登录用户（运维人员） = 查询是否是 登录用户（运维人员）的调试宝设备
+     */
+    TsbDevice selectAccessibleDeviceBySn(Long deviceSn);
+
+    /**
      * 根据设备ID查询设备（未删除）
      *
      * @param deviceId 设备ID

ruoyi-device/src/main/java/com/ruoyi/device/service/impl/TsbDeviceServiceImpl.java

@@ -1,11 +1,16 @@
 package com.ruoyi.device.service.impl;
 
+import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.device.domain.entity.TsbDevice;
+import com.ruoyi.device.domain.vo.TsbDeviceHomeVo;
 import com.ruoyi.device.mapper.TsbDeviceMapper;
 import com.ruoyi.device.mapper.TsbUserDeviceMapper;
+import com.ruoyi.device.mqtt.enums.DeviceLineStatusEnum;
+import com.ruoyi.device.mqtt.handler.DeviceOnlineManager;
+import com.ruoyi.device.mqtt.vo.DeviceOnlineInfo;
 import com.ruoyi.device.service.ITsbDeviceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -27,6 +32,9 @@ public class TsbDeviceServiceImpl implements ITsbDeviceService
     @Autowired
     private TsbUserDeviceMapper tsbUserDeviceMapper;
 
+    @Autowired
+    private DeviceOnlineManager deviceOnlineManager;
+
     /**
      * 根据条件分页查询设备数据
      *
@@ -40,6 +48,71 @@ public class TsbDeviceServiceImpl implements ITsbDeviceService
     }
 
     /**
+     * 首页设备卡片列表（含绑定用户、部门）
+     *
+     * @param tsbDevice 设备信息
+     * @return 设备列表
+     */
+    @Override
+    @DataScope(deptAlias = "d", userAlias = "u")
+    public List<TsbDeviceHomeVo> selectTsbDeviceHomeList(TsbDevice tsbDevice)
+    {
+        if (tsbDevice == null)
+        {
+            tsbDevice = new TsbDevice();
+        }
+        List<TsbDeviceHomeVo> list = tsbDeviceMapper.selectTsbDeviceHomeList(tsbDevice);
+        fillDeviceOnlineInfo(list);
+        return list;
+    }
+
+    /**
+     * 填充设备在线信息
+     *
+     * @param list 设备列表
+     */
+    private void fillDeviceOnlineInfo(List<TsbDeviceHomeVo> list)
+    {
+        if (StringUtils.isEmpty(list))
+        {
+            return;
+        }
+        for (TsbDeviceHomeVo vo : list)
+        {
+            DeviceOnlineInfo info = deviceOnlineManager.getDeviceLoginInfo(vo.getDeviceSn());
+            if (info != null && DeviceLineStatusEnum.isOnLine(info.getLineStatus()))
+            {
+                vo.setLineStatus(DeviceLineStatusEnum.ON_LINE.getStatus());
+                vo.setOnlineUserName(info.getUserName());
+                vo.setHeartbeatTime(info.getHeartbeatTime());
+            }
+            else
+            {
+                vo.setLineStatus(DeviceLineStatusEnum.OFF_LINE.getStatus());
+            }
+        }
+    }
+
+    /**
+     * 按 SN码 查询当前用户有操作权限的设备
+     *
+     * @param deviceSn 设备 SN 码
+     * @return 设备信息
+     */
+    @Override
+    @DataScope(deptAlias = "d", userAlias = "u")
+    public TsbDevice selectAccessibleDeviceBySn(Long deviceSn)
+    {
+        if (deviceSn == null)
+        {
+            return null;
+        }
+        TsbDevice query = new TsbDevice();
+        query.setDeviceSn(deviceSn);
+        return tsbDeviceMapper.selectAccessibleDeviceBySn(query);
+    }
+
+    /**
      * 根据设备ID查询设备（未删除）
      *
      * @param deviceId 设备ID

ruoyi-device/src/main/java/com/ruoyi/device/websocket/TsbWebSocketConstants.java

@@ -19,6 +19,11 @@ public final class TsbWebSocketConstants
     public static final String TOKEN_PARAM_NAME = "token";
 
     /**
+     * 设备 SN码 参数名称
+     */
+    public static final String DEVICE_SN_PARAM_NAME = "deviceSn";
+
+    /**
      * 绑定信息属性名称
      */
     public static final String USER_DEVICE_BIND_KEY = "tsbUserDeviceBind";

ruoyi-device/src/main/java/com/ruoyi/device/websocket/TsbWebSocketServer.java

@@ -60,13 +60,17 @@ public class TsbWebSocketServer
         }
         // 用户鉴权
         String token = WebSocketUtils.resolveQueryParam(session, TsbWebSocketConstants.TOKEN_PARAM_NAME);
-        JSONObject bind = tsbWebSocketService.authenticate(token, session);
+        String deviceSnText = WebSocketUtils.resolveQueryParam(session, TsbWebSocketConstants.DEVICE_SN_PARAM_NAME);
+        Long deviceSn = parseDeviceSn(deviceSnText);
+        StringBuilder failReason = new StringBuilder();
+        JSONObject bind = tsbWebSocketService.authenticate(token, deviceSn, session, failReason);
         if (bind == null)
         {
-            log.error("鉴权失败或未绑定设备");
+            String reason = !failReason.isEmpty() ? failReason.toString() : "鉴权失败或未绑定设备";
+            log.error("WebSocket 连接失败：{}", reason);
             TsbWebSocketUsers.sendMessageToUserByText(session,
-                    TsbWebSocketMessage.fail(TsbWebSocketConstants.CONNECT, "鉴权失败或未绑定设备"));
-            WebSocketUtils.closeQuietly(session, CloseReason.CloseCodes.CANNOT_ACCEPT, "鉴权失败或未绑定设备");
+                    TsbWebSocketMessage.fail(TsbWebSocketConstants.CONNECT, reason));
+            WebSocketUtils.closeQuietly(session, CloseReason.CloseCodes.CANNOT_ACCEPT, reason);
             SemaphoreUtils.release(socketSemaphore);
             return;
         }
@@ -134,4 +138,20 @@ public class TsbWebSocketServer
     {
         tsbWebSocketService.pushDeviceSyncFromPage(session, message);
     }
+
+    private Long parseDeviceSn(String deviceSnText)
+    {
+        if (deviceSnText == null || deviceSnText.isEmpty())
+        {
+            return null;
+        }
+        try
+        {
+            return Long.valueOf(deviceSnText);
+        }
+        catch (NumberFormatException e)
+        {
+            return null;
+        }
+    }
 }

ruoyi-device/src/main/java/com/ruoyi/device/websocket/TsbWebSocketService.java

@@ -4,8 +4,8 @@ import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.device.domain.entity.TsbDevice;
 import com.ruoyi.device.domain.model.TsbUserDeviceBind;
-import com.ruoyi.device.mapper.TsbUserDeviceMapper;
 import com.ruoyi.device.mqtt.domain.BaseJsonBody;
 import com.ruoyi.device.mqtt.enums.CmdTypeEnum;
 import com.ruoyi.device.mqtt.enums.MsgTypeEnum;
@@ -15,12 +15,15 @@ import com.ruoyi.device.mqtt.handler.JsonCmdHandlerManager;
 import com.ruoyi.device.mqtt.handler.encoder.IEncoder;
 import com.ruoyi.device.mqtt.handler.encoder.json.IJsonCmdDownHandler;
 import com.ruoyi.device.mqtt.util.MsgHandlerUtil;
+import com.ruoyi.device.service.ITsbDeviceService;
 import com.ruoyi.device.websocket.model.TsbWebSocketMessage;
 import com.ruoyi.framework.web.service.TokenService;
 import jakarta.annotation.Resource;
 import jakarta.websocket.Session;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
 
 import java.util.Map;
@@ -40,7 +43,7 @@ public class TsbWebSocketService
     private TokenService tokenService;
 
     @Resource
-    private TsbUserDeviceMapper tsbUserDeviceMapper;
+    private ITsbDeviceService tsbDeviceService;
 
     @Resource
     private HandlerManager handlerManager;
@@ -52,33 +55,115 @@ public class TsbWebSocketService
     private DeviceOnlineManager deviceOnlineManager;
 
     /**
-     * 握手鉴权：解析 token、校验用户已绑定设备，写入 session 属性
+     * WebSocket 连接预检：设备在线、操作权限、设备未被占用
      *
-     * @return 绑定信息；失败返回 null
+     * @return 失败原因；通过返回 null
      */
-    public JSONObject authenticate(String token, Session session)
+    public String precheckConnect(Long userId, Long deviceSn, LoginUser loginUser)
+    {
+        if (deviceSn == null)
+        {
+            return "请指定设备编号";
+        }
+        if (userId == null || loginUser == null || loginUser.getUser() == null)
+        {
+            return "登录状态无效，请重新登录";
+        }
+        TsbDevice device = tsbDeviceService.selectAccessibleDeviceBySn(deviceSn);
+        if (device == null)
+        {
+            return "您没有该设备的操作权限";
+        }
+        if (StringUtils.isEmpty(device.getDeviceType()))
+        {
+            return "设备类型未配置，无法建立连接";
+        }
+        if (!deviceOnlineManager.isOnline(deviceSn))
+        {
+            return "设备未登录在线，无法建立连接";
+        }
+        if (TsbWebSocketUsers.isDeviceConnected(deviceSn))
+        {
+            return "该设备已被占用连接，请稍后再试";
+        }
+        return null;
+    }
+
+    /**
+     * 构建 Web 端操作设备所需的绑定信息
+     */
+    public TsbUserDeviceBind buildOperateBind(Long deviceSn, LoginUser loginUser)
+    {
+        TsbDevice device = tsbDeviceService.selectAccessibleDeviceBySn(deviceSn);
+        TsbUserDeviceBind bind = new TsbUserDeviceBind();
+        bind.setDeviceId(device.getDeviceId());
+        bind.setDeviceType(device.getDeviceType());
+        bind.setDeviceSn(device.getDeviceSn());
+        bind.setImei(device.getImei());
+        bind.setUserId(loginUser.getUserId());
+        bind.setUserName(loginUser.getUsername());
+        bind.setNickName(loginUser.getUser().getNickName());
+        return bind;
+    }
+
+    /**
+     * 握手鉴权：解析 token、deviceSn，预检后写入 session 属性
+     *
+     * @return 绑定信息；失败返回 null（failReason 写入原因）
+     */
+    public JSONObject authenticate(String token, Long deviceSn, Session session, StringBuilder failReason)
     {
         LoginUser loginUser = tokenService.getLoginUser(token);
         if (loginUser == null || loginUser.getUser() == null)
         {
             log.warn("WebSocket 鉴权失败：无效 token");
+            if (failReason != null)
+            {
+                failReason.append("登录状态无效，请重新登录");
+            }
             return null;
         }
-        Long userId = loginUser.getUserId();
-        TsbUserDeviceBind bind = tsbUserDeviceMapper.selectBindByUserId(userId);
-        if (bind == null || bind.getDeviceSn() == null)
+        // 手动设置 Spring Security 上下文，使 SecurityUtils.getLoginUser() 可用
+        UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(
+                loginUser, null, loginUser.getAuthorities());
+        SecurityContextHolder.getContext().setAuthentication(authentication);
+
+        try
         {
-            log.warn("WebSocket 鉴权失败：用户未绑定设备, userId={}", userId);
-            return null;
+            Long userId = loginUser.getUserId();
+            String precheckMsg = precheckConnect(userId, deviceSn, loginUser);
+            if (precheckMsg != null)
+            {
+                log.warn("WebSocket 预检失败：{}, userId={}, deviceSn={}", precheckMsg, userId, deviceSn);
+                if (failReason != null)
+                {
+                    failReason.append(precheckMsg);
+                }
+                return null;
+            }
+            TsbUserDeviceBind bind = buildOperateBind(deviceSn, loginUser);
+            // session中写入用户设备信息 便于后续获取
+            session.getUserProperties().put(TsbWebSocketConstants.DEVICE_SN_KEY, bind.getDeviceSn());
+            session.getUserProperties().put(TsbWebSocketConstants.USER_DEVICE_BIND_KEY, bind);
+            session.getUserProperties().put(TsbWebSocketConstants.USER_PERMISSIONS_KEY, loginUser.getPermissions());
+            // 创建信息map
+            if (!TsbWebSocketUsers.tryPut(bind.getDeviceSn(), session))
+            {
+                log.warn("WebSocket 注册失败：设备已被占用, deviceSn={}", bind.getDeviceSn());
+                if (failReason != null)
+                {
+                    failReason.append("该设备已被占用连接，请稍后再试");
+                }
+                return null;
+            }
+            log.info("WebSocket 鉴权成功, userId={}, deviceSn={}", userId, bind.getDeviceSn());
+            return JSONObject.from(bind);
+        }
+        finally
+        {
+            // 清理 SecurityContext，避免线程复用导致的安全问题
+            SecurityContextHolder.clearContext();
         }
-        // session中写入用户设备信息 便于后续获取
-        session.getUserProperties().put(TsbWebSocketConstants.DEVICE_SN_KEY, bind.getDeviceSn());
-        session.getUserProperties().put(TsbWebSocketConstants.USER_DEVICE_BIND_KEY, bind);
-        session.getUserProperties().put(TsbWebSocketConstants.USER_PERMISSIONS_KEY, loginUser.getPermissions());
-        // 创建信息map
-        TsbWebSocketUsers.put(bind.getDeviceSn(), session);
-        log.info("WebSocket 鉴权成功, userId={}, deviceSn={}", userId, bind.getDeviceSn());
-        return JSONObject.from(bind);
     }
 
 
@@ -100,7 +185,8 @@ public class TsbWebSocketService
         }
         // 2、组装下发所需的消息
         TsbUserDeviceBind bind = getBindFromSession(session);
-        if (bind == null || bind.getDeviceSn() == null || StringUtils.isEmpty(bind.getDeviceType())) {
+        if (bind == null || bind.getDeviceSn() == null || StringUtils.isEmpty(bind.getDeviceType()))
+        {
             log.warn("WebSocket 获取用户设备信息失败, sessionId={}, bind={}", session.getId(), bind);
             TsbWebSocketUsers.sendMessageToUserByText(session,
                     TsbWebSocketMessage.fail(tsbWebSocketMessage.getCmdType(), "会话缺少设备绑定信息，请重新连接"));
@@ -160,7 +246,8 @@ public class TsbWebSocketService
     /**
      * 从 Session 中安全获取绑定信息
      */
-    public TsbUserDeviceBind getBindFromSession(Session session) {
+    public TsbUserDeviceBind getBindFromSession(Session session)
+    {
         Object bindObj = session.getUserProperties().get(TsbWebSocketConstants.USER_DEVICE_BIND_KEY);
         return bindObj instanceof TsbUserDeviceBind ? (TsbUserDeviceBind) bindObj : null;
     }
@@ -169,7 +256,8 @@ public class TsbWebSocketService
      * 从 Session 中安全获取用户权限集合
      */
     @SuppressWarnings("unchecked")
-    public Set<String> getUserPermissionsFromSession(Session session) {
+    public Set<String> getUserPermissionsFromSession(Session session)
+    {
         Object permissionsObj = session.getUserProperties().get(TsbWebSocketConstants.USER_PERMISSIONS_KEY);
         return permissionsObj instanceof Set ? (Set<String>) permissionsObj : null;
     }
@@ -177,7 +265,8 @@ public class TsbWebSocketService
     /**
      * 从 Session 中安全获取 deviceSn
      */
-    public Long getDeviceSnFromSession(Session session) {
+    public Long getDeviceSnFromSession(Session session)
+    {
         Object deviceSnObj = session.getUserProperties().get(TsbWebSocketConstants.DEVICE_SN_KEY);
         return deviceSnObj instanceof Long ? (Long) deviceSnObj : null;
     }
@@ -201,7 +290,8 @@ public class TsbWebSocketService
         }
         // 2、通过 deviceSn 判断WebSocket是否连接
         Map<Long, Session> sessionUsers = TsbWebSocketUsers.getSessionUsers();
-        if (!sessionUsers.containsKey(deviceSn)) {
+        if (!sessionUsers.containsKey(deviceSn))
+        {
             log.warn("web端用户未登录, deviceSn={}", deviceSn);
             return;
         }

ruoyi-device/src/main/java/com/ruoyi/device/websocket/TsbWebSocketUsers.java

@@ -29,6 +29,47 @@ public class TsbWebSocketUsers
     private static final Map<Long, Session> SESSION_USERS = new ConcurrentHashMap<>();
 
     /**
+     * 注册会话；同一 deviceSn 仅允许一个有效连接
+     *
+     * @param key 唯一键 设备sn码
+     * @param session session用户信息
+     * @return true 注册成功；false 该设备已有连接
+     */
+    public static boolean tryPut(Long key, Session session)
+    {
+        Session existing = SESSION_USERS.get(key);
+        if (existing != null && existing.isOpen() && !existing.getId().equals(session.getId()))
+        {
+            LOGGER.info("设备编号={} 已有 WebSocket 连接, sessionId={}", key, existing.getId());
+            return false;
+        }
+        put(key, session);
+        return true;
+    }
+
+    /**
+     * 设备是否已有有效 WebSocket 连接
+     */
+    public static boolean isDeviceConnected(Long deviceSn)
+    {
+        if (deviceSn == null)
+        {
+            return false;
+        }
+        Session session = SESSION_USERS.get(deviceSn);
+        if (session == null)
+        {
+            return false;
+        }
+        if (!session.isOpen())
+        {
+            SESSION_USERS.remove(deviceSn, session);
+            return false;
+        }
+        return true;
+    }
+
+    /**
      * 注册会话；同一 deviceSn 仅保留最新连接
      *
      * @param key 唯一键 设备sn码

ruoyi-device/src/main/resources/mapper/device/TsbDeviceMapper.xml

@@ -29,6 +29,46 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from tsb_device
     </sql>
 
+    <select id="selectTsbDeviceHomeList" parameterType="TsbDevice" resultType="com.ruoyi.device.domain.vo.TsbDeviceHomeVo">
+        select d.device_id as deviceId,
+               d.imei as imei,
+               d.device_type as deviceType,
+               d.device_sn as deviceSn,
+               d.dept_id as deptId,
+               sd.dept_name as deptName,
+               d.status as status,
+               u.user_id as bindUserId,
+               u.user_name as bindUserName,
+               u.nick_name as bindNickName
+        from tsb_device d
+        left join sys_dept sd on sd.dept_id = d.dept_id and sd.del_flag = '0'
+        left join tsb_user_device bud on bud.device_id = d.device_id
+        left join sys_user u on u.user_id = bud.user_id and u.del_flag = '0'
+        <where>
+            and d.del_flag = '0'
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
+        </where>
+        order by d.device_id desc
+    </select>
+
+    <select id="selectAccessibleDeviceBySn" parameterType="TsbDevice" resultMap="TsbDeviceResult">
+        select d.device_id, d.imei, d.device_type, d.device_sn, d.dept_id, sd.dept_name,
+               d.device_produce_date, d.software_version, d.status, d.last_run_time, d.del_flag,
+               d.create_by, d.create_time, d.update_by, d.update_time, d.remark
+        from tsb_device d
+        left join sys_dept sd on sd.dept_id = d.dept_id and sd.del_flag = '0'
+        left join tsb_user_device bud on bud.device_id = d.device_id
+        left join sys_user u on u.user_id = bud.user_id and u.del_flag = '0'
+        <where>
+            and d.del_flag = '0'
+            and d.device_sn = #{deviceSn}
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
+        </where>
+        limit 1
+    </select>
+
     <select id="selectTsbDeviceList" parameterType="TsbDevice" resultMap="TsbDeviceResult">
         select d.device_id, d.imei, d.device_type, d.device_sn, d.dept_id, sd.dept_name,
                d.device_produce_date, d.software_version, d.status, d.last_run_time, d.del_flag,

ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java

@@ -49,13 +49,40 @@ public class DataScopeAspect
             // 如果是超级管理员，则不过滤数据
             if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin())
             {
-                String permission = StringUtils.defaultIfEmpty(controllerDataScope.permission(), PermissionContextHolder.getContext());
+                String permission = getPermission(controllerDataScope);
                 dataScopeFilter(joinPoint, currentUser, controllerDataScope.userAlias(), controllerDataScope.deptAlias(), controllerDataScope.userField(), controllerDataScope.deptField(), permission);
             }
         }
     }
 
     /**
+     * 获取权限字符（兼容 WebSocket 等非 HTTP 请求场景）
+     *
+     * @param controllerDataScope 数据范围注解
+     * @return 权限字符串
+     */
+    private String getPermission(DataScope controllerDataScope)
+    {
+        // 如果注解中显式指定了 permission，直接使用
+        if (StringUtils.isNotEmpty(controllerDataScope.permission()))
+        {
+            return controllerDataScope.permission();
+        }
+
+        // 尝试从 RequestContextHolder 获取（HTTP 请求场景）
+        try
+        {
+            return PermissionContextHolder.getContext();
+        }
+        catch (IllegalStateException e)
+        {
+            // WebSocket 等非 HTTP 请求场景，RequestContextHolder 不可用
+            // 返回空字符串，后续逻辑会按无权限限制处理
+            return "";
+        }
+    }
+
+    /**
      * 数据范围过滤
      *
      * @param joinPoint 切点

ruoyi-ui/src/api/tsb/device.js

@@ -8,6 +8,14 @@ export function listTsbDevice(query) {
   })
 }
 
+/** 首页调试宝设备卡片列表 */
+export function listTsbDeviceHome() {
+  return request({
+    url: '/tsb/device/home/list',
+    method: 'get'
+  })
+}
+
 export function getTsbDevice(deviceId) {
   return request({
     url: '/tsb/device/' + deviceId,

ruoyi-ui/src/api/tsb/ws.js

@@ -1,9 +1,15 @@
 import request from '@/utils/request'
 
-/** 查询当前用户设备绑定（WebSocket 前置校验） */
-export function getTsbWsBind() {
+/**
+ * WebSocket 连接预检（deviceSn 必填）
+ * @param {number|string} deviceSn 设备 SN
+ * @param {boolean} silent 为 true 时不自动弹出全局错误提示（用于重连预检）
+ */
+export function getTsbWsBind(deviceSn, silent = false) {
   return request({
     url: '/tsb/ws/bind',
-    method: 'get'
+    method: 'get',
+    params: { deviceSn },
+    headers: { silentError: silent }
   })
 }

ruoyi-ui/src/permission.js

@@ -12,10 +12,6 @@ NProgress.configure({ showSpinner: false })
 
 const whiteList = ['/login', '/register']
 
-function connectTsbWebSocket() {
-  tsbWebSocket.connect()
-}
-
 const isWhiteList = (path) => {
   return whiteList.some(pattern => isPathMatch(pattern, path))
 }
@@ -43,7 +39,7 @@ router.beforeEach((to, from, next) => {
         // 判断当前用户是否已拉取完user_info信息
         store.dispatch('GetInfo').then(() => {
           isRelogin.show = false
-          connectTsbWebSocket()
+          tsbWebSocket.connectAfterLogin()
           store.dispatch('GenerateRoutes').then(accessRoutes => {
             // 根据roles权限生成可访问的路由表
             router.addRoutes(accessRoutes) // 动态添加可访问路由表
@@ -56,7 +52,7 @@ router.beforeEach((to, from, next) => {
             })
           })
       } else {
-        connectTsbWebSocket()
+        tsbWebSocket.connectAfterLogin()
         next()
       }
     }

ruoyi-ui/src/store/getters.js

@@ -18,6 +18,8 @@ const getters = {
   permission_routes: state => state.permission.routes,
   topbarRouters: state => state.permission.topbarRouters,
   defaultRoutes: state => state.permission.defaultRoutes,
-  sidebarRouters: state => state.permission.sidebarRouters
+  sidebarRouters: state => state.permission.sidebarRouters,
+  tsbCurrentDevice: state => state.tsb.currentDevice,
+  tsbCurrentDeviceSn: state => state.tsb.currentDevice && state.tsb.currentDevice.deviceSn
 }
 export default getters

ruoyi-ui/src/store/modules/tsb.js

@@ -1,6 +1,8 @@
 const tsb = {
   namespaced: true,
   state: {
+    /** 当前选中的调试宝设备（首页卡片点击后写入） */
+    currentDevice: null,
     /** 各 cmdType 最新推送数据 */
     pageData: {},
     /** WebSocket 跳转时标记，页面初始化后清除 */
@@ -9,6 +11,9 @@ const tsb = {
     pageDataVersion: 0
   },
   mutations: {
+    SET_CURRENT_DEVICE(state, device) {
+      state.currentDevice = device || null
+    },
     SET_WS_PAGE_DATA(state, { cmdType, data, navigate }) {
       state.pageData = { ...state.pageData, [cmdType]: data }
       state.pageDataVersion += 1
@@ -22,6 +27,7 @@ const tsb = {
       state.initFromWs = initFromWs
     },
     RESET_TSB(state) {
+      state.currentDevice = null
       state.pageData = {}
       state.initFromWs = {}
       state.pageDataVersion = 0

ruoyi-ui/src/store/modules/user.js

@@ -55,7 +55,6 @@ const user = {
           setToken(res.token)
           commit('SET_TOKEN', res.token)
           store.dispatch('lock/unlockScreen')
-          tsbWebSocket.connectAfterLogin()
           resolve()
         }).catch(error => {
           reject(error)

ruoyi-ui/src/utils/request.js

@@ -96,7 +96,10 @@ service.interceptors.response.use(res => {
     }
       return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
     } else if (code === 500) {
-      Message({ message: msg, type: 'error' })
+      const silentError = res.config.headers && res.config.headers.silentError === true
+      if (!silentError) {
+        Message({ message: msg, type: 'error' })
+      }
       return Promise.reject(new Error(msg))
     } else if (code === 601) {
       Message({ message: msg, type: 'warning' })

ruoyi-ui/src/utils/tsbWebSocket.js

@@ -1,5 +1,6 @@
 import { getToken } from '@/utils/auth'
 import { Message } from 'element-ui'
+import { getTsbWsBind } from '@/api/tsb/ws'
 import { initTsbWsRouter } from '@/utils/tsbWsRouter'
 import {
   initTabCoordinator,
@@ -10,7 +11,6 @@ import {
   requestLeaderReconnect,
   notifyLogout,
   destroyTabCoordinator,
-  resetLeadershipForLogin,
   reclaimLeadershipIfStale
 } from '@/utils/tsbWebSocketTab'
 
@@ -18,15 +18,17 @@ let socket = null
 let reconnectTimer = null
 let manualClose = false
 let messageHandler = null
-/** 连接代次，用于忽略旧 socket 的 close/error 回调 */
 let connectId = 0
-/** 自动重连次数 */
 let reconnectAttempts = 0
 let reconnectExhaustedNotified = false
-/** 非 Leader 标签页感知的连接状态 */
 let followerConnectedState = false
 let tabCoordinatorInited = false
 let wsRouterInited = false
+/** 当前选中的设备 SN（仅用户点击卡片后赋值） */
+let currentDeviceSn = null
+/** 是否由用户主动发起连接（用于控制提示与重连） */
+let userInitiatedConnect = false
+
 const RECONNECT_DELAY = 3000
 const MAX_RECONNECT_ATTEMPTS = 3
 
@@ -45,13 +47,16 @@ function ensureTabCoordinator() {
   tabCoordinatorInited = true
   initTabCoordinator({
     onBecomeLeader: (forceReconnect) => {
+      if (!userInitiatedConnect || !currentDeviceSn) {
+        return
+      }
       if (forceReconnect) {
         leaderDisconnectSilently()
         resetReconnectAttempts()
-        leaderConnect(false)
+        runPrecheckAndConnect(false)
         return
       }
-      leaderConnect(true)
+      runPrecheckAndConnect(true)
     },
     onBecomeFollower: () => leaderDisconnectSilently(),
     onBroadcastMessage: (message) => messageHandler?.(message),
@@ -71,10 +76,10 @@ function resetReconnectAttempts() {
   reconnectExhaustedNotified = false
 }
 
-function buildWsUrl(token) {
+function buildWsUrl(token, deviceSn) {
   const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:'
   const base = process.env.VUE_APP_BASE_API || ''
-  return `${protocol}//${window.location.host}${base}/websocket/tsb?token=${encodeURIComponent(token)}`
+  return `${protocol}//${window.location.host}${base}/websocket/tsb?token=${encodeURIComponent(token)}&deviceSn=${encodeURIComponent(deviceSn)}`
 }
 
 function clearReconnectTimer() {
@@ -84,14 +89,41 @@ function clearReconnectTimer() {
   }
 }
 
+function extractErrorMessage(err) {
+  if (!err) {
+    return '预检失败'
+  }
+  if (typeof err === 'string') {
+    return err
+  }
+  return err.msg || err.message || '预检失败'
+}
+
+function runPrecheck(deviceSn, silent = true) {
+  return getTsbWsBind(deviceSn, silent).then(res => res.data)
+}
+
+function runPrecheckAndConnect(resetAttempts = true) {
+  if (!isLeaderTab() || !currentDeviceSn || manualClose) {
+    return Promise.resolve(false)
+  }
+  const token = getToken()
+  if (!token) {
+    return Promise.resolve(false)
+  }
+  return runPrecheck(currentDeviceSn).then(() => {
+    leaderConnect(resetAttempts)
+    return true
+  })
+}
+
 function scheduleReconnect() {
-  if (!isLeaderTab() || manualClose || !getToken()) {
+  if (!userInitiatedConnect || !currentDeviceSn || !isLeaderTab() || manualClose || !getToken()) {
     return
   }
   if (reconnectAttempts >= MAX_RECONNECT_ATTEMPTS) {
     if (!reconnectExhaustedNotified) {
       reconnectExhaustedNotified = true
-      console.warn(`TSB WebSocket 自动重连已达上限（${MAX_RECONNECT_ATTEMPTS} 次），请手动重连`)
       Message.warning(`WebSocket 自动重连已达上限（${MAX_RECONNECT_ATTEMPTS} 次），请手动重连`)
     }
     broadcastWsStatus(false)
@@ -99,7 +131,13 @@ function scheduleReconnect() {
   }
   reconnectAttempts++
   clearReconnectTimer()
-  reconnectTimer = setTimeout(() => leaderConnect(false), RECONNECT_DELAY)
+  reconnectTimer = setTimeout(() => {
+    runPrecheck(currentDeviceSn).then(() => {
+      leaderConnect(false)
+    }).catch(() => {
+      scheduleReconnect()
+    })
+  }, RECONNECT_DELAY)
 }
 
 function bindSocketEvents(ws, id) {
@@ -128,7 +166,7 @@ function bindSocketEvents(ws, id) {
     }
     socket = null
     broadcastWsStatus(false)
-    if (!manualClose && isLeaderTab() && getToken()) {
+    if (!manualClose && userInitiatedConnect && isLeaderTab() && getToken() && currentDeviceSn) {
       scheduleReconnect()
     }
   }
@@ -142,7 +180,7 @@ function bindSocketEvents(ws, id) {
 
 function leaderConnect(resetAttempts = true) {
   ensureTabCoordinator()
-  if (!isLeaderTab()) {
+  if (!isLeaderTab() || !currentDeviceSn) {
     return
   }
   const token = getToken()
@@ -158,7 +196,7 @@ function leaderConnect(resetAttempts = true) {
   }
   manualClose = false
   const id = ++connectId
-  socket = new WebSocket(buildWsUrl(token))
+  socket = new WebSocket(buildWsUrl(token, currentDeviceSn))
   bindSocketEvents(socket, id)
 }
 
@@ -185,23 +223,43 @@ function leaderSend(cmdType, data) {
   return true
 }
 
-function connect(resetAttempts = true, options = {}) {
+/** 初始化协调器，不自动连接 */
+function connect() {
   ensureWsRouter()
   ensureTabCoordinator()
-  if (options.forceLeader) {
-    resetLeadershipForLogin()
-  } else {
-    reclaimLeadershipIfStale()
-  }
-  if (!isLeaderTab()) {
-    return
-  }
-  leaderConnect(resetAttempts)
+  reclaimLeadershipIfStale()
 }
 
-/** 登录成功后立即尝试建立 WebSocket（新登录抢占 leader，避免多标签页残留锁） */
+/** 登录后不自动连接 */
 function connectAfterLogin() {
-  connect(true, { forceLeader: true })
+  ensureWsRouter()
+  ensureTabCoordinator()
+}
+
+/**
+ * 用户点击设备卡片后：预检通过再建立 WebSocket
+ */
+function connectWithDevice(deviceSn) {
+  if (deviceSn == null || deviceSn === '') {
+    return Promise.reject('请指定设备')
+  }
+  ensureWsRouter()
+  ensureTabCoordinator()
+  reclaimLeadershipIfStale()
+  if (currentDeviceSn != null && currentDeviceSn !== deviceSn) {
+    leaderDisconnectSilently()
+  }
+  currentDeviceSn = deviceSn
+  userInitiatedConnect = true
+  if (!isLeaderTab()) {
+    return Promise.resolve()
+  }
+  return runPrecheck(deviceSn, false).then((bind) => {
+    leaderConnect(true)
+    return bind
+  }).catch((err) => {
+    return Promise.reject(extractErrorMessage(err))
+  })
 }
 
 function disconnect(logout) {
@@ -217,20 +275,34 @@ function disconnect(logout) {
   followerConnectedState = false
   broadcastWsStatus(false)
   if (logout) {
+    currentDeviceSn = null
+    userInitiatedConnect = false
     notifyLogout()
     destroyTabCoordinator()
     tabCoordinatorInited = false
     wsRouterInited = false
-  } else if (!logout) {
+  } else {
     manualClose = false
   }
 }
 
 function reconnect() {
+  if (!currentDeviceSn) {
+    return Promise.reject('请先在首页选择设备')
+  }
   ensureTabCoordinator()
   clearReconnectTimer()
   resetReconnectAttempts()
+  userInitiatedConnect = true
+  if (isLeaderTab()) {
+    return runPrecheck(currentDeviceSn, false).then((bind) => {
+      leaderDisconnectSilently()
+      leaderConnect(true)
+      return bind
+    }).catch((err) => Promise.reject(extractErrorMessage(err)))
+  }
   requestLeaderReconnect()
+  return Promise.resolve()
 }
 
 function isReconnectExhausted() {
@@ -274,9 +346,14 @@ function getReconnectAttempts() {
   return reconnectAttempts
 }
 
+function getCurrentDeviceSn() {
+  return currentDeviceSn
+}
+
 export default {
   connect,
   connectAfterLogin,
+  connectWithDevice,
   disconnect,
   reconnect,
   send,
@@ -285,6 +362,7 @@ export default {
   isConnected,
   isReconnectExhausted,
   getReconnectAttempts,
+  getCurrentDeviceSn,
   notifyConnectSuccess,
   notifyConnectFailed
 }

ruoyi-ui/src/views/app-common/tax/index.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="app-container tax-page">
     <el-alert
-      v-if="!bindInfo.deviceSn"
-      title="当前用户未绑定调试宝设备，无法同步页面数据"
+      v-if="!currentDeviceSn"
+      title="请先在首页选择已登录设备并建立连接"
       type="warning"
       show-icon
       :closable="false"
@@ -13,7 +13,7 @@
         <el-tag :type="wsConnected ? 'success' : 'info'" size="small">
           {{ wsConnected ? 'WebSocket 已连接' : 'WebSocket 未连接' }}
         </el-tag>
-        <span class="bind-text">设备 SN：{{ bindInfo.deviceSn }}</span>
+        <span class="bind-text">设备 SN：{{ currentDeviceSn }}</span>
       </el-col>
       <el-col :span="8" style="text-align: right">
         <el-button size="mini" @click="loadBind">刷新绑定</el-button>
@@ -184,6 +184,9 @@ export default {
     }
   },
   computed: {
+    currentDeviceSn() {
+      return this.$store.getters.tsbCurrentDeviceSn || tsbWebSocket.getCurrentDeviceSn()
+    },
     encryptionText() {
       if (this.form.encryption === 1) return '是'
       if (this.form.encryption === 0) return '否'
@@ -197,7 +200,6 @@ export default {
   },
   created() {
     this.loadBind()
-    tsbWebSocket.connect()
     this._enteredByCreated = true
     this.initPageData()
     this.wsTimer = setInterval(() => {
@@ -219,14 +221,26 @@ export default {
   },
   methods: {
     loadBind() {
-      getTsbWsBind().then(res => {
-        this.bindInfo = res.data || {}
-      }).catch(() => {
+      const deviceSn = this.currentDeviceSn
+      if (!deviceSn) {
         this.bindInfo = {}
+        return
+      }
+      getTsbWsBind(deviceSn).then(res => {
+        this.bindInfo = res.data || { deviceSn }
+      }).catch(() => {
+        this.bindInfo = { deviceSn }
       })
     },
     reconnectWs() {
-      tsbWebSocket.reconnect()
+      const deviceSn = this.currentDeviceSn
+      if (!deviceSn) {
+        this.$message.warning('请先在首页选择设备')
+        return
+      }
+      tsbWebSocket.reconnect().catch(msg => {
+        this.$message.error(msg || '重连失败')
+      })
     },
     /** WebSocket 推送进入：用 data 初始化；手动菜单进入：恢复默认值并下发 */
     initPageData() {

ruoyi-ui/src/views/dashboard/DeviceCard.vue

@@ -0,0 +1,108 @@
+<template>
+  <el-card
+    shadow="hover"
+    class="device-card"
+    :class="{ active, offline, disabled: offline }"
+    @click.native="handleCardClick"
+  >
+    <div class="card-head">
+      <span class="device-sn">SN {{ device.deviceSn || '-' }}</span>
+      <el-tag size="mini" :type="device.lineStatus === 1 ? 'success' : 'info'">
+        {{ device.lineStatus === 1 ? '已登录' : '未登录' }}
+      </el-tag>
+    </div>
+    <div class="card-body">
+      <div class="row"><span class="label">IMEI</span><span class="value">{{ device.imei || '-' }}</span></div>
+      <div class="row"><span class="label">设备状态</span><span class="value">{{ deviceStatusText }}</span></div>
+      <div v-if="device.lineStatus === 1" class="row">
+        <span class="label">登录用户</span>
+        <span class="value">{{ device.onlineUserName || '-' }}</span>
+      </div>
+      <div v-if="device.lineStatus === 1" class="row">
+        <span class="label">心跳时间</span>
+        <span class="value">{{ heartbeatText }}</span>
+      </div>
+    </div>
+    <div v-if="!offline" class="card-foot">
+      <el-button type="primary" size="mini" plain @click.stop="$emit('operate', device)">操作设备</el-button>
+    </div>
+  </el-card>
+</template>
+
+<script>
+export default {
+  name: 'TsbDeviceCard',
+  props: {
+    device: { type: Object, required: true },
+    active: { type: Boolean, default: false },
+    offline: { type: Boolean, default: false }
+  },
+  computed: {
+    deviceStatusText() {
+      if (this.device.status === '0') {
+        return '启用'
+      }
+      if (this.device.status === '1') {
+        return '停用'
+      }
+      return '-'
+    },
+    heartbeatText() {
+      if (!this.device.heartbeatTime) {
+        return '-'
+      }
+      return this.parseTime(this.device.heartbeatTime)
+    }
+  },
+  methods: {
+    handleCardClick() {
+      if (!this.offline) {
+        this.$emit('operate', this.device)
+      }
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.device-card {
+  margin-bottom: 16px;
+  cursor: pointer;
+  transition: border-color 0.2s;
+  &.active {
+    border-color: #409eff;
+  }
+  &.disabled {
+    cursor: default;
+    opacity: 0.85;
+  }
+}
+.card-head {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 12px;
+}
+.device-sn {
+  font-weight: 600;
+  font-size: 15px;
+}
+.card-body .row {
+  display: flex;
+  margin-bottom: 6px;
+  font-size: 13px;
+  line-height: 1.5;
+}
+.label {
+  flex: 0 0 72px;
+  color: #909399;
+}
+.value {
+  flex: 1;
+  word-break: break-all;
+}
+.card-foot {
+  margin-top: 12px;
+  text-align: right;
+}
+</style>

ruoyi-ui/src/views/index.vue

@@ -1,1208 +1,148 @@
 <template>
-  <div class="app-container home">
-    <el-row :gutter="20">
-      <el-col :sm="24" :lg="12" style="padding-left: 20px">
-        <h2>若依后台管理框架</h2>
-        <p>
-          一直想做一款后台管理系统，看了很多优秀的开源项目但是发现没有合适自己的。于是利用空闲休息时间开始自己写一套后台系统。如此有了若依管理系统，她可以用于所有的Web应用程序，如网站管理后台，网站会员中心，CMS，CRM，OA等等，当然，您也可以对她进行深度定制，以做出更强系统。所有前端后台代码封装过后十分精简易上手，出错概率低。同时支持移动客户端访问。系统会陆续更新一些实用功能。
-        </p>
-        <p>
-          <b>当前版本:</b> <span>v{{ version }}</span>
-        </p>
-        <p>
-          <el-tag type="danger">&yen;免费开源</el-tag>
-        </p>
-        <p>
-          <el-button
-            type="primary"
-            size="mini"
-            icon="el-icon-cloudy"
-            plain
-            @click="goTarget('https://gitee.com/y_project/RuoYi-Vue')"
-            >访问码云</el-button
-          >
-          <el-button
-            size="mini"
-            icon="el-icon-s-home"
-            plain
-            @click="goTarget('http://ruoyi.vip')"
-            >访问主页</el-button
-          >
-        </p>
-      </el-col>
-
-      <el-col :sm="24" :lg="12" style="padding-left: 50px">
-        <el-row>
-          <el-col :span="12">
-            <h2>技术选型</h2>
+  <div class="app-container tsb-home">
+    <div class="tsb-home-header">
+      <h2 class="tsb-home-title">调试宝设备</h2>
+    </div>
+
+    <div v-loading="loading">
+      <div v-if="onlineDevices.length" class="section-block">
+        <div class="section-title">
+          <span>已登录设备</span>
+          <el-tag size="mini" type="success">{{ onlineDevices.length }}</el-tag>
+        </div>
+        <el-row :gutter="16">
+          <el-col v-for="item in onlineDevices" :key="'on-' + item.deviceId" :xs="24" :sm="12" :md="8" :lg="6">
+            <device-card :device="item" :active="isActive(item)" @operate="handleOperate" />
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="6">
-            <h4>后端技术</h4>
-            <ul>
-              <li>SpringBoot</li>
-              <li>Spring Security</li>
-              <li>JWT</li>
-              <li>MyBatis</li>
-              <li>Druid</li>
-              <li>Fastjson</li>
-              <li>...</li>
-            </ul>
-          </el-col>
-          <el-col :span="6">
-            <h4>前端技术</h4>
-            <ul>
-              <li>Vue</li>
-              <li>Vuex</li>
-              <li>Element-ui</li>
-              <li>Axios</li>
-              <li>Sass</li>
-              <li>Quill</li>
-              <li>...</li>
-            </ul>
-          </el-col>
-        </el-row>
-      </el-col>
-    </el-row>
-    <el-divider />
-    <el-row :gutter="20">
-      <el-col :xs="24" :sm="24" :md="12" :lg="8">
-        <el-card class="update-log">
-          <div slot="header" class="clearfix">
-            <span>联系信息</span>
-          </div>
-          <div class="body">
-            <p>
-              <i class="el-icon-s-promotion"></i> 官网：<el-link
-                href="http://www.ruoyi.vip"
-                target="_blank"
-                >http://www.ruoyi.vip</el-link
-              >
-            </p>
-            <p>
-              <i class="el-icon-user-solid"></i> QQ群：<s> 满937441 </s> <s> 满887144332 </s>
-              <s> 满180251782 </s> <s> 满104180207 </s> <s> 满186866453 </s> <s> 满201396349 </s>
-              <s> 满101456076 </s> <s> 满101539465 </s> <s> 满264312783 </s> <s> 满167385320 </s> 
-              <s> 满104748341 </s> <s> 满160110482 </s> <s> 满170801498 </s> <s> 满108482800 </s> 
-              <s> 满101046199 </s> <s> 满136919097 </s> <s> 满143961921 </s> <s> 满174951577 </s> 
-              <s> 满161281055 </s> <s> 满138988063 </s> <s> 满151450850 </s> <s> 满224622315 </s>
-              <s> 满287842588 </s> <s> 满187944233 </s> <s> 满228578329 </s> <s> 满191164766 </s>
-              <s> 满174569686 </s> <a href="http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=M9y5NjAl44lAL_Vh2crmEehZU_PMU6KS&authKey=ZSDz8hEREWSaPuxQV3gEwqGIaGjfRNnkB4rJjf0IvXhrSUGSGwQFmBA%2Boe8HFxyl&noverify=0&group_code=127358632" target="_blank">127358632</a>
-            </p>
-            <p>
-              <i class="el-icon-chat-dot-round"></i> 微信：<a
-                href="javascript:;"
-                >/ *若依</a
-              >
-            </p>
-            <p>
-              <i class="el-icon-money"></i> 支付宝：<a
-                href="javascript:;"
-                class="支付宝信息"
-                >/ *若依</a
-              >
-            </p>
-          </div>
-        </el-card>
-      </el-col>
-      <el-col :xs="24" :sm="24" :md="12" :lg="8">
-        <el-card class="update-log">
-          <div slot="header" class="clearfix">
-            <span>更新日志</span>
-          </div>
-          <el-collapse accordion>
-            <el-collapse-item title="v3.9.2 - 2026-03-26">
-              <ol>
-                <li>新增锁定屏幕功能</li>
-                <li>首页新增通知公告消息提醒</li>
-                <li>添加持久化标签页开关功能</li>
-                <li>菜单搜索支持文本高亮&数量提示</li>
-                <li>添加菜单路由地址和名称的校验规则</li>
-                <li>字典类型列表新增抽屉效果详细信息</li>
-                <li>升级axios到最新版本0.30.3</li>
-                <li>使用SpringDoc代替Swagger</li>
-                <li>升级spring-boot到最新版本4.0.3</li>
-                <li>升级yauaa到最新版本8.1.0</li>
-                <li>升级oshi到最新版本6.10.0</li>
-                <li>升级druid到最新版本1.2.28</li>
-                <li>升级fastjson到最新版2.0.61</li>
-                <li>升级pagehelper到最新版2.1.1</li>
-                <li>优化操作日志详细页面</li>
-                <li>更新在线IP地址查询url</li>
-                <li>部门管理支持批量保存排序</li>
-                <li>菜单管理支持批量保存排序</li>
-                <li>菜单管理列表新增类型显示</li>
-                <li>代码生成模板支持TypeScript版本</li>
-                <li>优化菜单主题风格显示</li>
-                <li>优化topbar顶部菜单样式</li>
-                <li>优化点击任务名称查看详细</li>
-                <li>优化字典类型属性提醒说明</li>
-                <li>优化防重提交间隔时间可自定义</li>
-                <li>优化页签功能&支持全屏按钮操作</li>
-                <li>优化RightToolbar搜索栏切换动画</li>
-                <li>修复Excel自定义格式样式污染问题</li>
-                <li>优化isAdmin方法统一到SecurityUtils</li>
-                <li>优化定时任务详情页展示&补充执行时间字段</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.9.1 - 2025-12-18">
-              <ol>
-                <li>支持防盗链功能</li>
-                <li>菜单导航设置支持纯顶部</li>
-                <li>使用yauaa代替bitwalker</li>
-                <li>用户头像更换后移除旧头像文件</li>
-                <li>支持Excel导出对象的多个子列表</li>
-                <li>升级oshi到最新版本6.9.1</li>
-                <li>升级druid到最新版本1.2.27</li>
-                <li>升级fastjson到最新版2.0.60</li>
-                <li>升级spring-security到5.7.14</li>
-                <li>升级tomcat到最新版本9.0.112</li>
-                <li>升级commons.io到最新版本2.21.0</li>
-                <li>用户导入添加验证提示</li>
-                <li>显示列信息支持对象格式</li>
-                <li>忽略用户密码字段的JSON序列化</li>
-                <li>网页标题设置新增SET_TITLE方法</li>
-                <li>自动识别json对象白名单配置范围缩小</li>
-                <li>登录/注册页面底部版权信息修改为读取配置</li>
-                <li>修复用户归属部门无法修改为空问题</li>
-                <li>修复固定头部时出现的导航栏偏移问题</li>
-                <li>修复v3时间控件between选择后清空报错问题</li>
-                <li>修复comboReadDict属性下多个sheet出现的报错</li>
-                <li>修复表单构建移除所有控件后切换路由回来空白问题</li>
-                <li>优化布局设置显示</li>
-                <li>优化字典组件值宽松匹配</li>
-                <li>优化获取字典类型值的方法</li>
-                <li>优化生成代码下载的zip文件名</li>
-                <li>优化日志记录参数拼装提升效率</li>
-                <li>优化导入文件检查标题行不能为空</li>
-                <li>优化表单构建关闭页签销毁复制插件</li>
-                <li>优化Excel统计行数值的单元格样式显示</li>
-                <li>优化数据权限控制逻辑，放开permission限制</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.9.0 - 2025-05-28">
-              <ol>
-                <li>优化菜单搜索查询页</li>
-                <li>导航栏显示昵称&设置</li>
-                <li>菜单管理新增路由名称</li>
-                <li>添加底部版权信息&开关</li>
-                <li>分配角色禁用不允许勾选</li>
-                <li>Excel导入导出支持多图片</li>
-                <li>添加页签图标显示开关功能</li>
-                <li>上传组件新增拖动排序属性</li>
-                <li>显隐列组件支持全选/全不选</li>
-                <li>初始密码支持自定义修改策略</li>
-                <li>账号密码支持自定义更新周期</li>
-                <li>代码生成列表支持按时间排序</li>
-                <li>支持富文本复制粘贴图片上传至url</li>
-                <li>支持文件&图片组件自定义地址&参数</li>
-                <li>升级tomcat到最新版本9.0.105</li>
-                <li>升级oshi到最新版本6.8.1</li>
-                <li>升级fastjson到最新版2.0.57</li>
-                <li>升级commons.io到最新版本2.19.0</li>
-                <li>package.json移除runjs依赖</li>
-                <li>package.json移除eslint依赖</li>
-                <li>package.json移除vue-meta依赖</li>
-                <li>修复代码生成主子表校验必填失效问题</li>
-                <li>优化前端树结构性能问题</li>
-                <li>优化前端处理路由函数代码</li>
-                <li>优化文件上传组件新增类型</li>
-                <li>优化顶部菜单搜索栏为多层级显示</li>
-                <li>优化文件&图片上传组件新增disabled属性</li>
-                <li>优化空指针异常时无法获取错误信息问题</li>
-                <li>优化定时任务字符包含多个括号导致数据错误</li>
-                <li>优化登录&注册页表头使用VUE_APP_TITLE配置值</li>
-                <li>优化导出Excel日期格式双击离开后与设定的格式不一致问题</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.8.9 - 2024-12-30">
-              <ol>
-                <li>用户管理支持分栏拖动</li>
-                <li>修改主题样式本地读取</li>
-                <li>用户头像http(s)链接支持</li>
-                <li>用户管理过滤掉已禁用部门</li>
-                <li>支持自定义显示Excel属性列</li>
-                <li>操作日志记录DELETE请求参数</li>
-                <li>白名单支持对通配符路径匹配</li>
-                <li>校检文件名是否包含特殊字符</li>
-                <li>代码生成创建表屏蔽违规的字符</li>
-                <li>菜单面包屑导航支持多层级显示</li>
-                <li>Excel注解支持wrapText是否允许内容换行</li>
-                <li>代码生成新增配置是否允许文件覆盖到本地</li>
-                <li>修复角色禁用权限不失效问题</li>
-                <li>修复代码生成上级菜单显示问题</li>
-                <li>修复导出子列表对象只能在最后的问题</li>
-                <li>修复TopNav无法正确获取active的问题</li>
-                <li>修复默认关闭Tags-Views内链页面打不开</li>
-                <li>升级oshi到最新版本6.6.5</li>
-                <li>升级tomcat到最新版本9.0.96</li>
-                <li>升级fastjson到最新版2.0.53</li>
-                <li>升级logback到最新版本1.2.13</li>
-                <li>升级spring-framework到最新版本5.3.39</li>
-                <li>升级quill到最新版本2.0.2</li>
-                <li>升级axios到最新版本0.28.1</li>
-                <li>优化身份证脱敏正则</li>
-                <li>优化权限更新后同步缓存</li>
-                <li>优化查询时间范围日期格式</li>
-                <li>优化参数键值更换为多行文本</li>
-                <li>优化导入带标题文件关闭清理</li>
-                <li>优化上传图片带域名不增加前缀</li>
-                <li>优化特殊字符密码修改失败问题</li>
-                <li>优化无用户编号不校验数据权限</li>
-                <li>优化TopNav内链菜单点击没有高亮</li>
-                <li>优化菜单管理切换Mini布局错乱问题</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.8.8 - 2024-06-30">
-              <ol>
-                <li>菜单管理新增路由名称</li>
-                <li>新增数据脱敏过滤注解</li>
-                <li>用户密码新增非法字符验证</li>
-                <li>限制用户操作数据权限范围</li>
-                <li>代码生成新增创建表结构功能</li>
-                <li>定时任务白名单配置范围缩小</li>
-                <li>优化代码生成主子表关联查询方式</li>
-                <li>Excel注解新增属性comboReadDict</li>
-                <li>Excel注解ColumnType类型新增文本</li>
-                <li>新增国际化资源文件配置</li>
-                <li>升级oshi到最新版本6.6.1</li>
-                <li>升级druid到最新版本1.2.23</li>
-                <li>升级core-js到最新版本3.37.1</li>
-                <li>更新HttpUtils中的User-Agent</li>
-                <li>更新compressionPlugin到6.1.2以兼容node18+</li>
-                <li>升级spring-security到安全版本，防止漏洞风险</li>
-                <li>升级spring-framework到安全版本，防止漏洞风险</li>
-                <li>优化自定义XSS注解匹配方式</li>
-                <li>优化缓存监控键名列表排序显示</li>
-                <li>优化定时任务日志默认按时间排序</li>
-                <li>优化默认文件大小超过2G无效的问题</li>
-                <li>优化查表特殊字符使用反斜杠进行转义</li>
-                <li>优化定时任务cron表达式小时配置显示错误问题</li>
-                <li>优化多个自定数据权限使用in查询,避免多次拼接</li>
-                <li>优化导入Excel时设置dictType属性重复查缓存问题</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.8.7 - 2023-12-08">
-              <ol>
-                <li>操作日志记录部门名称</li>
-                <li>全局数据存储用户编号</li>
-                <li>新增编程式判断资源访问权限</li>
-                <li>操作日志列表新增IP地址查询</li>
-                <li>定时任务新增页去除状态选项</li>
-                <li>代码生成支持选择前端模板类型</li>
-                <li>显隐列组件支持复选框弹出类型</li>
-                <li>通用排序属性orderBy参数限制长度</li>
-                <li>Excel自定义数据处理器增加单元格/工作簿对象</li>
-                <li>升级oshi到最新版本6.4.8</li>
-                <li>升级druid到最新版本1.2.20</li>
-                <li>升级fastjson到最新版2.0.43</li>
-                <li>升级pagehelper到最新版1.4.7</li>
-                <li>升级commons.io到最新版本2.13.0</li>
-                <li>升级element-ui到最新版本2.15.14</li>
-                <li>修复五级路由缓存无效问题</li>
-                <li>修复外链带端口出现的异常</li>
-                <li>修复树模板父级编码变量错误</li>
-                <li>修复字典表详情页面搜索问题</li>
-                <li>修复内链iframe没有传递参数问题</li>
-                <li>修复自定义字典样式不生效的问题</li>
-                <li>修复字典缓存删除方法参数错误问题</li>
-                <li>修复Excel导入数据临时文件无法删除问题</li>
-                <li>修复未登录带参数访问成功后参数丢失问题</li>
-                <li>修复HeaderSearch组件跳转query参数丢失问题</li>
-                <li>修复代码生成导入后必填项与数据库不匹配问题</li>
-                <li>修复Excels导入时无法获取到dictType字典值问题</li>
-                <li>优化下载zip方法新增遮罩层</li>
-                <li>优化头像上传参数新增文件名称</li>
-                <li>优化字典标签支持自定义分隔符</li>
-                <li>优化菜单管理类型为按钮状态可选</li>
-                <li>优化前端防重复提交数据大小限制</li>
-                <li>优化TopNav菜单没有图标svg不显示</li>
-                <li>优化数字金额大写转换精度丢失问题</li>
-                <li>优化富文本Editor组件检验图片格式</li>
-                <li>优化页签在Firefox浏览器被遮挡的问题</li>
-                <li>优化个人中心/基本资料修改时数据显示问题</li>
-                <li>优化缓存监控图表支持跟随屏幕大小自适应调整</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.8.6 - 2023-06-30">
-              <ol>
-                <li>支持登录IP黑名单限制</li>
-                <li>新增监控页面图标显示</li>
-                <li>操作日志新增消耗时间属性</li>
-                <li>屏蔽定时任务bean违规的字符</li>
-                <li>日志管理使用索引提升查询性能</li>
-                <li>日志注解支持排除指定的请求参数</li>
-                <li>支持自定义隐藏属性列过滤子对象</li>
-                <li>升级oshi到最新版本6.4.3</li>
-                <li>升级druid到最新版本1.2.16</li>
-                <li>升级fastjson到最新版2.0.34</li>
-                <li>升级spring-boot到最新版本2.5.15</li>
-                <li>升级element-ui到最新版本2.15.13</li>
-                <li>移除apache/commons-fileupload依赖</li>
-                <li>修复页面切换时布局错乱的问题</li>
-                <li>修复匿名注解Anonymous空指针问题</li>
-                <li>修复路由跳转被阻止时内部产生报错信息问题</li>
-                <li>修复isMatchedIp的参数判断产生空指针的问题</li>
-                <li>修复用户多角色数据权限可能出现权限抬升的情况</li>
-                <li>修复开启TopNav后一级菜单路由参数设置无效问题</li>
-                <li>修复DictTag组件value没有匹配的值时则展示value</li>
-                <li>优化文件下载出现的异常</li>
-                <li>优化选择图标组件高亮回显</li>
-                <li>优化弹窗后导航栏偏移的问题</li>
-                <li>优化修改密码日志存储明文问题</li>
-                <li>优化页签栏关闭其他出现的异常问题</li>
-                <li>优化页签关闭左侧选项排除首页选项</li>
-                <li>优化关闭当前tab页跳转最右侧tab页</li>
-                <li>优化缓存列表清除操作提示不变的问题</li>
-                <li>优化字符未使用下划线不进行驼峰式处理</li>
-                <li>优化用户导入更新时需获取用户编号问题</li>
-                <li>优化侧边栏的平台标题与VUE_APP_TITLE保持同步</li>
-                <li>优化导出Excel时设置dictType属性重复查缓存问题</li>
-                <li>连接池Druid支持新的配置connectTimeout和socketTimeout</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.8.5 - 2023-01-01">
-              <ol>
-                <li>定时任务违规的字符</li>
-                <li>重置时取消部门选中</li>
-                <li>新增返回警告消息提示</li>
-                <li>忽略不必要的属性数据返回</li>
-                <li>修改参数键名时移除前缓存配置</li>
-                <li>导入更新用户数据前校验数据权限</li>
-                <li>兼容Excel下拉框内容过多无法显示的问题</li>
-                <li>升级echarts到最新版本5.4.0</li>
-                <li>升级core-js到最新版本3.25.3</li>
-                <li>升级oshi到最新版本6.4.0</li>
-                <li>升级kaptcha到最新版2.3.3</li>
-                <li>升级druid到最新版本1.2.15</li>
-                <li>升级fastjson到最新版2.0.20</li>
-                <li>升级pagehelper到最新版1.4.6</li>
-                <li>优化弹窗内容过多展示不全问题</li>
-                <li>优化swagger-ui静态资源使用缓存</li>
-                <li>开启TopNav没有子菜单隐藏侧边栏</li>
-                <li>删除fuse无效选项maxPatternLength</li>
-                <li>优化导出对象的子列表为空会出现[]问题</li>
-                <li>优化编辑头像时透明部分会变成黑色问题</li>
-                <li>优化小屏幕上修改头像界面布局错位的问题</li>
-                <li>修复代码生成勾选属性无效问题</li>
-                <li>修复文件上传组件格式验证问题</li>
-                <li>修复回显数据字典数组异常问题</li>
-                <li>修复sheet超出最大行数异常问题</li>
-                <li>修复Log注解GET请求记录不到参数问题</li>
-                <li>修复调度日志点击多次数据不变化的问题</li>
-                <li>修复主题颜色在Drawer组件不会加载问题</li>
-                <li>修复文件名包含特殊字符的文件无法下载问题</li>
-                <li>修复table中更多按钮切换主题色未生效修复问题</li>
-                <li>修复某些特性的环境生成代码变乱码TXT文件问题</li>
-                <li>修复代码生成图片/文件/单选时选择必填无法校验问题</li>
-                <li>修复某些特性的情况用户编辑对话框中角色和部门无法修改问题</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.8.4 - 2022-09-26">
-              <ol>
-                <li>数据逻辑删除不进行唯一验证</li>
-                <li>Excel注解支持导出对象的子列表方法</li>
-                <li>Excel注解支持自定义隐藏属性列</li>
-                <li>Excel注解支持backgroundColor属性设置背景色</li>
-                <li>支持配置密码最大错误次数/锁定时间</li>
-                <li>登录日志新增解锁账户功能</li>
-                <li>通用下载方法新增config配置选项</li>
-                <li>支持多权限字符匹配角色数据权限</li>
-                <li>页面内嵌iframe切换tab不刷新数据</li>
-                <li>操作日志记录支持排除敏感属性字段</li>
-                <li>修复多文件上传报错出现的异常问题</li>
-                <li>修复图片预览组件src属性为null值控制台报错问题</li>
-                <li>升级oshi到最新版本6.2.2</li>
-                <li>升级fastjson到最新版2.0.14</li>
-                <li>升级pagehelper到最新版1.4.3</li>
-                <li>升级core-js到最新版本3.25.2</li>
-                <li>升级element-ui到最新版本2.15.10</li>
-                <li>优化任务过期不执行调度</li>
-                <li>优化字典数据使用store存取</li>
-                <li>优化修改资料头像被覆盖的问题</li>
-                <li>优化修改用户登录账号重复验证</li>
-                <li>优化代码生成同步后值NULL问题</li>
-                <li>优化定时任务支持执行父类方法</li>
-                <li>优化用户个人信息接口防止修改部门</li>
-                <li>优化布局设置使用el-drawer抽屉显示</li>
-                <li>优化没有权限的用户编辑部门缺少数据</li>
-                <li>优化日志注解记录限制请求地址的长度</li>
-                <li>优化excel/scale属性导出单元格数值类型</li>
-                <li>优化日志操作中重置按钮时重复查询的问题</li>
-                <li>优化多个相同角色数据导致权限SQL重复问题</li>
-                <li>优化表格上右侧工具条（搜索按钮显隐&右侧样式凸出）</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.8.3 - 2022-06-27">
-              <ol>
-                <li>新增缓存列表菜单功能</li>
-                <li>代码生成树表新增(展开/折叠)</li>
-                <li>Excel注解支持color字体颜色</li>
-                <li>新增Anonymous匿名访问不鉴权注解</li>
-                <li>用户头像上传限制只能为图片格式</li>
-                <li>接口使用泛型使其看到响应属性字段</li>
-                <li>检查定时任务bean所在包名是否为白名单配置</li>
-                <li>添加页签openPage支持传递参数</li>
-                <li>用户缓存信息添加部门ancestors祖级列表</li>
-                <li>升级element-ui到最新版本2.15.8</li>
-                <li>升级oshi到最新版本6.1.6</li>
-                <li>升级druid到最新版本1.2.11</li>
-                <li>升级fastjson到最新版2.0.8</li>
-                <li>升级spring-boot到最新版本2.5.14</li>
-                <li>降级jsencrypt版本兼容IE浏览器</li>
-                <li>删除多余的salt字段</li>
-                <li>新增获取不带后缀文件名称方法</li>
-                <li>新增获取配置文件中的属性值方法</li>
-                <li>新增内容编码/解码方便插件集成使用</li>
-                <li>字典类型必须以字母开头，且只能为（小写字母，数字，下滑线）</li>
-                <li>优化设置分页参数默认值</li>
-                <li>优化对空字符串参数处理的过滤</li>
-                <li>优化显示顺序orderNum类型为整型</li>
-                <li>优化表单构建按钮不显示正则校验</li>
-                <li>优化字典数据回显样式下拉框显示值</li>
-                <li>优化R响应成功状态码与全局保持一致</li>
-                <li>优化druid开启wall过滤器出现的异常问题</li>
-                <li>优化用户管理左侧树型组件增加选中高亮保持</li>
-                <li>优化新增用户与角色信息&用户与岗位信息逻辑</li>
-                <li>优化默认不启用压缩文件缓存防止node_modules过大</li>
-                <li>修复字典数据显示不全问题</li>
-                <li>修复操作日志查询类型条件为0时会查到所有数据</li>
-                <li>修复Excel注解prompt/combo同时使用不生效问题</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.8.2 - 2022-04-01">
-              <ol>
-                <li>前端支持设置是否需要防止数据重复提交</li>
-                <li>开启TopNav没有子菜单情况隐藏侧边栏</li>
-                <li>侧边栏菜单名称过长悬停显示标题</li>
-                <li>用户访问控制时校验数据权限，防止越权</li>
-                <li>导出Excel时屏蔽公式，防止CSV注入风险</li>
-                <li>组件ImagePreview支持多图预览显示</li>
-                <li>组件ImageUpload支持多图同时选择上传</li>
-                <li>组件FileUpload支持多文件同时选择上传</li>
-                <li>服务监控新增运行参数信息显示</li>
-                <li>定时任务目标字符串过滤特殊字符</li>
-                <li>定时任务目标字符串验证包名白名单</li>
-                <li>代码生成列表图片支持预览</li>
-                <li>代码生成编辑修改打开新页签</li>
-                <li>代码生成新增Java类型Boolean</li>
-                <li>代码生成子表支持日期/字典配置</li>
-                <li>代码生成同步保留必填/类型选项</li>
-                <li>升级oshi到最新版本6.1.2</li>
-                <li>升级fastjson到最新版1.2.80</li>
-                <li>升级pagehelper到最新版1.4.1</li>
-                <li>升级spring-boot到最新版本2.5.11</li>
-                <li>升级spring-boot-mybatis到最新版2.2.2</li>
-                <li>添加遗漏的分页参数合理化属性</li>
-                <li>修改npm即将过期的注册源地址</li>
-                <li>修复分页组件请求两次问题</li>
-                <li>修复通用文件下载接口跨域问题</li>
-                <li>修复Xss注解字段值为空时的异常问题</li>
-                <li>修复选项卡点击右键刷新丢失参数问题</li>
-                <li>修复表单清除元素位置未垂直居中问题</li>
-                <li>修复服务监控中运行参数显示条件错误</li>
-                <li>修复导入Excel时字典字段类型为Long转义为空问题</li>
-                <li>修复登录超时刷新页面跳转登录页面还提示重新登录问题</li>
-                <li>优化加载字典缓存数据</li>
-                <li>优化IP地址获取到多个的问题</li>
-                <li>优化任务队列满时任务拒绝策略</li>
-                <li>优化文件上传兼容Weblogic环境</li>
-                <li>优化定时任务默认保存到内存中执行</li>
-                <li>优化部门修改缩放后出现的错位问题</li>
-                <li>优化Excel格式化不同类型的日期对象</li>
-                <li>优化菜单表关键字导致的插件报错问题</li>
-                <li>优化Oracle用户头像列为空时不显示问题</li>
-                <li>优化页面若未匹配到字典标签则返回原字典值</li>
-                <li>优化修复登录失效后多次请求提示多次弹窗问题</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.8.1 - 2022-01-01">
-              <ol>
-                <li>新增Vue3前端代码生成模板</li>
-                <li>新增图片预览组件</li>
-                <li>新增压缩插件实现打包Gzip</li>
-                <li>自定义xss校验注解实现</li>
-                <li>自定义文字复制剪贴指令</li>
-                <li>代码生成预览支持复制内容</li>
-                <li>路由支持单独配置菜单或角色权限</li>
-                <li>用户管理部门查询选择节点后分页参数初始</li>
-                <li>修复用户分配角色属性错误</li>
-                <li>修复打包后字体图标偶现的乱码问题</li>
-                <li>修复菜单管理重置表单出现的错误</li>
-                <li>修复版本差异导致的懒加载报错问题</li>
-                <li>修复Cron组件中周回显问题</li>
-                <li>修复定时任务多参数逗号分隔的问题</li>
-                <li>修复根据ID查询列表可能出现的主键溢出问题</li>
-                <li>修复tomcat配置参数已过期问题</li>
-                <li>升级clipboard到最新版本2.0.8</li>
-                <li>升级oshi到最新版本v5.8.6</li>
-                <li>升级fastjson到最新版1.2.79</li>
-                <li>升级spring-boot到最新版本2.5.8</li>
-                <li>升级log4j2到2.17.1，防止漏洞风险</li>
-                <li>优化下载解析blob异常提示</li>
-                <li>优化代码生成字典组重复问题</li>
-                <li>优化查询用户的角色组&岗位组代码</li>
-                <li>优化定时任务cron表达式小时设置24</li>
-                <li>优化用户导入提示溢出则显示滚动条</li>
-                <li>优化防重复提交标识组合为(key+url+header)</li>
-                <li>优化分页方法设置成通用方便灵活调用</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.8.0 - 2021-12-01">
-              <ol>
-                <li>新增配套并同步的Vue3前端版本</li>
-                <li>新增通用方法简化模态/缓存/下载/权限/页签使用</li>
-                <li>优化导出数据/使用通用下载方法</li>
-                <li>Excel注解支持自定义数据处理器</li>
-                <li>Excel注解支持导入导出标题信息</li>
-                <li>Excel导入支持@Excels注解</li>
-                <li>新增组件data-dict，简化数据字典使用</li>
-                <li>新增Jaxb依赖，防止jdk8以上出现的兼容错误</li>
-                <li>生产环境使用路由懒加载提升页面响应速度</li>
-                <li>修复五级以上菜单出现的404问题</li>
-                <li>防重提交注解支持配置间隔时间/提示消息</li>
-                <li>日志注解新增是否保存响应参数</li>
-                <li>任务屏蔽违规字符&参数忽略双引号中的逗号</li>
-                <li>升级SpringBoot到最新版本2.5.6</li>
-                <li>升级pagehelper到最新版1.4.0</li>
-                <li>升级spring-boot-mybatis到最新版2.2.0</li>
-                <li>升级oshi到最新版本v5.8.2</li>
-                <li>升级druid到最新版1.2.8</li>
-                <li>升级velocity到最新版本2.3</li>
-                <li>升级fastjson到最新版1.2.78</li>
-                <li>升级axios到最新版本0.24.0</li>
-                <li>升级dart-sass到版本1.32.13</li>
-                <li>升级core-js到最新版本3.19.1</li>
-                <li>升级jsencrypt到最新版本3.2.1</li>
-                <li>升级js-cookie到最新版本3.0.1</li>
-                <li>升级file-saver到最新版本2.0.5</li>
-                <li>升级sass-loader到最新版本10.1.1</li>
-                <li>升级element-ui到最新版本2.15.6</li>
-                <li>新增sendGet无参请求方法</li>
-                <li>禁用el-tag组件的渐变动画</li>
-                <li>代码生成点击预览重置激活tab</li>
-                <li>AjaxResult重写put方法，以方便链式调用</li>
-                <li>优化登录/验证码请求headers不设置token</li>
-                <li>优化用户个人信息接口防止修改用户名</li>
-                <li>优化Cron表达式生成器关闭时销毁避免缓存</li>
-                <li>优化注册成功提示消息类型success</li>
-                <li>优化aop语法，使用spring自动注入注解</li>
-                <li>优化记录登录信息，移除不必要的修改</li>
-                <li>优化mybatis全局默认的执行器</li>
-                <li>优化Excel导入图片可能出现的异常</li>
-                <li>修复代码生成模板主子表删除缺少事务</li>
-                <li>修复日志记录可能出现的转换异常</li>
-                <li>修复代码生成复选框字典遗漏问题</li>
-                <li>修复关闭xss功能导致可重复读RepeatableFilter失效</li>
-                <li>修复字符串无法被反转义问题</li>
-                <li>修复后端主子表代码模板方法名生成错误问题</li>
-                <li>修复xss过滤后格式出现的异常</li>
-                <li>修复swagger没有指定dataTypeClass导致启动出现warn日志</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.7.0 - 2021-09-13">
-              <ol>
-                <li>参数管理支持配置验证码开关</li>
-                <li>新增是否开启用户注册功能</li>
-                <li>定时任务支持在线生成cron表达式</li>
-                <li>菜单管理支持配置路由参数</li>
-                <li>支持自定义注解实现接口限流</li>
-                <li>Excel注解支持Image图片导入</li>
-                <li>自定义弹层溢出滚动样式</li>
-                <li>自定义可拖动弹窗宽度指令</li>
-                <li>自定义可拖动弹窗高度指令</li>
-                <li>修复任意账户越权问题</li>
-                <li>修改时检查用户数据权限范围</li>
-                <li>修复保存配置主题颜色失效问题</li>
-                <li>新增暗色菜单风格主题</li>
-                <li>菜单&部门新增展开/折叠功能</li>
-                <li>页签新增关闭左侧&添加图标</li>
-                <li>顶部菜单排除隐藏的默认路由</li>
-                <li>顶部菜单同步系统主题样式</li>
-                <li>跳转路由高亮相对应的菜单栏</li>
-                <li>代码生成主子表多选行数据</li>
-                <li>日期范围支持添加多组</li>
-                <li>升级element-ui到最新版本2.15.5</li>
-                <li>升级oshi到最新版本v5.8.0</li>
-                <li>升级commons.io到最新版本v2.11.0</li>
-                <li>定时任务屏蔽ldap远程调用</li>
-                <li>定时任务屏蔽http(s)远程调用</li>
-                <li>补充定时任务表字段注释</li>
-                <li>定时任务对检查异常进行事务回滚</li>
-                <li>启用父部门状态排除顶级节点</li>
-                <li>富文本新增上传文件大小限制</li>
-                <li>默认首页使用keep-alive缓存</li>
-                <li>修改代码生成字典回显样式</li>
-                <li>自定义分页合理化传入参数</li>
-                <li>修复字典组件值为整形不显示问题</li>
-                <li>修复定时任务日志执行状态显示</li>
-                <li>角色&菜单新增字段属性提示信息</li>
-                <li>修复角色分配用户页面参数类型错误提醒</li>
-                <li>优化布局设置动画特效</li>
-                <li>优化异常处理信息</li>
-                <li>优化错误token导致的解析异常</li>
-                <li>密码框新增显示切换密码图标</li>
-                <li>定时任务新增更多操作</li>
-                <li>更多操作按钮添加权限控制</li>
-                <li>导入用户样式优化</li>
-                <li>提取通用方法到基类控制器</li>
-                <li>优化使用权限工具获取用户信息</li>
-                <li>优化用户不能删除自己</li>
-                <li>优化XSS跨站脚本过滤</li>
-                <li>优化代码生成模板</li>
-                <li>验证码默认20s超时</li>
-                <li>BLOB下载时清除URL对象引用</li>
-                <li>代码生成导入表按创建时间排序</li>
-                <li>修复代码生成页面数据编辑保存之后总是跳转第一页的问题</li>
-                <li>修复带safari浏览器无法格式化utc日期格式yyyy-MM-dd'T'HH:mm:ss.SSS问题</li>
-                <li>多图上传组件移除多余的api地址&验证失败导致图片删除问题&无法删除相应图片修复</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.6.0 - 2021-07-12">
-              <ol>
-                <li>角色管理新增分配用户功能</li>
-                <li>用户管理新增分配角色功能</li>
-                <li>日志列表支持排序操作</li>
-                <li>优化参数&字典缓存操作</li>
-                <li>系统布局配置支持动态标题开关</li>
-                <li>菜单路由配置支持内链访问</li>
-                <li>默认访问后端首页新增提示语</li>
-                <li>富文本默认上传返回url类型</li>
-                <li>新增自定义弹窗拖拽指令</li>
-                <li>全局注册常用通用组件</li>
-                <li>全局挂载字典标签组件</li>
-                <li>ImageUpload组件支持多图片上传</li>
-                <li>FileUpload组件支持多文件上传</li>
-                <li>文件上传组件添加数量限制属性</li>
-                <li>富文本编辑组件添加类型属性</li>
-                <li>富文本组件工具栏配置视频</li>
-                <li>封装通用iframe组件</li>
-                <li>限制超级管理员不允许操作</li>
-                <li>用户信息长度校验限制</li>
-                <li>分页组件新增pagerCount属性</li>
-                <li>添加bat脚本执行应用</li>
-                <li>升级oshi到最新版本v5.7.4</li>
-                <li>升级element-ui到最新版本2.15.2</li>
-                <li>升级pagehelper到最新版1.3.1</li>
-                <li>升级commons.io到最新版本v2.10.0</li>
-                <li>升级commons.fileupload到最新版本v1.4</li>
-                <li>升级swagger到最新版本v3.0.0</li>
-                <li>修复关闭confirm提示框控制台报错问题</li>
-                <li>修复存在的SQL注入漏洞问题</li>
-                <li>定时任务屏蔽rmi远程调用</li>
-                <li>修复用户搜索分页变量错误</li>
-                <li>修复导出角色数据范围翻译缺少仅本人</li>
-                <li>修复表单构建选择下拉选择控制台报错问题</li>
-                <li>优化图片工具类读取文件</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.5.0 - 2021-05-25">
-              <ol>
-                <li>新增菜单导航显示风格TopNav（false为左侧导航菜单，true为顶部导航菜单）</li>
-                <li>布局设置支持保存&重置配置</li>
-                <li>修复树表数据显示不全&加载慢问题</li>
-                <li>新增IE浏览器版本过低提示页面</li>
-                <li>用户登录后记录最后登录IP&时间</li>
-                <li>页面导出按钮点击之后添加遮罩</li>
-                <li>富文本编辑器支持自定义上传地址</li>
-                <li>富文本编辑组件新增readOnly属性</li>
-                <li>页签TagsView新增关闭右侧功能</li>
-                <li>显隐列组件加载初始默认隐藏列</li>
-                <li>关闭头像上传窗口还原默认图片</li>
-                <li>个人信息添加手机&邮箱重复验证</li>
-                <li>代码生成模板导出按钮点击后添加遮罩</li>
-                <li>代码生成模板树表操作列添加新增按钮</li>
-                <li>代码生成模板修复主子表字段重名问题</li>
-                <li>升级fastjson到最新版1.2.76</li>
-                <li>升级druid到最新版本v1.2.6</li>
-                <li>升级mybatis到最新版3.5.6 阻止远程代码执行漏洞</li>
-                <li>升级oshi到最新版本v5.6.0</li>
-                <li>velocity剔除commons-collections版本，防止3.2.1版本的反序列化漏洞</li>
-                <li>数据监控页默认账户密码防止越权访问</li>
-                <li>修复firefox下表单构建拖拽会新打卡一个选项卡</li>
-                <li>修正后端导入表权限标识</li>
-                <li>修正前端操作日志&登录日志权限标识</li>
-                <li>设置Redis配置HashKey序列化</li>
-                <li>删除操作日志记录信息</li>
-                <li>上传媒体类型添加视频格式</li>
-                <li>修复请求形参未传值记录日志异常问题</li>
-                <li>优化xss校验json请求条件</li>
-                <li>树级结构更新子节点使用replaceFirst</li>
-                <li>优化ExcelUtil空值处理</li>
-                <li>日志记录过滤BindingResult对象，防止异常</li>
-                <li>修改主题后mini类型按钮无效问题</li>
-                <li>优化通用下载完成后删除节点</li>
-                <li>通用Controller添加响应返回消息</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.4.0 - 2021-02-22">
-              <ol>
-                <li>代码生成模板支持主子表</li>
-                <li>表格右侧工具栏组件支持显隐列</li>
-                <li>图片组件添加预览&移除功能</li>
-                <li>Excel注解支持Image图片导出</li>
-                <li>操作按钮组调整为朴素按钮样式</li>
-                <li>代码生成支持文件上传组件</li>
-                <li>代码生成日期控件区分范围</li>
-                <li>代码生成数据库文本类型生成表单文本域</li>
-                <li>用户手机邮箱&菜单组件修改允许空字符串</li>
-                <li>升级SpringBoot到最新版本2.2.13 提升启动速度</li>
-                <li>升级druid到最新版本v1.2.4</li>
-                <li>升级fastjson到最新版1.2.75</li>
-                <li>升级element-ui到最新版本2.15.0</li>
-                <li>修复IE11浏览器报错问题</li>
-                <li>优化多级菜单之间切换无法缓存的问题</li>
-                <li>修复四级菜单无法显示问题</li>
-                <li>修正侧边栏静态路由丢失问题</li>
-                <li>修复角色管理-编辑角色-功能权限显示异常</li>
-                <li>配置文件新增redis数据库索引属性</li>
-                <li>权限工具类增加admin判断</li>
-                <li>角色非自定义权限范围清空选择值</li>
-                <li>修复导入数据为负浮点数时丢失精度问题</li>
-                <li>移除path-to-regexp正则匹配插件</li>
-                <li>修复生成树表代码异常</li>
-                <li>修改ip字段长度防止ipv6地址长度不够</li>
-                <li>防止get请求参数值为false或0等特殊值会导致无法正确的传参</li>
-                <li>登录后push添加catch防止出现检查错误</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.3.0 - 2020-12-14">
-              <ol>
-                <li>新增缓存监控功能</li>
-                <li>支持主题风格配置</li>
-                <li>修复多级菜单之间切换无法缓存的问题</li>
-                <li>多级菜单自动配置组件</li>
-                <li>代码生成预览支持高亮显示</li>
-                <li>支持Get请求映射Params参数</li>
-                <li>删除用户和角色解绑关联</li>
-                <li>去除用户手机邮箱部门必填验证</li>
-                <li>Excel支持注解align对齐方式</li>
-                <li>Excel支持导入Boolean型数据</li>
-                <li>优化头像样式，鼠标移入悬停遮罩</li>
-                <li>代码生成预览提供滚动机制</li>
-                <li>代码生成删除多余的数字float类型</li>
-                <li>修正转换字符串的目标字符集属性</li>
-                <li>回显数据字典防止空值报错</li>
-                <li>日志记录增加过滤多文件场景</li>
-                <li>修改缓存Set方法可能导致嵌套的问题</li>
-                <li>移除前端一些多余的依赖</li>
-                <li>防止安全扫描YUI出现的风险提示</li>
-                <li>修改node-sass为dart-sass</li>
-                <li>升级SpringBoot到最新版本2.1.18</li>
-                <li>升级poi到最新版本4.1.2</li>
-                <li>升级oshi到最新版本v5.3.6</li>
-                <li>升级bitwalker到最新版本1.21</li>
-                <li>升级axios到最新版本0.21.0</li>
-                <li>升级element-ui到最新版本2.14.1</li>
-                <li>升级vue到最新版本2.6.12</li>
-                <li>升级vuex到最新版本3.6.0</li>
-                <li>升级vue-cli到版本4.5.9</li>
-                <li>升级vue-router到最新版本3.4.9</li>
-                <li>升级vue-cli到最新版本4.4.6</li>
-                <li>升级vue-cropper到最新版本0.5.5</li>
-                <li>升级clipboard到最新版本2.0.6</li>
-                <li>升级core-js到最新版本3.8.1</li>
-                <li>升级echarts到最新版本4.9.0</li>
-                <li>升级file-saver到最新版本2.0.4</li>
-                <li>升级fuse.js到最新版本6.4.3</li>
-                <li>升级js-beautify到最新版本1.13.0</li>
-                <li>升级js-cookie到最新版本2.2.1</li>
-                <li>升级path-to-regexp到最新版本6.2.0</li>
-                <li>升级quill到最新版本1.3.7</li>
-                <li>升级screenfull到最新版本5.0.2</li>
-                <li>升级sortablejs到最新版本1.10.2</li>
-                <li>升级vuedraggable到最新版本2.24.3</li>
-                <li>升级chalk到最新版本4.1.0</li>
-                <li>升级eslint到最新版本7.15.0</li>
-                <li>升级eslint-plugin-vue到最新版本7.2.0</li>
-                <li>升级lint-staged到最新版本10.5.3</li>
-                <li>升级runjs到最新版本4.4.2</li>
-                <li>升级sass-loader到最新版本10.1.0</li>
-                <li>升级script-ext-html-webpack-plugin到最新版本2.1.5</li>
-                <li>升级svg-sprite-loader到最新版本5.1.1</li>
-                <li>升级vue-template-compiler到最新版本2.6.12</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.2.1 - 2020-11-18">
-              <ol>
-                <li>阻止任意文件下载漏洞</li>
-                <li>代码生成支持上传控件</li>
-                <li>新增图片上传组件</li>
-                <li>调整默认首页</li>
-                <li>升级druid到最新版本v1.2.2</li>
-                <li>mapperLocations配置支持分隔符</li>
-                <li>权限信息调整</li>
-                <li>调整sql默认时间</li>
-                <li>解决代码生成没有bit类型的问题</li>
-                <li>升级pagehelper到最新版1.3.0</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.2.0 - 2020-10-10">
-              <ol>
-                <li>升级springboot版本到2.1.17 提升安全性</li>
-                <li>升级oshi到最新版本v5.2.5</li>
-                <li>升级druid到最新版本v1.2.1</li>
-                <li>升级jjwt到版本0.9.1</li>
-                <li>升级fastjson到最新版1.2.74</li>
-                <li>修改sass为node-sass，避免el-icon图标乱码</li>
-                <li>代码生成支持同步数据库</li>
-                <li>代码生成支持富文本控件</li>
-                <li>代码生成页面时不忽略remark属性</li>
-                <li>代码生成添加select必填选项</li>
-                <li>Excel导出类型NUMERIC支持精度浮点类型</li>
-                <li>Excel导出targetAttr优化获取值，防止get方法不规范</li>
-                <li>Excel注解支持自动统计数据总和</li>
-                <li>Excel注解支持设置BigDecimal精度&舍入规则</li>
-                <li>菜单&数据权限新增（展开/折叠 全选/全不选 父子联动）</li>
-                <li>允许用户分配到部门父节点</li>
-                <li>菜单新增是否缓存keep-alive</li>
-                <li>表格操作列间距调整</li>
-                <li>限制系统内置参数不允许删除</li>
-                <li>富文本组件优化，支持自定义高度&图片冲突问题</li>
-                <li>富文本工具栏样式对齐</li>
-                <li>导入excel整形值校验优化</li>
-                <li>修复页签关闭所有时固定标签路由不刷新问题</li>
-                <li>表单构建布局型组件新增按钮</li>
-                <li>左侧菜单文字过长显示省略号</li>
-                <li>修正根节点为子部门时，树状结构显示问题</li>
-                <li>修正调用目标字符串最大长度</li>
-                <li>修正菜单提示信息错误</li>
-                <li>修正定时任务执行一次权限标识</li>
-                <li>修正数据库字符串类型nvarchar</li>
-                <li>优化递归子节点</li>
-                <li>优化数据权限判断</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-
-            <el-collapse-item title="v3.1.0 - 2020-08-13">
-              <ol>
-                <li>表格工具栏右侧添加刷新&显隐查询组件</li>
-                <li>后端支持CORS跨域请求</li>
-                <li>代码生成支持选择上级菜单</li>
-                <li>代码生成支持自定义路径</li>
-                <li>代码生成支持复选框</li>
-                <li>Excel导出导入支持dictType字典类型</li>
-                <li>Excel支持分割字符串组内容</li>
-                <li>验证码类型支持（数组计算、字符验证）</li>
-                <li>升级vue-cli版本到4.4.4</li>
-                <li>修改 node-sass 为 dart-sass</li>
-                <li>表单类型为Integer/Long设置整形默认值</li>
-                <li>代码生成器默认mapper路径与默认mapperScan路径不一致</li>
-                <li>优化防重复提交拦截器</li>
-                <li>优化上级菜单不能选择自己</li>
-                <li>修复角色的权限分配后，未实时生效问题</li>
-                <li>修复在线用户日志记录类型</li>
-                <li>修复富文本空格和缩进保存后不生效问题</li>
-                <li>修复在线用户判断逻辑</li>
-                <li>唯一限制条件只返回单条数据</li>
-                <li>添加获取当前的环境配置方法</li>
-                <li>超时登录后页面跳转到首页</li>
-                <li>全局异常状态汉化拦截处理</li>
-                <li>HTML过滤器改为将html转义</li>
-                <li>检查字符支持小数点&降级改成异常提醒</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-
-            <el-collapse-item title="v3.0.0 - 2020-07-20">
-              <ol>
-                <li>单应用调整为多模块项目</li>
-                <li>升级element-ui版本到2.13.2</li>
-                <li>删除babel，提高编译速度。</li>
-                <li>新增菜单默认主类目</li>
-                <li>编码文件名修改为uuid方式</li>
-                <li>定时任务cron表达式验证</li>
-                <li>角色权限修改时已有权限未自动勾选异常修复</li>
-                <li>防止切换权限用户后登录出现404</li>
-                <li>Excel支持sort导出排序</li>
-                <li>创建用户不允许选择超级管理员角色</li>
-                <li>修复代码生成导入表结构出现异常页面不提醒问题</li>
-                <li>修复代码生成点击多次表修改数据不变化的问题</li>
-                <li>修复头像上传成功二次打开无法改变裁剪框大小和位置问题</li>
-                <li>修复布局为small者mini用户表单显示错位问题</li>
-                <li>修复热部署导致的强换异常问题</li>
-                <li>修改用户管理复选框宽度，防止部分浏览器出现省略号</li>
-                <li>IpUtils工具，清除Xss特殊字符，防止Xff注入攻击</li>
-                <li>生成domain 如果是浮点型 统一用BigDecimal</li>
-                <li>定时任务调整label-width，防止部署出现错位</li>
-                <li>调整表头固定列默认样式</li>
-                <li>代码生成模板调整，字段为String并且必填则加空串条件</li>
-                <li>代码生成字典Integer/Long使用parseInt</li>
-                <li>
-                  修复dict_sort不可update为0的问题&查询返回增加dict_sort升序排序
-                </li>
-                <li>修正岗位导出权限注解</li>
-                <li>禁止加密密文返回前端</li>
-                <li>修复代码生成页面中的查询条件创建时间未生效的问题</li>
-                <li>修复首页搜索菜单外链无法点击跳转问题</li>
-                <li>修复菜单管理选择图标，backspace删除时不过滤数据</li>
-                <li>用户管理部门分支节点不可检查&显示计数</li>
-                <li>数据范围过滤属性调整</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-
-            <el-collapse-item title="v2.3.0 - 2020-06-01">
-              <ol>
-                <li>升级fastjson到最新版1.2.70 修复高危安全漏洞</li>
-                <li>dev启动默认打开浏览器</li>
-                <li>vue-cli使用默认source-map</li>
-                <li>slidebar eslint报错优化</li>
-                <li>当tags-view滚动关闭右键菜单</li>
-                <li>字典管理添加缓存读取</li>
-                <li>参数管理支持缓存操作</li>
-                <li>支持一级菜单（和主页同级）在main区域显示</li>
-                <li>限制外链地址必须以http(s)开头</li>
-                <li>tagview & sidebar 主题颜色与element ui(全局)同步</li>
-                <li>修改数据源类型优先级，先根据方法，再根据类</li>
-                <li>支持是否需要设置token属性，自定义返回码消息。</li>
-                <li>swagger请求前缀加入配置。</li>
-                <li>登录地点设置内容过长则隐藏显示</li>
-                <li>修复定时任务执行一次按钮后不提示消息问题</li>
-                <li>修改上级部门（选择项排除本身和下级）</li>
-                <li>通用http发送方法增加参数 contentType 编码类型</li>
-                <li>更换IP地址查询接口</li>
-                <li>修复页签变量undefined</li>
-                <li>添加校验部门包含未停用的子部门</li>
-                <li>修改定时任务详情下次执行时间日期显示错误</li>
-                <li>角色管理查询设置默认排序字段</li>
-                <li>swagger添加enable参数控制是否启用</li>
-                <li>只对json类型请求构建可重复读取inputStream的request</li>
-                <li>修改代码生成字典字段int类型没有自动选中问题</li>
-                <li>vuex用户名取值修正</li>
-                <li>表格树模板去掉多余的)</li>
-                <li>代码生成序号修正</li>
-                <li>全屏情况下不调整上外边距</li>
-                <li>代码生成Date字段添加默认格式</li>
-                <li>用户管理角色选择权限控制</li>
-                <li>修复路由懒加载报错问题</li>
-                <li>模板sql.vm添加菜单状态</li>
-                <li>设置用户名称不能修改</li>
-                <li>dialog添加append-to-body属性，防止ie遮罩</li>
-                <li>菜单区分状态和显示隐藏功能</li>
-                <li>升级fastjson到最新版1.2.68 修复安全加固</li>
-                <li>修复代码生成如果选择字典类型缺失逗号问题</li>
-                <li>登录请求params更换为data，防止暴露url</li>
-                <li>日志返回时间格式处理</li>
-                <li>添加handle控制允许拖动的元素</li>
-                <li>布局设置点击扩大范围</li>
-                <li>代码生成列属性排序查询</li>
-                <li>代码生成列支持拖动排序</li>
-                <li>修复时间格式不支持ios问题</li>
-                <li>表单构建添加父级class，防止冲突</li>
-                <li>定时任务并发属性修正</li>
-                <li>角色禁用&菜单隐藏不查询权限</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-
-            <el-collapse-item title="v2.2.0 - 2020-03-18">
-              <ol>
-                <li>系统监控新增定时任务功能</li>
-                <li>添加一个打包Web工程bat</li>
-                <li>修复页签鼠标滚轮按下的时候，可以关闭不可关闭的tag</li>
-                <li>修复点击退出登录有时会无提示问题</li>
-                <li>修复防重复提交注解无效问题</li>
-                <li>修复通知公告批量删除异常问题</li>
-                <li>添加菜单时路由地址必填限制</li>
-                <li>代码生成字段描述可编辑</li>
-                <li>修复用户修改个人信息导致缓存不过期问题</li>
-                <li>个人信息创建时间获取正确属性值</li>
-                <li>操作日志详细显示正确类型</li>
-                <li>导入表单击行数据时选中对应的复选框</li>
-                <li>批量替换表前缀逻辑调整</li>
-                <li>固定重定向路径表达式</li>
-                <li>升级element-ui版本到2.13.0</li>
-                <li>操作日志排序调整</li>
-                <li>修复charts切换侧边栏或者缩放窗口显示bug</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-
-            <el-collapse-item title="v2.1.0 - 2020-02-24">
-              <ol>
-                <li>新增表单构建</li>
-                <li>代码生成支持树表结构</li>
-                <li>新增用户导入</li>
-                <li>修复动态加载路由页面刷新问题</li>
-                <li>修复地址开关无效问题</li>
-                <li>汉化错误提示页面</li>
-                <li>代码生成已知问题修改</li>
-                <li>修复多数据源下配置关闭出现异常处理</li>
-                <li>添加HTML过滤器，用于去除XSS漏洞隐患</li>
-                <li>修复上传头像控制台出现异常</li>
-                <li>修改用户管理分页不正确的问题</li>
-                <li>修复验证码记录提示错误</li>
-                <li>修复request.js缺少Message引用</li>
-                <li>修复表格时间为空出现的异常</li>
-                <li>添加Jackson日期反序列化时区配置</li>
-                <li>调整根据用户权限加载菜单数据树形结构</li>
-                <li>调整成功登录不恢复按钮，防止多次点击</li>
-                <li>修改用户个人资料同步缓存信息</li>
-                <li>修复页面同时出现el-upload和Editor不显示处理</li>
-                <li>修复在角色管理页修改菜单权限偶尔未选中问题</li>
-                <li>配置文件新增redis密码属性</li>
-                <li>设置mybatis全局的配置文件</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-
-            <el-collapse-item title="v2.0.0 - 2019-12-02">
-              <ol>
-                <li>新增代码生成</li>
-                <li>新增@RepeatSubmit注解，防止重复提交</li>
-                <li>新增菜单主目录添加/删除操作</li>
-                <li>日志记录过滤特殊对象，防止转换异常</li>
-                <li>修改代码生成路由脚本错误</li>
-                <li>用户上传头像实时同步缓存，无需重新登录</li>
-                <li>调整切换页签后不重新加载数据</li>
-                <li>添加jsencrypt实现参数的前端加密</li>
-                <li>系统退出删除用户缓存记录</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v1.1.0 - 2019-11-11">
-              <ol>
-                <li>新增在线用户管理</li>
-                <li>新增按钮组功能实现（批量删除、导出、清空）</li>
-                <li>新增查询条件重置按钮</li>
-                <li>新增Swagger全局Token配置</li>
-                <li>新增后端参数校验</li>
-                <li>修复字典管理页面的日期查询异常</li>
-                <li>修改时间函数命名防止冲突</li>
-                <li>去除菜单上级校验，默认为顶级</li>
-                <li>修复用户密码无法修改问题</li>
-                <li>修复菜单类型为按钮时不显示权限标识</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v1.0.0 - 2019-10-08">
-              <ol>
-                <li>若依前后端分离系统正式发布</li>
-              </ol>
-            </el-collapse-item>
-          </el-collapse>
-        </el-card>
-      </el-col>
-      <el-col :xs="24" :sm="24" :md="12" :lg="8">
-        <el-card class="update-log">
-          <div slot="header" class="clearfix">
-            <span>捐赠支持</span>
-          </div>
-          <div class="body">
-            <img
-              src="@/assets/images/pay.png"
-              alt="donate"
-              width="100%"
-            />
-            <span style="display: inline-block; height: 30px; line-height: 30px"
-              >你可以请作者喝杯咖啡表示鼓励</span
-            >
-          </div>
-        </el-card>
-      </el-col>
-    </el-row>
+      </div>
+      <el-empty v-else-if="!loading && !offlineDevices.length" description="暂无调试宝设备" />
+
+      <el-collapse v-if="offlineDevices.length" v-model="offlineCollapse" class="offline-collapse">
+        <el-collapse-item name="offline">
+          <template slot="title">
+            <span class="section-title inline">
+              <span>未登录设备</span>
+              <el-tag size="mini" type="info">{{ offlineDevices.length }}</el-tag>
+              <span class="collapse-hint">点击标题可展开/收起</span>
+            </span>
+          </template>
+          <el-row :gutter="16">
+            <el-col v-for="item in offlineDevices" :key="'off-' + item.deviceId" :xs="24" :sm="12" :md="8" :lg="6">
+              <device-card :device="item" offline />
+            </el-col>
+          </el-row>
+        </el-collapse-item>
+      </el-collapse>
+    </div>
   </div>
 </template>
 
 <script>
+import { listTsbDeviceHome } from '@/api/tsb/device'
+import { getRouteByCmdType } from '@/utils/tsbCmdRoute'
+import tsbWebSocket from '@/utils/tsbWebSocket'
+import DeviceCard from './dashboard/DeviceCard'
+
+const DEFAULT_PAGE_CMD = 'common:tax'
+
 export default {
-  name: "Index",
+  name: 'Index',
+  components: { DeviceCard },
   data() {
     return {
-      // 版本号
-      version: "3.9.2"
+      loading: false,
+      deviceList: [],
+      offlineCollapse: [],
+      refreshTimer: null
+    }
+  },
+  computed: {
+    onlineDevices() {
+      return this.deviceList.filter(d => d.lineStatus === 1)
+    },
+    offlineDevices() {
+      return this.deviceList.filter(d => d.lineStatus !== 1)
+    },
+    currentDeviceSn() {
+      return this.$store.getters.tsbCurrentDeviceSn
+    }
+  },
+  created() {
+    this.loadDevices()
+    this.refreshTimer = setInterval(() => this.loadDevices(true), 30000)
+  },
+  beforeDestroy() {
+    if (this.refreshTimer) {
+      clearInterval(this.refreshTimer)
     }
   },
   methods: {
-    goTarget(href) {
-      window.open(href, "_blank")
+    loadDevices(silent) {
+      if (!silent) {
+        this.loading = true
+      }
+      listTsbDeviceHome().then(res => {
+        this.deviceList = res.data || []
+      }).finally(() => {
+        this.loading = false
+      })
+    },
+    isActive(device) {
+      return this.currentDeviceSn != null && device.deviceSn === this.currentDeviceSn
+    },
+    handleOperate(device) {
+      this.$store.commit('tsb/SET_CURRENT_DEVICE', device)
+      tsbWebSocket.connectWithDevice(device.deviceSn).then(() => {
+        const routePath = getRouteByCmdType(DEFAULT_PAGE_CMD)
+        if (routePath) {
+          this.$router.push(routePath).catch(() => {})
+        } else {
+          this.$message.info('请在左侧菜单进入调试宝功能页')
+        }
+      }).catch(() => {})
     }
   }
 }
 </script>
 
 <style scoped lang="scss">
-.home {
-  blockquote {
-    padding: 10px 20px;
-    margin: 0 0 20px;
-    font-size: 17.5px;
-    border-left: 5px solid #eee;
-  }
-  hr {
-    margin-top: 20px;
-    margin-bottom: 20px;
-    border: 0;
-    border-top: 1px solid #eee;
-  }
-  .col-item {
-    margin-bottom: 20px;
-  }
-
-  ul {
-    padding: 0;
-    margin: 0;
-  }
-
-  font-family: "open sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 13px;
-  color: #676a6c;
-  overflow-x: hidden;
-
-  ul {
-    list-style-type: none;
-  }
-
-  h4 {
-    margin-top: 0px;
-  }
-
-  h2 {
-    margin-top: 10px;
-    font-size: 26px;
-    font-weight: 100;
+.tsb-home-header {
+  margin-bottom: 16px;
+}
+.tsb-home-title {
+  margin: 0;
+  font-size: 20px;
+  font-weight: 600;
+}
+.section-block {
+  margin-bottom: 20px;
+}
+.section-title {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  margin-bottom: 12px;
+  font-size: 15px;
+  font-weight: 500;
+  &.inline {
+    margin-bottom: 0;
   }
-
-  p {
-    margin-top: 10px;
-
-    b {
-      font-weight: 700;
-    }
+}
+.collapse-hint {
+  margin-left: 4px;
+  font-size: 12px;
+  font-weight: normal;
+  color: #909399;
+}
+.offline-collapse {
+  border: none;
+  ::v-deep .el-collapse-item__header {
+    border-bottom: none;
+    font-size: 15px;
   }
-
-  .update-log {
-    ol {
-      display: block;
-      list-style-type: decimal;
-      margin-block-start: 1em;
-      margin-block-end: 1em;
-      margin-inline-start: 0;
-      margin-inline-end: 0;
-      padding-inline-start: 40px;
-    }
+  ::v-deep .el-collapse-item__wrap {
+    border-bottom: none;
   }
 }
 </style>
-