From 403f1e16a39b9df292d50108197f25375d0fc471 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期六, 08 四月 2023 15:36:59 +0800
Subject: [PATCH] 合并优化ssrc存储结构
---
/dev/null | 42 ---------------------
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java | 2 -
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java | 21 ----------
3 files changed, 0 insertions(+), 65 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/redis/RedisConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/redis/RedisConfig.java
deleted file mode 100644
index 0035248..0000000
--- a/src/main/java/com/genersoft/iot/vmp/conf/redis/RedisConfig.java
+++ /dev/null
@@ -1,42 +0,0 @@
-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涓棿浠堕厤缃被锛屼娇鐢╯pring-data-redis闆嗘垚锛岃嚜鍔ㄤ粠application.yml涓姞杞絩edis閰嶇疆
- * 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鍊肩殑搴忓垪鍖栭噰鐢╢astJsonRedisSerializer
- redisTemplate.setValueSerializer(fastJsonRedisSerializer);
- redisTemplate.setHashValueSerializer(fastJsonRedisSerializer);
-
- // key鐨勫簭鍒楀寲閲囩敤StringRedisSerializer
- redisTemplate.setKeySerializer(new StringRedisSerializer());
- redisTemplate.setHashKeySerializer(new StringRedisSerializer());
- redisTemplate.setConnectionFactory(redisConnectionFactory);
- return redisTemplate;
- }
-}
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java
index ea248fd..e6bbb5f 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java
@@ -1,12 +1,9 @@
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,19 +77,9 @@
@Schema(description = "鏄惁鏄粯璁LM")
private boolean defaultServer;
-// @Schema(description = "SSRC淇℃伅")
-// private SsrcConfig ssrcConfig;
-
@Schema(description = "褰撳墠浣跨敤鍒扮殑绔彛")
private int currentPort;
-
- /**
- * 姣忎竴鍙癦LM閮芥湁涓�濂楃嫭绔嬬殑SSRC鍒楄〃
- * 鍦ˋpplicationCheckRunner閲屽mediaServerSsrcMap杩涜鍒濆鍖�
- */
- @Schema(description = "ID")
- private HashMap<String, SSRCFactory> mediaServerSsrcMap;
public MediaServerItem() {
}
@@ -277,14 +264,6 @@
public void setUpdateTime(String updateTime) {
this.updateTime = updateTime;
- }
-
- public HashMap<String, SSRCFactory> getMediaServerSsrcMap() {
- return mediaServerSsrcMap;
- }
-
- public void setMediaServerSsrcMap(HashMap<String, SSRCFactory> mediaServerSsrcMap) {
- this.mediaServerSsrcMap = mediaServerSsrcMap;
}
public int getCurrentPort() {
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
index 07177f0..856359c 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
@@ -10,8 +10,6 @@
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;
--
Gitblit v1.8.0