From 9a55a0bb7f804c17ef3884e2590252ded57a846b Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 08 三月 2022 10:10:09 +0800
Subject: [PATCH] 功能完善

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java |   64 ++++++++++++++++++++++++-------
 1 files changed, 49 insertions(+), 15 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 c9e1fc6..38ebf21 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
@@ -10,6 +10,7 @@
 import com.sandu.ximon.admin.security.SecurityUtils;
 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.utils.response.VnnoxResult;
 import com.sandu.ximon.dao.domain.LedPlayerEntity;
 import com.sandu.ximon.dao.domain.LedV2RegisterResultEntity;
@@ -18,6 +19,8 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -35,9 +38,12 @@
     private VnnoxService vnnoxService;
     @Autowired
     private LedPlayerEntityService ledPlayerEntityService;
+    @Autowired
+    private VnnoxAPIUtil vnnoxAPIUtil;
 
     /**
      * 鎴睆
+     *
      * @param vnnoxWebRequest
      * @return
      */
@@ -49,6 +55,7 @@
 
     /**
      * 閲嶅惎
+     *
      * @param vnnoxWebRequest
      * @return
      */
@@ -59,35 +66,36 @@
     }
 
     /**
-     *
      * @param vnnoxWebRequest
      * @return
      */
     @GetMapping("/screenStatusChange")
     public ResponseVO<Object> screenStatusChange(@RequestBody VnnoxParam vnnoxWebRequest) {
-        VnnoxResult vnnoxResult = vnnoxService.screenStatusChange(vnnoxWebRequest.getPlayerList(),vnnoxWebRequest.getScreenStatus());
+        VnnoxResult vnnoxResult = vnnoxService.screenStatusChange(vnnoxWebRequest.getPlayerList(), vnnoxWebRequest.getScreenStatus());
         return ResponseUtil.success(vnnoxResult);
     }
 
     /**
      * 闊抽噺璋冭妭
+     *
      * @param vnnoxWebRequest
      * @return
      */
     @GetMapping("/volChange")
     public ResponseVO<Object> volChange(@RequestBody VnnoxParam vnnoxWebRequest) {
-        VnnoxResult vnnoxResult = vnnoxService.volChange(vnnoxWebRequest.getPlayerList(),vnnoxWebRequest.getVol());
+        VnnoxResult vnnoxResult = vnnoxService.volChange(vnnoxWebRequest.getPlayerList(), vnnoxWebRequest.getVol());
         return ResponseUtil.success(vnnoxResult);
     }
 
     /**
      * 浜害璋冭妭
+     *
      * @param vnnoxWebRequest
      * @return
      */
     @GetMapping("/brightnessChange")
     public ResponseVO<Object> brightnessChange(@RequestBody VnnoxParam vnnoxWebRequest) {
-        VnnoxResult vnnoxResult = vnnoxService.brightnessChange(vnnoxWebRequest.getPlayerList(),vnnoxWebRequest.getBrightness());
+        VnnoxResult vnnoxResult = vnnoxService.brightnessChange(vnnoxWebRequest.getPlayerList(), vnnoxWebRequest.getBrightness());
         return ResponseUtil.success(vnnoxResult);
     }
 
@@ -99,19 +107,20 @@
 
     @PostMapping("/validateSN")
     public ResponseVO<Object> validateSN(@RequestBody Map map) throws URISyntaxException {
-        String sn = (String)map.get("sn");
-        String name = (String)map.get("name");
-        LedV2RegisterResultEntity ledV2RegisterResultEntity = vnnoxService.validateSN(name,sn);
+        String sn = (String) map.get("sn");
+        String name = (String) map.get("name");
+        LedV2RegisterResultEntity ledV2RegisterResultEntity = vnnoxService.validateSN(name, sn);
         return ResponseUtil.success(ledV2RegisterResultEntity);
     }
 
     @PostMapping("/updateLedName/{id}")
-    public ResponseVO<Object> updateLedName(@PathVariable Long id,@RequestBody Map map) {
-        String name = (String)map.get("name");
+    public ResponseVO<Object> updateLedName(@PathVariable Long id, @RequestBody Map map) {
+        String name = (String) map.get("name");
         boolean b = vnnoxService.updateDataName(id, name);
-        if(b){
+        if (b) {
             return ResponseUtil.success("鏇存敼鎴愬姛");
-        }{
+        }
+        {
             return ResponseUtil.success("鏇存敼澶辫触");
         }
 
@@ -123,12 +132,37 @@
         PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
         LambdaQueryWrapper<LedPlayerEntity> wrapper = Wrappers.lambdaQuery(LedPlayerEntity.class);
 
-        if(AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getAdministratorIdentity())) {
+        if (AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getAdministratorIdentity())) {
             //wrapper.eq(LedPlayerEntity::get)
             return ResponseUtil.success(""); //  todo
-        }else {
-            wrapper.like(LedPlayerEntity::getPlayerName,keyword);
-            return ResponseUtil.success(ledPlayerEntityService.list(wrapper));
+        } else {
+            wrapper.like(LedPlayerEntity::getPlayerName, keyword);
+            List<LedPlayerEntity> list = ledPlayerEntityService.list(wrapper);
+            List<LedPlayerEntity> entities = vnnoxAPIUtil.syncCurrentInfo(list);
+            return ResponseUtil.success(entities);
+        }
+    }
+
+    @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> entities = vnnoxAPIUtil.syncCurrentInfo(list);
+            List<LedPlayerEntity> online = new ArrayList<>();
+            for (LedPlayerEntity ledPlayer : entities) {
+                if (ledPlayer.getOnlineStatus() == 1) {
+                    online.add(ledPlayer);
+                }
+            }
+            return ResponseUtil.success(online);
         }
     }
 }

--
Gitblit v1.9.3