changes

liuhaonan

2022-10-09 2e9a6554d676f5c696590b39258bd2644a8f2dc6

changes

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java

@@ -381,7 +381,6 @@
                AtomicInteger error = new AtomicInteger(commonPage.getList().size());



                DeviceOnLineCountVO light = new DeviceOnLineCountVO();
                lights.forEach(
                        device -> {
@@ -1111,7 +1110,11 @@
            if (pole == null) {
                throw new BusinessException("灯杆不存在");
            }

            //一级客户   -1   userId
            //二级客户   上级客户id  userId
            pole.setClientId(-1L);
            pole.setUserId(-1L);
            r = updateById(pole);

            if (!r) {

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/VnnoxService.java

@@ -504,7 +504,9 @@
        List<String> temp = new ArrayList<>();
        for (LedPlayerEntity item : ledList) {
            String playerId = item.getPlayerId();
            if (redisUtils.get(VnnoxConstant.REDIS_VOL + playerId) == null || redisUtils.get(VnnoxConstant.REDIS_BRIGHTNESS + playerId) == null) {
            if (redisUtils.get(VnnoxConstant.REDIS_VOL + playerId) == null
                    || redisUtils.get(VnnoxConstant.REDIS_BRIGHTNESS + playerId) == null
                    || redisUtils.get(VnnoxConstant.REDIS_SCREEN_STATUS + playerId) == null) {
                temp.add(item.getPlayerId());
            }
        }
@@ -521,9 +523,9 @@
            for (LedPlayerEntity playerEntity : list) {
                String playerId = playerEntity.getPlayerId();
                LedPlayerInfoEntity cache = new LedPlayerInfoEntity();
                //  设置屏幕状态
                //  设置屏幕状态  更新状态之后还拿不到数据说明设备有问题或不在线  设置默认为黑屏
                String result = redisUtils.get(VnnoxConstant.REDIS_SCREEN_STATUS + playerId);
                Integer screenStatus = 1;
                Integer screenStatus = 0;
                if (null != result) {
                    screenStatus = Integer.parseInt(result);
                }

 ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxAPIUtil.java

@@ -304,6 +304,7 @@
        List<String> commands = new ArrayList<>();
        commands.add("volumeValue");
        commands.add("brightnessValue");
        commands.add("screenPowerStatus");
        VnnoxBaseRequest request = new VnnoxBaseRequest();
        request.setPlayerIds(playerId);
        request.setCommands(commands);