From fb842a99734726e628bd0981ccdf80a253534eaa Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 17 五月 2022 17:06:07 +0800
Subject: [PATCH] 日志
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java | 78 +++++++++++++++++++++++++++++++++-----
1 files changed, 67 insertions(+), 11 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java
index cb7b594..4264f83 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java
@@ -1,8 +1,8 @@
package com.sandu.ximon.admin.controller;
+import cn.hutool.core.collection.CollectionUtil;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.object.BaseConditionVO;
-import com.sandu.common.security.annotation.AnonymousAccess;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.param.VnnoxParam;
import com.sandu.ximon.admin.security.PermissionConfig;
@@ -75,14 +75,23 @@
if (!permissionConfig.check(MenuEnum.VNNOX_RESTART.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- VnnoxResult vnnoxResult = vnnoxService.reboot(vnnoxWebRequest);
+
+ List<List<String>> split = CollectionUtil.split(vnnoxWebRequest, 100);
+
+ VnnoxResult vnnoxResult=null;
+ for (List<String> splist : split) {
+ VnnoxResult vnnox = vnnoxService.reboot(splist);
+ if(vnnoxResult!=null){
+ vnnoxResult.getSuccess().addAll(vnnox.getSuccess());
+ vnnoxResult.getFail().addAll(vnnox.getFail());
+ }
+ }
return ResponseUtil.success(vnnoxResult);
}
/**
* 鍚屾鎾斁
*/
- @AnonymousAccess
@PostMapping("/syncPlay")
public ResponseVO<Object> syncPlay(@RequestBody Map map) {
if (!permissionConfig.check(MenuEnum.VNNOX_SYNC_PLAY.getCode())) {
@@ -90,14 +99,22 @@
}
List playIdlist = (List) map.get("playIdlist");
Integer option = (Integer) map.get("option");
- VnnoxResult vnnoxResult = vnnoxService.syncPlay(playIdlist, option);
+ List<List<String>> split = CollectionUtil.split(playIdlist, 100);
+
+ VnnoxResult vnnoxResult=null;
+ for (List<String> splist : split) {
+ VnnoxResult vnnox = vnnoxService.syncPlay(splist, option);
+ if(vnnoxResult!=null){
+ vnnoxResult.getSuccess().addAll(vnnox.getSuccess());
+ vnnoxResult.getFail().addAll(vnnox.getFail());
+ }
+ }
return ResponseUtil.success(vnnoxResult);
}
/**
* ntp瀵规椂
*/
- @AnonymousAccess
@PostMapping("/ntp")
public ResponseVO<Object> ntp(@RequestBody Map map) {
if (!permissionConfig.check(MenuEnum.VNNOX_NTP.getCode())) {
@@ -105,7 +122,17 @@
}
boolean enable = (boolean) map.get("enable");
List playIdlist = (List) map.get("playIdlist");
- VnnoxResult vnnoxResult = vnnoxService.ntpSync(playIdlist, enable);
+
+ List<List<String>> split = CollectionUtil.split(playIdlist, 100);
+
+ VnnoxResult vnnoxResult=null;
+ for (List<String> splist : split) {
+ VnnoxResult vnnox = vnnoxService.ntpSync(splist, enable);
+ if(vnnoxResult!=null){
+ vnnoxResult.getSuccess().addAll(vnnox.getSuccess());
+ vnnoxResult.getFail().addAll(vnnox.getFail());
+ }
+ }
return ResponseUtil.success(vnnoxResult);
}
@@ -118,7 +145,17 @@
if (!permissionConfig.check(MenuEnum.VNNOX_ON_OFF.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- VnnoxResult vnnoxResult = vnnoxService.screenStatusChange(vnnoxWebRequest.getPlayerList(), vnnoxWebRequest.getScreenStatus());
+ List<List<LedPlayerEntity>> split = CollectionUtil.split(vnnoxWebRequest.getPlayerList(), 100);
+
+ VnnoxResult vnnoxResult=null;
+ for (List<LedPlayerEntity> splist : split) {
+ VnnoxResult vnnox = vnnoxService.screenStatusChange(splist, vnnoxWebRequest.getScreenStatus());
+ if(vnnoxResult!=null){
+ vnnoxResult.getSuccess().addAll(vnnox.getSuccess());
+ vnnoxResult.getFail().addAll(vnnox.getFail());
+ }
+ }
+
return ResponseUtil.success(vnnoxResult);
}
@@ -133,7 +170,17 @@
if (!permissionConfig.check(MenuEnum.VNNOX_VOL_CHANGE.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- VnnoxResult vnnoxResult = vnnoxService.volChange(vnnoxWebRequest.getPlayerList(), vnnoxWebRequest.getVol());
+
+ List<List<LedPlayerEntity>> split = CollectionUtil.split(vnnoxWebRequest.getPlayerList(), 100);
+
+ VnnoxResult vnnoxResult=null;
+ for (List<LedPlayerEntity> splist : split) {
+ VnnoxResult vnnox = vnnoxService.volChange(splist, vnnoxWebRequest.getVol());
+ if(vnnoxResult!=null){
+ vnnoxResult.getSuccess().addAll(vnnox.getSuccess());
+ vnnoxResult.getFail().addAll(vnnox.getFail());
+ }
+ }
return ResponseUtil.success(vnnoxResult);
}
@@ -148,7 +195,17 @@
if (!permissionConfig.check(MenuEnum.VNNOX_BRIGHTNESS_CHANGE.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- VnnoxResult vnnoxResult = vnnoxService.brightnessChange(vnnoxWebRequest.getPlayerList(), vnnoxWebRequest.getBrightness());
+
+ List<List<LedPlayerEntity>> split = CollectionUtil.split(vnnoxWebRequest.getPlayerList(), 100);
+
+ VnnoxResult vnnoxResult=null;
+ for (List<LedPlayerEntity> splist : split) {
+ VnnoxResult vnnox = vnnoxService.brightnessChange(splist, vnnoxWebRequest.getBrightness());
+ if(vnnoxResult!=null){
+ vnnoxResult.getSuccess().addAll(vnnox.getSuccess());
+ vnnoxResult.getFail().addAll(vnnox.getFail());
+ }
+ }
return ResponseUtil.success(vnnoxResult);
}
@@ -195,9 +252,8 @@
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
List<LedPlayerEntity> list = ledPlayerEntityService.ledPlayerEntityList(baseConditionVO, keyword);
- List<LedPlayerEntity> entities = vnnoxService.setCacheInfo(vnnoxAPIUtil.syncCurrentInfo(list));
List<LedPlayerEntity> online = new ArrayList<>();
- for (LedPlayerEntity ledPlayer : entities) {
+ for (LedPlayerEntity ledPlayer : list) {
if (ledPlayer.getOnlineStatus() == 1) {
online.add(ledPlayer);
}
--
Gitblit v1.9.3