From a9780c49f8cf587af26cc83d439320ad02b8668f Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 15 Oct 2025 09:17:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ard-work/src/main/java/com/ard/work/service/ITyService.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ard-work/src/main/java/com/ard/work/service/ITyService.java b/ard-work/src/main/java/com/ard/work/service/ITyService.java
index 44ed108..e085666 100644
--- a/ard-work/src/main/java/com/ard/work/service/ITyService.java
+++ b/ard-work/src/main/java/com/ard/work/service/ITyService.java
@@ -34,7 +34,7 @@
      * 获取六合token信息
      * @return
      */
-    AccessTokenReceiver getAccessToken();
+    AccessTokenReceiver getAccessToken(String ServerId);
 
 
     /**
@@ -88,7 +88,7 @@
     /**
      * 注册
      */
-    Boolean registerMessage();
+    Boolean registerMessage(String serverId);
 
     /**
      * 云台转动(基于角度)
@@ -280,4 +280,10 @@
      */
     void processReplyMessage(String key, BaseCmd tyMessage);
 
+    /**
+     * 根据boxSn获取六合盒子列表
+     * @return List<BoxInfoReceiver>
+     */
+    List<BoxInfoReceiver> getBoxSnToList(String id);
+
 }

--
Gitblit v1.9.3