From 045dcbf340bb5311223ba6b021fe8aa790e94086 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 20 九月 2022 15:57:15 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 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 00a7516..9620cde 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
@@ -8,12 +8,15 @@
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.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;
@@ -43,6 +46,11 @@
private LedPlayerEntityService ledPlayerEntityService;
@Autowired
private VnnoxAPIUtil vnnoxAPIUtil;
+ @Autowired
+ private LedNovaGroupRelationService relationService;
+ @Autowired
+ private LedNovaGroupService groupService;
+
/**
* 鎴睆
@@ -247,9 +255,30 @@
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
//鍚屾鐘舵��
- vnnoxService.getAsyncStatus(param.getPlayerIdList(),param.getStateValue());
+ 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("鍒嗙粍涓嶅瓨鍦�");
+ }
+ if (!permissionConfig.check(MenuEnum.LED_LIST.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ return ResponseUtil.success(ledPlayerEntityService.getListByGroupId(groupId));
+ }
}
--
Gitblit v1.9.3