From 818714b1cf020735474594b16e539fafd37cb33f Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期三, 27 四月 2022 16:02:28 +0800
Subject: [PATCH] 大气数据推送到LED
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java | 39 +++++++++++++++++++++++++++------------
1 files changed, 27 insertions(+), 12 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 75668f4..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
@@ -20,6 +20,7 @@
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.*;
@@ -73,8 +74,30 @@
* @return
*/
@PostMapping("/reboot")
- public ResponseVO<Object> reboot(@RequestBody VnnoxParam vnnoxWebRequest) {
- VnnoxResult vnnoxResult = vnnoxService.reboot(vnnoxWebRequest.getPlayerList());
+ 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);
}
@@ -145,16 +168,8 @@
@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) {
@@ -163,7 +178,7 @@
}
}
return ResponseUtil.success(online);
- }
+
}
@GetMapping("/getVnnoxInfo/{sn}")
--
Gitblit v1.9.3