~nishiwei/ard-uav-server.git

			@@ -101,21 +101,8 @@
			@Override
			public List<BoxInfoReceiver> getBoxList() {
			List<ArdServerInfo> ardServerInfos = ardServerService.selectArdServerManagementList(new ArdServerInfo());

			return ardServerInfos.stream()
			.flatMap(ardServerInfo -> {
			String baseUrl = "http://" + ardServerInfo.getHost() + ":" + ardServerInfo.getHttpPort();
			try {
			List<BoxInfoReceiver> boxes = tyClient.getBoxList(baseUrl).getContent();
			return Optional.ofNullable(boxes).orElse(Collections.emptyList()).stream();
			} catch (Exception e) {
			log.error("获取云盒列表失败: {}", baseUrl, e);
			return Stream.empty();
			}
			})
			.collect(Collectors.toList());
			return getBoxList(ardServerInfos);
			}


			/**
			* 获取直播地址
			@@ -851,6 +838,33 @@
			}
			}

			/**
			* 根据boxSn获取六合盒子列表
			* @return List<BoxInfoReceiver>
			*/
			@Override
			public List<BoxInfoReceiver> getBoxSnToList(String boxSn) {
			ArdServerInfo serverInfo = new ArdServerInfo();
			serverInfo.setHost(boxSn);
			List<ArdServerInfo> ardServerInfos = ardServerService.selectArdServerManagementList(serverInfo);
			return getBoxList(ardServerInfos);
			}

			private List<BoxInfoReceiver> getBoxList(List<ArdServerInfo> ls) {
			return ls.stream()
			.flatMap(ardServerInfo -> {
			String baseUrl = "http://" + ardServerInfo.getHost() + ":" + ardServerInfo.getHttpPort();
			try {
			List<BoxInfoReceiver> boxes = tyClient.getBoxList(baseUrl).getContent();
			return Optional.ofNullable(boxes).orElse(Collections.emptyList()).stream();
			} catch (Exception e) {
			log.error("获取云盒列表失败: {}", baseUrl, e);
			return Stream.empty();
			}
			})
			.collect(Collectors.toList());
			}

			//公共日志打印
			private void logPrint(String message, Object obj) {
			log.debug("收到{}回复{}", message, obj);