Merge remote-tracking branch 'origin/dev' into dev

zhaowenyu

2025-10-17 1ab85e9fd1b392d36c6f2b08754249e4574ea4e8

 ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java

@@ -84,7 +84,7 @@
    }

    /**
     * 获取云盒列表
     * 获取全部云盒列表
     *
     * @return List<BoxInfoReceiver>
     */
@@ -93,7 +93,16 @@
        List<ArdServerInfo> ardServerInfos = ardServerService.selectArdServerInfoList(new ArdServerInfo());
        return getBoxList(ardServerInfos);
    }

    /**
     * 获取指定服务器云盒列表
     *
     * @return List<BoxInfoReceiver>
     */
    @Override
    public List<BoxInfoReceiver> getBoxList(String serverId) {
        TyHttpCommonReceiver<List<BoxInfoReceiver>> boxList = tyClient.getBoxList(serverId);
        return boxList.getContent();
    }
    /**
     * 获取直播地址
     *