From 5e2fe6ce6e80dea99f6eda304dba6fafbb30ad63 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 09 九月 2022 11:34:13 +0800
Subject: [PATCH] 灯杆解绑fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java | 89 ++++++++++++++++++++++++++++----------------
1 files changed, 57 insertions(+), 32 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 c50718a..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,17 +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.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;
+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;
@@ -30,7 +30,6 @@
* 璇虹摝LED澶勭悊
*/
@RestController
-//@AllArgsConstructor
@RequestMapping("/v1/Vnnox")
public class VnnoxController {
@Autowired
@@ -41,10 +40,6 @@
private LedPlayerEntityService ledPlayerEntityService;
@Autowired
private VnnoxAPIUtil vnnoxAPIUtil;
- @Autowired
- private PoleBindingService bindingService;
- @Autowired
- private PoleService poleService;
/**
* 鎴睆
@@ -64,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));
}
/**
@@ -116,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()));
}
/**
@@ -131,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()));
}
/**
@@ -146,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()));
}
@@ -180,19 +178,25 @@
@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) {
+ 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);
+ 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) {
@@ -204,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