Merge remote-tracking branch 'origin/master'

MercuryZ

2022-03-31 ef270bd1855b5ce3f398c5df024840a498e33a8f

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

@@ -9,11 +9,14 @@
import com.sandu.ximon.admin.param.VnnoxParam;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.service.LedPlayerEntityService;
import com.sandu.ximon.admin.service.PoleBindingService;
import com.sandu.ximon.admin.service.PoleService;
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;
import com.sandu.ximon.dao.domain.PoleBinding;
import com.sandu.ximon.dao.enums.AdministratorEnums;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -40,6 +43,10 @@
    private LedPlayerEntityService ledPlayerEntityService;
    @Autowired
    private VnnoxAPIUtil vnnoxAPIUtil;
    @Autowired
    private PoleBindingService bindingService;
    @Autowired
    private PoleService poleService;

    /**
     * 截屏
@@ -47,9 +54,12 @@
     * @param vnnoxWebRequest
     * @return
     */
    @GetMapping("/screenShot")
    @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"));
        }
        return ResponseUtil.success(map.get("url"));
    }

@@ -59,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);
@@ -67,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);
@@ -81,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);
@@ -93,17 +103,12 @@
     * @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);
    }

  /*  @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 {
@@ -131,14 +136,28 @@
    public ResponseVO<Object> list(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);
            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));
            entities.forEach(
                    led->{
                        PoleBinding binding = bindingService.getOne(Wrappers.lambdaQuery(PoleBinding.class)
                                .eq(PoleBinding::getDeviceType, 1).eq(PoleBinding::getDeviceCode, led.getSn()));
                        if(binding!=null){
                            led.setPoleId(poleService.getById(binding.getPoleId()).getId());
                            led.setPoleName(poleService.getById(binding.getPoleId()).getPoleName());
                        }
                    }
            );
            return ResponseUtil.success(entities);
        }
    }
@@ -155,7 +174,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) {