Merge remote-tracking branch 'origin/master'

liuhaonan

2022-05-11 2c52eaf28f9b8a666547e1307a76c3032598e57f

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

@@ -74,6 +74,9 @@
        }

        LedPlayerEntity one = getOne(Wrappers.lambdaQuery(LedPlayerEntity.class).eq(LedPlayerEntity::getSn, sn));
        if (one == null) {
            return equipmentInfo;
        }
        List<LedPlayerEntity> list = new ArrayList<>();
        list.add(one);
        List<LedPlayerEntity> ledPlayerEntities = vnnoxAPIUtil.syncCurrentInfo(list);
@@ -81,11 +84,11 @@
        if (one != null) {
            equipmentInfo.setEquipmentMac(one.getSn());
            equipmentInfo.setEquipmentName(one.getName());
           if (onlineStatus == 0) {
            if (onlineStatus == 0) {
                equipmentInfo.setEquipmentState("在线");
           }else {
               equipmentInfo.setEquipmentName("离线");
           }
            } else {
                equipmentInfo.setEquipmentName("离线");
            }
        }

        return equipmentInfo;