Merge remote-tracking branch 'origin/master'

liuhaonan

2022-03-11 da823ef0819982dfa74bb0b7a9ce6d534d2fcc2d

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

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

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;
@@ -50,6 +51,9 @@
    @GetMapping("/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"));
        }
        return ResponseUtil.success(map.get("url"));
    }

@@ -67,7 +71,7 @@

    /**
     * @param vnnoxWebRequest
     * @return
     * @return  开关屏幕
     */
    @GetMapping("/screenStatusChange")
    public ResponseVO<Object> screenStatusChange(@RequestBody VnnoxParam vnnoxWebRequest) {
@@ -99,11 +103,6 @@
        return ResponseUtil.success(vnnoxResult);
    }

  /*  @RequestMapping("/changeLedName")
    public R changeLedName(@RequestBody VnnoxParam vnnoxWebRequest) {
        vnnoxService.changeLedName(vnnoxWebRequest.getId(),vnnoxWebRequest.getPlayerName());
        return ResponseUtil.success();
    }*/

    @PostMapping("/validateSN")
    public ResponseVO<Object> validateSN(@RequestBody Map map) throws URISyntaxException {
@@ -136,9 +135,14 @@
            //wrapper.eq(LedPlayerEntity::get)
            return ResponseUtil.success(""); //  todo
        } else {
            wrapper.like(LedPlayerEntity::getPlayerName, keyword);
            wrapper.like(LedPlayerEntity::getPlayerName, keyword)
                    .or(
                            querywrapper->{
                                querywrapper.like(LedPlayerEntity::getName, keyword);
                            }
                    );
            List<LedPlayerEntity> list = ledPlayerEntityService.list(wrapper);
            List<LedPlayerEntity> entities = vnnoxAPIUtil.syncCurrentInfo(list);
            List<LedPlayerEntity> entities = vnnoxService.setCacheInfo(vnnoxAPIUtil.syncCurrentInfo(list));
            return ResponseUtil.success(entities);
        }
    }
@@ -155,7 +159,7 @@
        } else {
            wrapper.like(LedPlayerEntity::getPlayerName, keyword);
            List<LedPlayerEntity> list = ledPlayerEntityService.list(wrapper);
            List<LedPlayerEntity> entities = vnnoxAPIUtil.syncCurrentInfo(list);
            List<LedPlayerEntity> entities = vnnoxService.setCacheInfo(vnnoxAPIUtil.syncCurrentInfo(list));
            List<LedPlayerEntity> online = new ArrayList<>();
            for (LedPlayerEntity ledPlayer : entities) {
                if (ledPlayer.getOnlineStatus() == 1) {