Merge remote-tracking branch 'origin/master'

zhanzhiqin

2022-04-14 5459d714b3d6fd4a2fc8b48775ccdc9ea8678279

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

@@ -145,14 +145,18 @@
                            querywrapper -> {
                                querywrapper.like(LedPlayerEntity::getName, keyword);
                            }
                    ).or(
                            sn->{
                                sn.like(LedPlayerEntity::getSn,keyword);
                            }
                    );
            List<LedPlayerEntity> list = ledPlayerEntityService.list(wrapper);
            List<LedPlayerEntity> entities = vnnoxService.setCacheInfo(vnnoxAPIUtil.syncCurrentInfo(list));
            entities.forEach(
                    led->{
                    led -> {
                        PoleBinding binding = bindingService.getOne(Wrappers.lambdaQuery(PoleBinding.class)
                                .eq(PoleBinding::getDeviceType, 1).eq(PoleBinding::getDeviceCode, led.getSn()));
                        if(binding!=null){
                        if (binding != null) {
                            led.setPoleId(poleService.getById(binding.getPoleId()).getId());
                            led.setPoleName(poleService.getById(binding.getPoleId()).getPoleName());
                        }
@@ -184,4 +188,9 @@
            return ResponseUtil.success(online);
        }
    }

    @GetMapping("/getVnnoxInfo/{sn}")
    public ResponseVO<Object> getBySnAndPlayerId(@PathVariable String sn) {
        return ResponseUtil.success(ledPlayerEntityService.getBySnAndPlayerSn(sn));
    }
}