修改排序

648540858

2024-06-19 f5abf8df4c05439a288a88dedad0f7065901ca21

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

@@ -11,12 +11,16 @@
import com.genersoft.iot.vmp.service.IMediaService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;

@Service
public class MediaServiceImpl implements IMediaService {

    private final static Logger logger = LoggerFactory.getLogger(MediaServiceImpl.class);

    @Autowired
    private IRedisCatchStorage redisCatchStorage;
@@ -57,6 +61,7 @@
            calld = streamAuthorityInfo.getCallId();
        }
        JSONObject mediaList = zlmresTfulUtils.getMediaList(mediaInfo, app, stream);
        logger.info("[zlm getMediaList]结果： /n {}", mediaList);
        if (mediaList != null) {
            if (mediaList.getInteger("code") == 0) {
                JSONArray data = mediaList.getJSONArray("data");
@@ -90,10 +95,6 @@
        if (addr == null) {
            addr = mediaInfo.getStreamIp();
        }
        if (!"broadcast".equalsIgnoreCase(app) && !ObjectUtils.isEmpty(mediaInfo.getTranscodeSuffix()) && !"null".equalsIgnoreCase(mediaInfo.getTranscodeSuffix())) {
            stream = stream + "_" + mediaInfo.getTranscodeSuffix();
//            streamInfoResult.setStream(stream);
        }

        streamInfoResult.setIp(addr);
        streamInfoResult.setMediaServerId(mediaInfo.getId());
@@ -107,6 +108,14 @@
        streamInfoResult.setRtc(addr, mediaInfo.getHttpPort(),mediaInfo.getHttpSSlPort(), app,  stream, callIdParam, isPlay);

        streamInfoResult.setTracks(tracks);

        if (!"broadcast".equalsIgnoreCase(app) && !ObjectUtils.isEmpty(mediaInfo.getTranscodeSuffix()) && !"null".equalsIgnoreCase(mediaInfo.getTranscodeSuffix())) {
            String newStream = stream + "_" + mediaInfo.getTranscodeSuffix();
            mediaInfo.setTranscodeSuffix(null);
            StreamInfo transcodeStreamInfo = getStreamInfoByAppAndStream(mediaInfo, app, newStream, tracks, addr, callId, isPlay);
            streamInfoResult.setTranscodeStream(transcodeStreamInfo);
        }

        return streamInfoResult;
    }
}