From 03328152832ecc95572f75c03bd21934162d42d0 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 19 九月 2022 15:20:28 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java | 46 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 36 insertions(+), 10 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 e4b6266..00a7516 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
@@ -5,17 +5,20 @@
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.NovaAStateInfoParam;
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.vo.NovaAStateInfoVO;
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;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.net.URISyntaxException;
@@ -61,7 +64,7 @@
@PostMapping("/allScreenShot")
- public ResponseVO<Object> allScreenShot(@RequestBody List<NovaPushResultVO> vnnoxWebRequest) {
+ public ResponseVO<Object> allScreenShot(@RequestBody List<NovaPushResultVO> vnnoxWebRequest) throws InterruptedException {
return ResponseUtil.success(vnnoxService.getScreenShotUrl(vnnoxWebRequest));
}
@@ -178,10 +181,7 @@
@GetMapping("/list")
- 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) {
+ 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("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
@@ -189,10 +189,7 @@
}
@GetMapping("/onLineList")
- 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) {
+ 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("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
@@ -209,13 +206,16 @@
}
/**
- * 灞忓箷璇︽儏 //鍓嶇鏈彂鐜拌皟鐢�
+ * 灞忓箷璇︽儏
*
* @param sn
* @return
*/
@GetMapping("/getVnnoxInfo/{sn}")
public ResponseVO<Object> getBySnAndPlayerId(@PathVariable String sn) {
+ if (!permissionConfig.check(MenuEnum.LED_LIST.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(ledPlayerEntityService.getBySnAndPlayerSn(sn));
}
@@ -226,4 +226,30 @@
vnnoxService.saveInfo();
return ResponseUtil.success("鎵ц瀹屾瘯");
}
+
+// @AnonymousAccess
+// @PostMapping("/asyncStatus")
+// public ResponseVO<Object> asyncStatus(@RequestBody List<String> playerIds) {
+// vnnoxService.asyncStatus(playerIds);
+// return ResponseUtil.success("ok");
+// }
+
+
+ /**
+ * 鑾峰彇灞忓箷淇℃伅
+ *
+ * @param param
+ * @return
+ */
+ @PostMapping("/getInfo")
+ public ResponseVO<Object> getInfo(@RequestBody @Validated NovaAStateInfoParam param) {
+ if (!permissionConfig.check(MenuEnum.LED_LIST.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ //鍚屾鐘舵��
+ vnnoxService.getAsyncStatus(param.getPlayerIdList(),param.getStateValue());
+ //鑾峰彇鍚屾
+ List<NovaAStateInfoVO> info = vnnoxService.getInfo(param.getStateValue(), param.getPlayerIdList());
+ return ResponseUtil.success(info);
+ }
}
--
Gitblit v1.9.3