合并优化ssrc存储结构

648540858
1 parent 8c4922cb
Showing 3 changed files with 0 additions and 65 deletions
src/main/java/com/genersoft/iot/vmp/conf/redis/RedisConfig.java
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
-package com.genersoft.iot.vmp.conf.redis;
-
-
-import com.alibaba.fastjson2.support.spring.data.redis.GenericFastJsonRedisSerializer;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.annotation.Order;
-import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.serializer.StringRedisSerializer;
-
-import org.springframework.data.redis.listener.PatternTopic;
-import org.springframework.data.redis.listener.RedisMessageListenerContainer;
-
-
-/**
- * Redis中间件配置类，使用spring-data-redis集成，自动从application.yml中加载redis配置
- * swwheihei
- * 2019年5月30日 上午10:58:25
- * 
- */
-@Configuration
-@Order(value=1)
-public class RedisConfig {
-
-
-	@Bean
-	public RedisTemplate<Object, Object> redisTemplate(RedisConnectionFactory redisConnectionFactory) {
-		RedisTemplate<Object, Object> redisTemplate = new RedisTemplate<>();
-		// 使用fastJson序列化
-		GenericFastJsonRedisSerializer fastJsonRedisSerializer = new GenericFastJsonRedisSerializer();
-		// value值的序列化采用fastJsonRedisSerializer
-		redisTemplate.setValueSerializer(fastJsonRedisSerializer);
-		redisTemplate.setHashValueSerializer(fastJsonRedisSerializer);
-
-		// key的序列化采用StringRedisSerializer
-		redisTemplate.setKeySerializer(new StringRedisSerializer());
-		redisTemplate.setHashKeySerializer(new StringRedisSerializer());
-		redisTemplate.setConnectionFactory(redisConnectionFactory);
-		return redisTemplate;
-	}
-}
 package com.genersoft.iot.vmp.media.zlm.dto;
-import com.genersoft.iot.vmp.gb28181.session.SSRCFactory;
 import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig;
 import io.swagger.v3.oas.annotations.media.Schema;
 import org.springframework.util.ObjectUtils;
-import java.util.HashMap;
-
 @Schema(description = "流媒体服务信息")
 public class MediaServerItem{
@@ -80,20 +77,10 @@ public class MediaServerItem{
     @Schema(description = "是否是默认ZLM")
     private boolean defaultServer;
-//    @Schema(description = "SSRC信息")
-//    private SsrcConfig ssrcConfig;
-
     @Schema(description = "当前使用到的端口")
     private int currentPort;
-    /**
-     * 每一台ZLM都有一套独立的SSRC列表
-     * 在ApplicationCheckRunner里对mediaServerSsrcMap进行初始化
-     */
-    @Schema(description = "ID")
-    private HashMap<String, SSRCFactory> mediaServerSsrcMap;
-
     public MediaServerItem() {
     }
@@ -279,14 +266,6 @@ public class MediaServerItem{
         this.updateTime = updateTime;
     }
-    public HashMap<String, SSRCFactory> getMediaServerSsrcMap() {
-        return mediaServerSsrcMap;
-    }
-
-    public void setMediaServerSsrcMap(HashMap<String, SSRCFactory> mediaServerSsrcMap) {
-        this.mediaServerSsrcMap = mediaServerSsrcMap;
-    }
-
     public int getCurrentPort() {
         return currentPort;
     }
@@ -10,8 +10,6 @@ import com.genersoft.iot.vmp.conf.UserSetting;
 import com.genersoft.iot.vmp.conf.exception.ControllerException;
 import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
 import com.genersoft.iot.vmp.gb28181.session.SSRCFactory;
-import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;
-import com.genersoft.iot.vmp.gb28181.session.SsrcConfig;
 import com.genersoft.iot.vmp.media.zlm.AssistRESTfulUtils;
 import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils;
 import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory;