From b67bd85fbe51486dcacf5a5e3b308e4a0f3e2e43 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期日, 24 四月 2022 18:35:42 +0800
Subject: [PATCH] bug修复
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java | 92 +++++++++++++++++++++++-----------------------
1 files changed, 46 insertions(+), 46 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 0fcf390..ec4939c 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,12 +2,12 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.api.R;
import com.github.pagehelper.PageHelper;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.object.BaseConditionVO;
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.security.SecurityUtils;
import com.sandu.ximon.admin.service.LedPlayerEntityService;
import com.sandu.ximon.admin.service.PoleBindingService;
@@ -19,6 +19,8 @@
import com.sandu.ximon.dao.domain.LedV2RegisterResultEntity;
import com.sandu.ximon.dao.domain.PoleBinding;
import com.sandu.ximon.dao.enums.AdministratorEnums;
+import com.sandu.ximon.dao.enums.MenuEnum;
+import com.sun.javafx.collections.MappingChange;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -37,7 +39,8 @@
//@AllArgsConstructor
@RequestMapping("/v1/Vnnox")
public class VnnoxController {
-
+ @Autowired
+ private PermissionConfig permissionConfig;
@Autowired
private VnnoxService vnnoxService;
@Autowired
@@ -58,8 +61,8 @@
@PostMapping("/screenShot")
public ResponseVO<Object> screenShot(@RequestBody VnnoxParam vnnoxWebRequest) {
Map<String, String> map = vnnoxService.getScreenShotUrl(vnnoxWebRequest.getId());
- if(map.get("code").equals("500")) {
- return ResponseUtil.fail(map.get("msg"));
+ if (map.get("code").equals("500")) {
+ return ResponseUtil.fail(map.get("msg"));
}
return ResponseUtil.success(map.get("url"));
}
@@ -70,17 +73,39 @@
* @param vnnoxWebRequest
* @return
*/
- @GetMapping("/reboot")
- public ResponseVO<Object> reboot(@RequestBody VnnoxParam vnnoxWebRequest) {
- VnnoxResult vnnoxResult = vnnoxService.reboot(vnnoxWebRequest.getPlayerList());
+ @PostMapping("/reboot")
+ public ResponseVO<Object> reboot(@RequestBody List<String> vnnoxWebRequest) {
+ VnnoxResult vnnoxResult = vnnoxService.reboot(vnnoxWebRequest);
+ return ResponseUtil.success(vnnoxResult);
+ }
+
+ /**
+ * 鍚屾鎾斁
+ */
+ @PostMapping("/syncPlay")
+ public ResponseVO<Object> syncPlay(@RequestBody Map map) {
+ List playIdlist = (List)map.get("playIdlist");
+ Integer option = (Integer) map.get("option");
+ VnnoxResult vnnoxResult = vnnoxService.syncPlay(playIdlist,option);
+ return ResponseUtil.success(vnnoxResult);
+ }
+
+ /**
+ * ntp瀵规椂
+ */
+ @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);
return ResponseUtil.success(vnnoxResult);
}
/**
* @param vnnoxWebRequest
- * @return 寮�鍏冲睆骞�
+ * @return 寮�鍏冲睆骞�
*/
- @GetMapping("/screenStatusChange")
+ @PostMapping("/screenStatusChange")
public ResponseVO<Object> screenStatusChange(@RequestBody VnnoxParam vnnoxWebRequest) {
VnnoxResult vnnoxResult = vnnoxService.screenStatusChange(vnnoxWebRequest.getPlayerList(), vnnoxWebRequest.getScreenStatus());
return ResponseUtil.success(vnnoxResult);
@@ -92,7 +117,7 @@
* @param vnnoxWebRequest
* @return
*/
- @GetMapping("/volChange")
+ @PostMapping("/volChange")
public ResponseVO<Object> volChange(@RequestBody VnnoxParam vnnoxWebRequest) {
VnnoxResult vnnoxResult = vnnoxService.volChange(vnnoxWebRequest.getPlayerList(), vnnoxWebRequest.getVol());
return ResponseUtil.success(vnnoxResult);
@@ -104,7 +129,7 @@
* @param vnnoxWebRequest
* @return
*/
- @GetMapping("/brightnessChange")
+ @PostMapping("/brightnessChange")
public ResponseVO<Object> brightnessChange(@RequestBody VnnoxParam vnnoxWebRequest) {
VnnoxResult vnnoxResult = vnnoxService.brightnessChange(vnnoxWebRequest.getPlayerList(), vnnoxWebRequest.getBrightness());
return ResponseUtil.success(vnnoxResult);
@@ -135,46 +160,16 @@
@GetMapping("/list")
public ResponseVO<Object> list(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
- LambdaQueryWrapper<LedPlayerEntity> wrapper = Wrappers.lambdaQuery(LedPlayerEntity.class);
- if (AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getAdministratorIdentity())) {
- //wrapper.eq(LedPlayerEntity::get)
- return ResponseUtil.success(""); // todo
- } else {
- wrapper.like(LedPlayerEntity::getPlayerName, keyword)
- .or(
- querywrapper->{
- querywrapper.like(LedPlayerEntity::getName, keyword);
- }
- );
- List<LedPlayerEntity> list = ledPlayerEntityService.list(wrapper);
- List<LedPlayerEntity> entities = vnnoxService.setCacheInfo(vnnoxAPIUtil.syncCurrentInfo(list));
- entities.forEach(
- led->{
- PoleBinding binding = bindingService.getOne(Wrappers.lambdaQuery(PoleBinding.class)
- .eq(PoleBinding::getDeviceType, 1).eq(PoleBinding::getDeviceCode, led.getSn()));
- if(binding!=null){
- led.setPoleId(poleService.getById(binding.getPoleId()).getId());
- led.setPoleName(poleService.getById(binding.getPoleId()).getPoleName());
- }
- }
- );
- return ResponseUtil.success(entities);
+ if (!permissionConfig.check(MenuEnum.LED_LIST.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
+ return ResponseUtil.successPage(ledPlayerEntityService.ledPlayerEntityList(baseConditionVO, keyword));
}
@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) {
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
- LambdaQueryWrapper<LedPlayerEntity> wrapper = Wrappers.lambdaQuery(LedPlayerEntity.class);
- if (AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getAdministratorIdentity())) {
- //wrapper.eq(LedPlayerEntity::get)
- return ResponseUtil.success(""); // todo
- } else {
- wrapper.like(LedPlayerEntity::getPlayerName, keyword);
- List<LedPlayerEntity> list = ledPlayerEntityService.list(wrapper);
+ List<LedPlayerEntity> list = ledPlayerEntityService.ledPlayerEntityList(baseConditionVO, keyword);
List<LedPlayerEntity> entities = vnnoxService.setCacheInfo(vnnoxAPIUtil.syncCurrentInfo(list));
List<LedPlayerEntity> online = new ArrayList<>();
for (LedPlayerEntity ledPlayer : entities) {
@@ -183,6 +178,11 @@
}
}
return ResponseUtil.success(online);
- }
+
+ }
+
+ @GetMapping("/getVnnoxInfo/{sn}")
+ public ResponseVO<Object> getBySnAndPlayerId(@PathVariable String sn) {
+ return ResponseUtil.success(ledPlayerEntityService.getBySnAndPlayerSn(sn));
}
}
--
Gitblit v1.9.3