From bcd9fda2a06e49195b038c18307511caf78bf615 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 29 八月 2022 16:06:30 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxAPIUtil.java | 63 +++++++++++++++++++++++++------
1 files changed, 50 insertions(+), 13 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 70034c0..f5b35ac 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,6 +1,7 @@
package com.sandu.ximon.admin.utils;
import com.alibaba.fastjson.JSON;
+import com.sandu.common.execption.BusinessException;
import com.sandu.ximon.admin.config.VnnoxConstant;
import com.sandu.ximon.admin.config.VnnoxUrl;
import com.sandu.ximon.admin.utils.request.*;
@@ -12,10 +13,7 @@
import org.springframework.stereotype.Component;
import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@Component("VnnoxAPIUtil")
@AllArgsConstructor
@@ -31,39 +29,40 @@
/**
* 鑾峰彇token
*/
- public void getToken () {
+ public void getToken() {
String result = VnnoxRequestUtil.PostWithHeader(
VnnoxUrl.getUrl(VnnoxUrl.GET_TOKEN),
new VnnoxGetTokenRequest().toJson(),
new CommonHeader(CommonHeader.FORM, false)
);
- CommonResponse commonResponse = JSON.parseObject(result,CommonResponse.class);
+ CommonResponse commonResponse = JSON.parseObject(result, CommonResponse.class);
VnnoxGetTokenResponse response = new VnnoxGetTokenResponse().parse(commonResponse);
// 灏唗oken淇濆瓨鍒皉edis缂撳瓨涓�
- redisUtils.set(VnnoxConstant.REDIS_TOKEN_NAME,response.getToken(),(long)(response.getExpire()-30));
+ redisUtils.set(VnnoxConstant.REDIS_TOKEN_NAME, response.getToken(), (long) (response.getExpire() - 30));
}
/**
* 鑾峰彇鎾斁鍣ㄥ垪琛�
+ *
* @param count 姣忔璇诲彇鏁伴噺锛岄粯璁�20锛屽彇鍊艰寖鍥达細1~100
* @param start 浠庣鍑犳潯璁板綍寮�濮嬭鍙栵紝榛樿0
* @return
*/
- public VnnoxPlayerListResponse getPlayerList(Integer count, Integer start,String name) throws URISyntaxException {
+ public VnnoxPlayerListResponse getPlayerList(Integer count, Integer start, String name) throws URISyntaxException {
List<NameValuePair> urlParameters = new ArrayList<>();
- urlParameters.add(new BasicNameValuePair("count",count.toString()));
- urlParameters.add(new BasicNameValuePair("start",start.toString()));
- urlParameters.add(new BasicNameValuePair("name",name));
+ urlParameters.add(new BasicNameValuePair("count", count.toString()));
+ urlParameters.add(new BasicNameValuePair("start", start.toString()));
+ urlParameters.add(new BasicNameValuePair("name", name));
String result = VnnoxRequestUtil.GetWithHeader(
VnnoxUrl.getUrl(VnnoxUrl.GET_PLAYER_LIST),
urlParameters,
new CommonHeader(CommonHeader.JSON, true)
);
- return new VnnoxPlayerListResponse().parse(JSON.parseObject(result,CommonResponse.class));
+ return new VnnoxPlayerListResponse().parse(JSON.parseObject(result, CommonResponse.class));
}
/**
@@ -74,6 +73,9 @@
*/
public List<LedPlayerEntity> syncCurrentInfo(List<LedPlayerEntity> list) {
List<String> playerIds = new ArrayList<>();
+ if (list.isEmpty()) {
+ return list;
+ }
for (LedPlayerEntity playerEntity : list) {
playerIds.add(playerEntity.getPlayerId());
@@ -201,6 +203,42 @@
return response.getData();
}
+
+ /**
+ * 鎵归噺灞忓箷鎴浘
+ *
+ * @param players
+ * @return
+ */
+ public VnnoxResult screenShot(List<String> players) {
+ VnnoxBaseRequest request = new VnnoxBaseRequest();
+ request.setPlayerIds(players);
+ request.setNoticeUrl(VnnoxConstant.SCREEN_SHOT_NOTIFY_URL);
+
+ String result = VnnoxRequestUtil.PostWithHeader(
+ VnnoxUrl.getUrl(VnnoxUrl.SCREEN_SHOT),
+ request.toJson(),
+ new CommonHeader(CommonHeader.JSON, true)
+ );
+
+ if (result.startsWith("{") && result.endsWith("}")) {
+ VnnoxResultResponse response = JSON.parseObject(result, VnnoxResultResponse.class);
+ if (response.getStatus() == 0) {
+ return response.getData();
+ } else {
+ System.out.println(response.getErrmsg());
+ VnnoxResult vnnoxResult = new VnnoxResult();
+ vnnoxResult.getFail().addAll(players);
+ return vnnoxResult;
+ }
+ } else {
+ System.out.println("鏁版嵁瑙ｆ瀽寮傚父!");
+ VnnoxResult vnnoxResult = new VnnoxResult();
+ vnnoxResult.getFail().addAll(players);
+ return vnnoxResult;
+ }
+ }
+
/**
* 璁惧閲嶅惎
*
@@ -224,7 +262,6 @@
/**
* 鍚屾鎾斁
- *
*/
public VnnoxResult syncPlay(List<String> playerId, Integer option) {
VnnoxBaseRequest request = new VnnoxBaseRequest();
--
Gitblit v1.9.3