优化代码空字符串判断

648540858

2022-10-17 c4fc4abf7cbaa621f7ca1946f67c786c6cd55b68

优化代码空字符串判断

 src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java

@@ -24,6 +24,8 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.context.request.async.DeferredResult;

import com.alibaba.fastjson.JSON;
@@ -405,12 +407,11 @@
        if (device == null) {
            return null;
        }
        String mediaServerId = device.getMediaServerId();
        MediaServerItem mediaServerItem;
        if (mediaServerId == null || "".equals(device.getMediaServerId()) || "auto".equals(device.getMediaServerId())) {
        if (ObjectUtils.isEmpty(device.getMediaServerId()) || "auto".equals(device.getMediaServerId())) {
            mediaServerItem = mediaServerService.getMediaServerForMinimumLoad();
        } else {
            mediaServerItem = mediaServerService.getOne(mediaServerId);
            mediaServerItem = mediaServerService.getOne(device.getMediaServerId());
        }
        if (mediaServerItem == null) {
            logger.warn("点播时未找到可使用的ZLM...");

 src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java

@@ -98,7 +98,7 @@
    @Override
    public StreamInfo save(StreamProxyItem param) {
        MediaServerItem mediaInfo;
        if (param.getMediaServerId() == null || "".equals(param.getMediaServerId()) || "auto".equals(param.getMediaServerId())){
        if (ObjectUtils.isEmpty(param.getMediaServerId()) || "auto".equals(param.getMediaServerId())){
            mediaInfo = mediaServerService.getMediaServerForMinimumLoad();
        }else {
            mediaInfo = mediaServerService.getOne(param.getMediaServerId());

 src/main/java/com/genersoft/iot/vmp/utils/CollectionUtil.java

File was deleted

 src/main/java/com/genersoft/iot/vmp/utils/ObjectUtils.java

File was deleted