Merge remote-tracking branch 'origin/master'

MercuryZ

2022-03-31 ef270bd1855b5ce3f398c5df024840a498e33a8f

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java

@@ -2,7 +2,6 @@

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;
@@ -58,8 +57,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,7 +69,7 @@
     * @param vnnoxWebRequest
     * @return
     */
    @GetMapping("/reboot")
    @PostMapping("/reboot")
    public ResponseVO<Object> reboot(@RequestBody VnnoxParam vnnoxWebRequest) {
        VnnoxResult vnnoxResult = vnnoxService.reboot(vnnoxWebRequest.getPlayerList());
        return ResponseUtil.success(vnnoxResult);
@@ -78,9 +77,9 @@

    /**
     * @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 +91,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 +103,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);
@@ -143,7 +142,7 @@
        } else {
            wrapper.like(LedPlayerEntity::getPlayerName, keyword)
                    .or(
                            querywrapper->{
                            querywrapper -> {
                                querywrapper.like(LedPlayerEntity::getName, keyword);
                            }
                    );