From ada0b243f16f12b5025253663eacfe53055f8310 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 10 八月 2022 17:03:50 +0800
Subject: [PATCH] changes

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java |   42 +++++++++++++++++++++---------------------
 1 files changed, 21 insertions(+), 21 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 263c6dc..e37fd54 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,6 +1,7 @@
 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.util.ResponseUtil;
 import com.sandu.ximon.admin.param.VnnoxParam;
@@ -8,7 +9,8 @@
 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.admin.vo.NovaPushResultVO;
+import com.sandu.ximon.admin.vo.NovaResultVO;
 import com.sandu.ximon.dao.domain.LedPlayerEntity;
 import com.sandu.ximon.dao.domain.LedV2RegisterResultEntity;
 import com.sandu.ximon.dao.enums.MenuEnum;
@@ -59,44 +61,44 @@
     /**
      * 閲嶅惎
      *
-     * @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 NovaResultVO 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 NovaResultVO 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));
     }
 
     /**
@@ -108,8 +110,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()));
     }
 
     /**
@@ -123,8 +124,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()));
     }
 
     /**
@@ -138,8 +138,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()));
     }
 
 
@@ -204,6 +203,7 @@
 
     /**
      * 灞忓箷璇︽儏     //鍓嶇鏈彂鐜拌皟鐢�
+     *
      * @param sn
      * @return
      */

--
Gitblit v1.9.3