From c04eb4859667264dd55a77aed70c0f5479b3384a Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 12 八月 2022 15:53:39 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java | 129 ++++++++++++------------------------------
1 files changed, 37 insertions(+), 92 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..e37fd54 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,17 +1,16 @@
package com.sandu.ximon.admin.controller;
-import cn.hutool.core.collection.CollectionUtil;
import com.sandu.common.domain.ResponseVO;
+import com.sandu.common.execption.BusinessException;
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;
+import com.sandu.ximon.admin.vo.NovaPushResultVO;
+import com.sandu.ximon.admin.vo.NovaResultVO;
import com.sandu.ximon.dao.domain.LedPlayerEntity;
import com.sandu.ximon.dao.domain.LedV2RegisterResultEntity;
import com.sandu.ximon.dao.enums.MenuEnum;
@@ -30,7 +29,6 @@
* 璇虹摝LED澶勭悊
*/
@RestController
-//@AllArgsConstructor
@RequestMapping("/v1/Vnnox")
public class VnnoxController {
@Autowired
@@ -41,10 +39,6 @@
private LedPlayerEntityService ledPlayerEntityService;
@Autowired
private VnnoxAPIUtil vnnoxAPIUtil;
- @Autowired
- private PoleBindingService bindingService;
- @Autowired
- private PoleService poleService;
/**
* 鎴睆
@@ -67,73 +61,44 @@
/**
* 閲嶅惎
*
- * @param vnnoxWebRequest
+ * @param
* @return
*/
@PostMapping("/reboot")
- public ResponseVO<Object> reboot(@RequestBody List<String> vnnoxWebRequest) {
+ public ResponseVO<Object> reboot(@RequestBody List<NovaPushResultVO> nova) {
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());
- }
- }
- return ResponseUtil.success(vnnoxResult);
+ return ResponseUtil.success(vnnoxService.reboot(nova));
}
/**
* 鍚屾鎾斁
*/
@PostMapping("/syncPlay")
- public ResponseVO<Object> syncPlay(@RequestBody Map map) {
+ public ResponseVO<Object> syncPlay(@RequestBody NovaResultVO vo) {
if (!permissionConfig.check(MenuEnum.VNNOX_SYNC_PLAY.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- 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());
- }
+ List<NovaPushResultVO> playIdlist = vo.getPlayIdlist();
+ Integer option = vo.getOption();
+ if (option == null || vo.getOption() == null) {
+ throw new BusinessException("option涓嶈兘涓虹┖");
}
- return ResponseUtil.success(vnnoxResult);
+ return ResponseUtil.success(vnnoxService.syncPlay(playIdlist, option));
}
/**
* ntp瀵规椂
*/
@PostMapping("/ntp")
- public ResponseVO<Object> ntp(@RequestBody Map map) {
+ public ResponseVO<Object> ntp(@RequestBody NovaResultVO vo) {
if (!permissionConfig.check(MenuEnum.VNNOX_NTP.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- 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());
- }
- }
- return ResponseUtil.success(vnnoxResult);
+ boolean enable = vo.isEnable();
+ List<NovaPushResultVO> playIdlist = vo.getPlayIdlist();
+ return ResponseUtil.success(vnnoxService.ntpSync(playIdlist, enable));
}
/**
@@ -145,18 +110,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());
- }
- }
-
- return ResponseUtil.success(vnnoxResult);
+ return ResponseUtil.success(vnnoxService.screenStatusChange(vnnoxWebRequest.getPlayerList(), vnnoxWebRequest.getScreenStatus()));
}
/**
@@ -170,18 +124,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());
- }
- }
- return ResponseUtil.success(vnnoxResult);
+ return ResponseUtil.success(vnnoxService.volChange(vnnoxWebRequest.getPlayerList(), vnnoxWebRequest.getVol()));
}
/**
@@ -195,18 +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());
- }
- }
- return ResponseUtil.success(vnnoxResult);
+ return ResponseUtil.success(vnnoxService.brightnessChange(vnnoxWebRequest.getPlayerList(), vnnoxWebRequest.getBrightness()));
}
@@ -239,21 +171,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);
}
@@ -262,6 +201,12 @@
}
+ /**
+ * 灞忓箷璇︽儏 //鍓嶇鏈彂鐜拌皟鐢�
+ *
+ * @param sn
+ * @return
+ */
@GetMapping("/getVnnoxInfo/{sn}")
public ResponseVO<Object> getBySnAndPlayerId(@PathVariable String sn) {
return ResponseUtil.success(ledPlayerEntityService.getBySnAndPlayerSn(sn));
--
Gitblit v1.9.3