From 8f95880fef5e5cb178144bed6f7685a42d84e48b Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期四, 23 六月 2022 17:07:28 +0800
Subject: [PATCH] bug修复
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java | 79 ++++++++++++++++++++++++++-------------
1 files changed, 52 insertions(+), 27 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 bdda4e0..4b7ad99 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
@@ -2,13 +2,10 @@
import com.sandu.common.domain.ResponseVO;
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.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;
@@ -30,7 +27,6 @@
* 璇虹摝LED澶勭悊
*/
@RestController
-//@AllArgsConstructor
@RequestMapping("/v1/Vnnox")
public class VnnoxController {
@Autowired
@@ -41,10 +37,6 @@
private LedPlayerEntityService ledPlayerEntityService;
@Autowired
private VnnoxAPIUtil vnnoxAPIUtil;
- @Autowired
- private PoleBindingService bindingService;
- @Autowired
- private PoleService poleService;
/**
* 鎴睆
@@ -54,6 +46,9 @@
*/
@PostMapping("/screenShot")
public ResponseVO<Object> screenShot(@RequestBody VnnoxParam vnnoxWebRequest) {
+ if (!permissionConfig.check(MenuEnum.VNNOX_SCREENSHOT.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
Map<String, String> map = vnnoxService.getScreenShotUrl(vnnoxWebRequest.getId());
if (map.get("code").equals("500")) {
return ResponseUtil.fail(map.get("msg"));
@@ -69,6 +64,9 @@
*/
@PostMapping("/reboot")
public ResponseVO<Object> reboot(@RequestBody List<String> vnnoxWebRequest) {
+ if (!permissionConfig.check(MenuEnum.VNNOX_RESTART.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
VnnoxResult vnnoxResult = vnnoxService.reboot(vnnoxWebRequest);
return ResponseUtil.success(vnnoxResult);
}
@@ -76,24 +74,28 @@
/**
* 鍚屾鎾斁
*/
- @AnonymousAccess
@PostMapping("/syncPlay")
public ResponseVO<Object> syncPlay(@RequestBody Map map) {
- List playIdlist = (List)map.get("playIdlist");
+ 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);
+ VnnoxResult vnnoxResult = vnnoxService.syncPlay(playIdlist, option);
return ResponseUtil.success(vnnoxResult);
}
/**
* ntp瀵规椂
*/
- @AnonymousAccess
@PostMapping("/ntp")
public ResponseVO<Object> ntp(@RequestBody Map map) {
- boolean enable = (boolean)map.get("enable");
- List playIdlist = (List)map.get("playIdlist");
- VnnoxResult vnnoxResult = vnnoxService.ntpSync(playIdlist,enable);
+ 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);
}
@@ -103,6 +105,9 @@
*/
@PostMapping("/screenStatusChange")
public ResponseVO<Object> screenStatusChange(@RequestBody VnnoxParam vnnoxWebRequest) {
+ if (!permissionConfig.check(MenuEnum.VNNOX_ON_OFF.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
VnnoxResult vnnoxResult = vnnoxService.screenStatusChange(vnnoxWebRequest.getPlayerList(), vnnoxWebRequest.getScreenStatus());
return ResponseUtil.success(vnnoxResult);
}
@@ -115,6 +120,9 @@
*/
@PostMapping("/volChange")
public ResponseVO<Object> volChange(@RequestBody VnnoxParam vnnoxWebRequest) {
+ if (!permissionConfig.check(MenuEnum.VNNOX_VOL_CHANGE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
VnnoxResult vnnoxResult = vnnoxService.volChange(vnnoxWebRequest.getPlayerList(), vnnoxWebRequest.getVol());
return ResponseUtil.success(vnnoxResult);
}
@@ -127,6 +135,9 @@
*/
@PostMapping("/brightnessChange")
public ResponseVO<Object> brightnessChange(@RequestBody VnnoxParam vnnoxWebRequest) {
+ if (!permissionConfig.check(MenuEnum.VNNOX_BRIGHTNESS_CHANGE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
VnnoxResult vnnoxResult = vnnoxService.brightnessChange(vnnoxWebRequest.getPlayerList(), vnnoxWebRequest.getBrightness());
return ResponseUtil.success(vnnoxResult);
}
@@ -134,6 +145,9 @@
@PostMapping("/validateSN")
public ResponseVO<Object> validateSN(@RequestBody Map map) throws URISyntaxException {
+ if (!permissionConfig.check(MenuEnum.VNNOX_ADD.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
String sn = (String) map.get("sn");
String name = (String) map.get("name");
LedV2RegisterResultEntity ledV2RegisterResultEntity = vnnoxService.validateSN(name, sn);
@@ -142,6 +156,9 @@
@PostMapping("/updateLedName/{id}")
public ResponseVO<Object> updateLedName(@PathVariable Long id, @RequestBody Map map) {
+ if (!permissionConfig.check(MenuEnum.VNNOX_NAME_UPDATE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
String name = (String) map.get("name");
boolean b = vnnoxService.updateDataName(id, name);
if (b) {
@@ -155,25 +172,33 @@
@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) {
-
- List<LedPlayerEntity> list = ledPlayerEntityService.ledPlayerEntityList(baseConditionVO, keyword);
- List<LedPlayerEntity> entities = vnnoxService.setCacheInfo(vnnoxAPIUtil.syncCurrentInfo(list));
- List<LedPlayerEntity> online = new ArrayList<>();
- for (LedPlayerEntity ledPlayer : entities) {
- if (ledPlayer.getOnlineStatus() == 1) {
- online.add(ledPlayer);
- }
+ 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, order, seq);
+ List<LedPlayerEntity> entities = vnnoxService.setCacheInfo(vnnoxAPIUtil.syncCurrentInfo(list));
+ List<LedPlayerEntity> online = new ArrayList<>();
+ for (LedPlayerEntity ledPlayer : entities) {
+ if (ledPlayer.getOnlineStatus() == 1) {
+ online.add(ledPlayer);
}
- return ResponseUtil.success(online);
+ }
+ return ResponseUtil.success(online);
}
--
Gitblit v1.9.3