From 0a30812acaa26ebe654340f7e749a6801b63b194 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 21 十月 2022 16:32:36 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxAPIUtil.java | 46 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 42 insertions(+), 4 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxAPIUtil.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxAPIUtil.java
index 3a5e63c..d966cd4 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxAPIUtil.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxAPIUtil.java
@@ -1,10 +1,8 @@
package com.sandu.ximon.admin.utils;
import com.alibaba.fastjson.JSON;
-import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.config.VnnoxConstant;
import com.sandu.ximon.admin.config.VnnoxUrl;
-import com.sandu.ximon.admin.service.LedPlayerEntityService;
import com.sandu.ximon.admin.utils.request.*;
import com.sandu.ximon.admin.utils.response.*;
import com.sandu.ximon.dao.domain.LedPlayerEntity;
@@ -14,6 +12,7 @@
import org.springframework.stereotype.Component;
import java.net.URISyntaxException;
+import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -305,24 +304,63 @@
List<String> commands = new ArrayList<>();
commands.add("volumeValue");
commands.add("brightnessValue");
+ commands.add("screenPowerStatus");
VnnoxBaseRequest request = new VnnoxBaseRequest();
request.setPlayerIds(playerId);
request.setCommands(commands);
request.setNoticeUrl(VnnoxConstant.STATUS_NOTIFY_URL);
-
+ System.out.println(LocalDateTime.now() + "璇锋眰鍓�");
String result = VnnoxRequestUtil.PostWithHeader(VnnoxUrl.getUrl(VnnoxUrl.ASYNCURRENTSTATUS), request.toJson(), new CommonHeader(CommonHeader.JSON, true));
VnnoxResultResponse response = JSON.parseObject(result, VnnoxResultResponse.class);
+ System.out.println(LocalDateTime.now() + "璇锋眰鍚�");
System.out.println(response.toString());
int size = response.getData().getSuccess().size();
CountDownLatch countDownLatch = new CountDownLatch(size * 2);
countDownLatchUtil.push(response.getLogid(), countDownLatch);
try {
- countDownLatch.await(20, TimeUnit.SECONDS);
+ countDownLatch.await(3000, TimeUnit.MILLISECONDS);
countDownLatchUtil.remove(response.getLogid());
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
+ System.out.println(LocalDateTime.now() + "杩斿洖鍓�");
+ return response;
+ }
+ /**
+ * 鑾峰彇灞忓箷淇℃伅
+ */
+ public VnnoxResultResponse getAsyncStatus(List<String> playerId, String statusValue) {
+ List<String> commands = new ArrayList<>();
+ if ("all".equals(statusValue)) {
+ commands.add("volumeValue");
+ commands.add("brightnessValue");
+ commands.add("videoSourceValue");
+ commands.add("timeValue");
+ commands.add("screenPowerStatus");
+ commands.add("syncPlayStatus");
+ } else {
+ commands.add(statusValue);
+ }
+ VnnoxBaseRequest request = new VnnoxBaseRequest();
+ request.setPlayerIds(playerId);
+ request.setCommands(commands);
+ request.setNoticeUrl(VnnoxConstant.STATUS_NOTIFY_URL);
+ System.out.println(LocalDateTime.now() + "璇锋眰鍓�");
+ String result = VnnoxRequestUtil.PostWithHeader(VnnoxUrl.getUrl(VnnoxUrl.ASYNCURRENTSTATUS), request.toJson(), new CommonHeader(CommonHeader.JSON, true));
+ VnnoxResultResponse response = JSON.parseObject(result, VnnoxResultResponse.class);
+ System.out.println(LocalDateTime.now() + "璇锋眰鍚�");
+ System.out.println(response.toString());
+ int size = response.getData().getSuccess().size();
+ CountDownLatch countDownLatch = new CountDownLatch(size * commands.size());
+ countDownLatchUtil.push(response.getLogid(), countDownLatch);
+ try {
+ countDownLatch.await(10000, TimeUnit.MILLISECONDS);
+ countDownLatchUtil.remove(response.getLogid());
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ System.out.println(LocalDateTime.now() + "杩斿洖鍓�");
return response;
}
}
\ No newline at end of file
--
Gitblit v1.9.3