From cfb17d6e329f3cc7afe3018d6cc8784ebafd5965 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 14 九月 2022 16:08:57 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java | 69 ++++++++++++++++++++++++----------
1 files changed, 48 insertions(+), 21 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 4b7ad99..2ab4085 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,17 @@
package com.sandu.ximon.admin.controller;
import com.sandu.common.domain.ResponseVO;
+import com.sandu.common.execption.BusinessException;
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;
import com.sandu.ximon.admin.service.LedPlayerEntityService;
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.NovaResultParam;
import com.sandu.ximon.dao.domain.LedPlayerEntity;
import com.sandu.ximon.dao.domain.LedV2RegisterResultEntity;
import com.sandu.ximon.dao.enums.MenuEnum;
@@ -56,47 +59,53 @@
return ResponseUtil.success(map.get("url"));
}
+
+ @PostMapping("/allScreenShot")
+ public ResponseVO<Object> allScreenShot(@RequestBody List<NovaPushResultVO> vnnoxWebRequest) throws InterruptedException {
+ return ResponseUtil.success(vnnoxService.getScreenShotUrl(vnnoxWebRequest));
+ }
+
/**
* 閲嶅惎
*
- * @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("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- VnnoxResult vnnoxResult = vnnoxService.reboot(vnnoxWebRequest);
- return ResponseUtil.success(vnnoxResult);
+ return ResponseUtil.success(vnnoxService.reboot(nova));
}
/**
* 鍚屾鎾斁
*/
@PostMapping("/syncPlay")
- public ResponseVO<Object> syncPlay(@RequestBody Map map) {
+ public ResponseVO<Object> syncPlay(@RequestBody NovaResultParam vo) {
if (!permissionConfig.check(MenuEnum.VNNOX_SYNC_PLAY.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- List playIdlist = (List) map.get("playIdlist");
- Integer option = (Integer) map.get("option");
- VnnoxResult vnnoxResult = vnnoxService.syncPlay(playIdlist, option);
- return ResponseUtil.success(vnnoxResult);
+ List<NovaPushResultVO> playIdlist = vo.getPlayIdlist();
+ Integer option = vo.getOption();
+ if (option == null || vo.getOption() == null) {
+ throw new BusinessException("option涓嶈兘涓虹┖");
+ }
+ return ResponseUtil.success(vnnoxService.syncPlay(playIdlist, option));
}
/**
* ntp瀵规椂
*/
@PostMapping("/ntp")
- public ResponseVO<Object> ntp(@RequestBody Map map) {
+ public ResponseVO<Object> ntp(@RequestBody NovaResultParam vo) {
if (!permissionConfig.check(MenuEnum.VNNOX_NTP.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- boolean enable = (boolean) map.get("enable");
- List playIdlist = (List) map.get("playIdlist");
- VnnoxResult vnnoxResult = vnnoxService.ntpSync(playIdlist, enable);
- return ResponseUtil.success(vnnoxResult);
+ boolean enable = vo.isEnable();
+ List<NovaPushResultVO> playIdlist = vo.getPlayIdlist();
+ return ResponseUtil.success(vnnoxService.ntpSync(playIdlist, enable));
}
/**
@@ -108,8 +117,7 @@
if (!permissionConfig.check(MenuEnum.VNNOX_ON_OFF.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- VnnoxResult vnnoxResult = vnnoxService.screenStatusChange(vnnoxWebRequest.getPlayerList(), vnnoxWebRequest.getScreenStatus());
- return ResponseUtil.success(vnnoxResult);
+ return ResponseUtil.success(vnnoxService.screenStatusChange(vnnoxWebRequest.getPlayerList(), vnnoxWebRequest.getScreenStatus()));
}
/**
@@ -123,8 +131,7 @@
if (!permissionConfig.check(MenuEnum.VNNOX_VOL_CHANGE.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- VnnoxResult vnnoxResult = vnnoxService.volChange(vnnoxWebRequest.getPlayerList(), vnnoxWebRequest.getVol());
- return ResponseUtil.success(vnnoxResult);
+ return ResponseUtil.success(vnnoxService.volChange(vnnoxWebRequest.getPlayerList(), vnnoxWebRequest.getVol()));
}
/**
@@ -138,8 +145,7 @@
if (!permissionConfig.check(MenuEnum.VNNOX_BRIGHTNESS_CHANGE.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- VnnoxResult vnnoxResult = vnnoxService.brightnessChange(vnnoxWebRequest.getPlayerList(), vnnoxWebRequest.getBrightness());
- return ResponseUtil.success(vnnoxResult);
+ return ResponseUtil.success(vnnoxService.brightnessChange(vnnoxWebRequest.getPlayerList(), vnnoxWebRequest.getBrightness()));
}
@@ -202,8 +208,29 @@
}
+ /**
+ * 灞忓箷璇︽儏
+ *
+ * @param sn
+ * @return
+ */
@GetMapping("/getVnnoxInfo/{sn}")
public ResponseVO<Object> getBySnAndPlayerId(@PathVariable String sn) {
return ResponseUtil.success(ledPlayerEntityService.getBySnAndPlayerSn(sn));
}
+
+
+ @AnonymousAccess
+ @PostMapping("/saveInfo")
+ public ResponseVO<Object> saveInfo() {
+ vnnoxService.saveInfo();
+ return ResponseUtil.success("鎵ц瀹屾瘯");
+ }
+
+ @AnonymousAccess
+ @PostMapping("/asyncStatus")
+ public ResponseVO<Object> asyncStatus(List<String> playerIds) {
+ vnnoxService.asyncStatus(playerIds);
+ return ResponseUtil.success("ok");
+ }
}
--
Gitblit v1.9.3