From e55c8b0a92eb9715edd90c31dfd4de51a47b588b Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 04 十一月 2022 17:40:08 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java | 91 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 83 insertions(+), 8 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 e37fd54..f985e3f 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
@@ -3,18 +3,25 @@
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.NovaAStateInfoParam;
import com.sandu.ximon.admin.param.VnnoxParam;
import com.sandu.ximon.admin.security.PermissionConfig;
+import com.sandu.ximon.admin.service.LedNovaGroupRelationService;
+import com.sandu.ximon.admin.service.LedNovaGroupService;
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.NovaResultVO;
+import com.sandu.ximon.admin.vo.NovaResultParam;
+import com.sandu.ximon.dao.domain.LedNovaGroup;
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;
@@ -39,6 +46,11 @@
private LedPlayerEntityService ledPlayerEntityService;
@Autowired
private VnnoxAPIUtil vnnoxAPIUtil;
+ @Autowired
+ private LedNovaGroupRelationService relationService;
+ @Autowired
+ private LedNovaGroupService groupService;
+
/**
* 鎴睆
@@ -56,6 +68,12 @@
return ResponseUtil.fail(map.get("msg"));
}
return ResponseUtil.success(map.get("url"));
+ }
+
+
+ @PostMapping("/allScreenShot")
+ public ResponseVO<Object> allScreenShot(@RequestBody List<NovaPushResultVO> vnnoxWebRequest) throws InterruptedException {
+ return ResponseUtil.success(vnnoxService.getScreenShotUrl(vnnoxWebRequest));
}
/**
@@ -76,7 +94,7 @@
* 鍚屾鎾斁
*/
@PostMapping("/syncPlay")
- public ResponseVO<Object> syncPlay(@RequestBody NovaResultVO vo) {
+ public ResponseVO<Object> syncPlay(@RequestBody NovaResultParam vo) {
if (!permissionConfig.check(MenuEnum.VNNOX_SYNC_PLAY.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
@@ -92,7 +110,7 @@
* ntp瀵规椂
*/
@PostMapping("/ntp")
- public ResponseVO<Object> ntp(@RequestBody NovaResultVO vo) {
+ public ResponseVO<Object> ntp(@RequestBody NovaResultParam vo) {
if (!permissionConfig.check(MenuEnum.VNNOX_NTP.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
@@ -174,22 +192,24 @@
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) {
+ @RequestParam(value = "seq", required = false) Integer seq,
+ @RequestParam(value = "groupId", required = false) Long groupId) {
if (!permissionConfig.check(MenuEnum.LED_LIST.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- return ResponseUtil.successPage(ledPlayerEntityService.ledPlayerEntityList(baseConditionVO, keyword, order, seq));
+ return ResponseUtil.successPage(ledPlayerEntityService.ledPlayerEntityList(baseConditionVO, keyword, order, seq, groupId));
}
@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) {
+ @RequestParam(value = "seq", required = false) Integer seq,
+ @RequestParam(value = "groupId", required = false) Long groupId) {
if (!permissionConfig.check(MenuEnum.LED_LIST.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- List<LedPlayerEntity> list = ledPlayerEntityService.ledPlayerEntityList(baseConditionVO, keyword, order, seq);
+ List<LedPlayerEntity> list = ledPlayerEntityService.ledPlayerEntityList(baseConditionVO, keyword, order, seq, groupId);
List<LedPlayerEntity> entities = vnnoxService.setCacheInfo(vnnoxAPIUtil.syncCurrentInfo(list));
List<LedPlayerEntity> online = new ArrayList<>();
for (LedPlayerEntity ledPlayer : entities) {
@@ -202,13 +222,68 @@
}
/**
- * 灞忓箷璇︽儏 //鍓嶇鏈彂鐜拌皟鐢�
+ * 灞忓箷璇︽儏
*
* @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));
}
+
+
+ @AnonymousAccess
+ @PostMapping("/saveInfo")
+ public ResponseVO<Object> saveInfo() {
+ 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);
+ }
+
+ /**
+ * 鏍规嵁鍒嗙粍id鑾峰彇缁勫唴鐨勫睆骞�
+ */
+ @GetMapping("/getByGroupId")
+ public ResponseVO<Object> getByGroupId(@RequestParam(value = "groupId", required = true) Long groupId) {
+// if (!permissionConfig.check(MenuEnum.LED_N_GROUP_INFO.getCode())) {
+// return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+// }
+ if (groupId == null) {
+ throw new BusinessException("groupId涓嶈兘涓虹┖");
+ }
+ LedNovaGroup byId = groupService.getById(groupId);
+ if (byId == null) {
+ throw new BusinessException("鍒嗙粍涓嶅瓨鍦�");
+ }
+ return ResponseUtil.success(ledPlayerEntityService.getListByGroupId(groupId));
+ }
}
--
Gitblit v1.9.3