From 78c7b03e279cad29a6123e83da738edc1f00280c Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期四, 23 六月 2022 16:55:41 +0800
Subject: [PATCH] bug修复
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java | 96 +++++++++---------------------------------------
1 files changed, 18 insertions(+), 78 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 4264f83..4b7ad99 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,14 +1,11 @@
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.util.ResponseUtil;
import com.sandu.ximon.admin.param.VnnoxParam;
import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.service.LedPlayerEntityService;
-import com.sandu.ximon.admin.service.PoleBindingService;
-import com.sandu.ximon.admin.service.PoleService;
import com.sandu.ximon.admin.service.VnnoxService;
import com.sandu.ximon.admin.utils.VnnoxAPIUtil;
import com.sandu.ximon.admin.utils.response.VnnoxResult;
@@ -30,7 +27,6 @@
* 璇虹摝LED澶勭悊
*/
@RestController
-//@AllArgsConstructor
@RequestMapping("/v1/Vnnox")
public class VnnoxController {
@Autowired
@@ -41,10 +37,6 @@
private LedPlayerEntityService ledPlayerEntityService;
@Autowired
private VnnoxAPIUtil vnnoxAPIUtil;
- @Autowired
- private PoleBindingService bindingService;
- @Autowired
- private PoleService poleService;
/**
* 鎴睆
@@ -75,17 +67,7 @@
if (!permissionConfig.check(MenuEnum.VNNOX_RESTART.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
-
- 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());
- }
- }
+ VnnoxResult vnnoxResult = vnnoxService.reboot(vnnoxWebRequest);
return ResponseUtil.success(vnnoxResult);
}
@@ -99,16 +81,7 @@
}
List playIdlist = (List) map.get("playIdlist");
Integer option = (Integer) map.get("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());
- }
- }
+ VnnoxResult vnnoxResult = vnnoxService.syncPlay(playIdlist, option);
return ResponseUtil.success(vnnoxResult);
}
@@ -122,17 +95,7 @@
}
boolean enable = (boolean) map.get("enable");
List playIdlist = (List) map.get("playIdlist");
-
- 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());
- }
- }
+ VnnoxResult vnnoxResult = vnnoxService.ntpSync(playIdlist, enable);
return ResponseUtil.success(vnnoxResult);
}
@@ -145,17 +108,7 @@
if (!permissionConfig.check(MenuEnum.VNNOX_ON_OFF.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- 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());
- }
- }
-
+ VnnoxResult vnnoxResult = vnnoxService.screenStatusChange(vnnoxWebRequest.getPlayerList(), vnnoxWebRequest.getScreenStatus());
return ResponseUtil.success(vnnoxResult);
}
@@ -170,17 +123,7 @@
if (!permissionConfig.check(MenuEnum.VNNOX_VOL_CHANGE.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
-
- 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());
- }
- }
+ VnnoxResult vnnoxResult = vnnoxService.volChange(vnnoxWebRequest.getPlayerList(), vnnoxWebRequest.getVol());
return ResponseUtil.success(vnnoxResult);
}
@@ -195,17 +138,7 @@
if (!permissionConfig.check(MenuEnum.VNNOX_BRIGHTNESS_CHANGE.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
-
- 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());
- }
- }
+ VnnoxResult vnnoxResult = vnnoxService.brightnessChange(vnnoxWebRequest.getPlayerList(), vnnoxWebRequest.getBrightness());
return ResponseUtil.success(vnnoxResult);
}
@@ -239,21 +172,28 @@
@GetMapping("/list")
- public ResponseVO<Object> list(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+ public ResponseVO<Object> list(BaseConditionVO baseConditionVO,
+ @RequestParam(value = "keyword", required = false) String keyword,
+ @RequestParam(value = "order", required = false) Integer order,
+ @RequestParam(value = "seq", required = false) Integer seq) {
if (!permissionConfig.check(MenuEnum.LED_LIST.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- return ResponseUtil.successPage(ledPlayerEntityService.ledPlayerEntityList(baseConditionVO, keyword));
+ return ResponseUtil.successPage(ledPlayerEntityService.ledPlayerEntityList(baseConditionVO, keyword, order, seq));
}
@GetMapping("/onLineList")
- public ResponseVO<Object> onLineList(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+ public ResponseVO<Object> onLineList(BaseConditionVO baseConditionVO,
+ @RequestParam(value = "keyword", required = false) String keyword,
+ @RequestParam(value = "order", required = false) Integer order,
+ @RequestParam(value = "seq", required = false) Integer seq) {
if (!permissionConfig.check(MenuEnum.LED_LIST.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- List<LedPlayerEntity> list = ledPlayerEntityService.ledPlayerEntityList(baseConditionVO, keyword);
+ List<LedPlayerEntity> list = ledPlayerEntityService.ledPlayerEntityList(baseConditionVO, keyword, order, seq);
+ List<LedPlayerEntity> entities = vnnoxService.setCacheInfo(vnnoxAPIUtil.syncCurrentInfo(list));
List<LedPlayerEntity> online = new ArrayList<>();
- for (LedPlayerEntity ledPlayer : list) {
+ for (LedPlayerEntity ledPlayer : entities) {
if (ledPlayer.getOnlineStatus() == 1) {
online.add(ledPlayer);
}
--
Gitblit v1.9.3