修复合并错误

648540858
1 parent 668dc8f0
Showing 5 changed files with 5 additions and 32 deletions
src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
src/main/java/com/genersoft/iot/vmp/gb28181/conf/ServerLoggerImpl.java
src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java
src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java
src/main/resources/wvpssl.jks
@@ -233,12 +233,4 @@ public class MediaConfig{
         }
         return false;
     }
-
-    public String getRtpSendPortRange() {
-        return rtpSendPortRange;
-    }
-
-    public void setRtpSendPortRange(String rtpSendPortRange) {
-        this.rtpSendPortRange = rtpSendPortRange;
-    }
 }
 package com.genersoft.iot.vmp.gb28181.conf;
  
+import gov.nist.core.CommonLogger;
 import gov.nist.core.ServerLogger;
 import gov.nist.core.StackLogger;
 import gov.nist.javax.sip.message.SIPMessage;
@@ -84,7 +85,7 @@ public class ServerLoggerImpl implements ServerLogger {
         }
         if(sipStack instanceof SIPTransactionStack) {
             this.sipStack = (SIPTransactionStack)sipStack;
-            this.stackLogger = this.sipStack.getStackLogger();
+            this.stackLogger = CommonLogger.getLogger(SIPTransactionStack.class);
         }
     }
 }
@@ -7,16 +7,12 @@ import com.genersoft.iot.vmp.conf.UserSetting;
 import com.genersoft.iot.vmp.conf.exception.ControllerException;
 import com.genersoft.iot.vmp.media.zlm.SendRtpPortManager;
 import com.genersoft.iot.vmp.media.zlm.ZLMServerFactory;
-import com.genersoft.iot.vmp.media.zlm.SendRtpPortManager;
-import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory;
 import com.genersoft.iot.vmp.media.zlm.ZlmHttpHookSubscribe;
 import com.genersoft.iot.vmp.media.zlm.dto.HookSubscribeFactory;
 import com.genersoft.iot.vmp.media.zlm.dto.HookSubscribeForRtpServerTimeout;
 import com.genersoft.iot.vmp.media.zlm.dto.HookSubscribeForStreamChange;
 import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
 import com.genersoft.iot.vmp.media.zlm.dto.hook.OnRtpServerTimeoutHookParam;
-import com.genersoft.iot.vmp.service.IDeviceChannelService;
-import com.genersoft.iot.vmp.service.IDeviceService;
 import com.genersoft.iot.vmp.service.IMediaServerService;
 import com.genersoft.iot.vmp.utils.redis.RedisUtil;
 import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
@@ -39,7 +35,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeUnit;
  
 @SuppressWarnings("rawtypes")
 @Tag(name = "第三方服务对接")
@@ -63,15 +58,11 @@ public class RtpController {
     private IMediaServerService mediaServerService;
  
     @Autowired
-    private SendRtpPortManager sendRtpPortManager;
-
-    @Autowired
     private UserSetting userSetting;
  
     @Autowired
     private DynamicTask dynamicTask;
  
-
     @Autowired
     private RedisTemplate<Object, Object> redisTemplate;
  
@@ -136,7 +127,7 @@ public class RtpController {
                         }
                     });
         }
-        String key = VideoManagerConstants.WVP_OTHER_SEND_RTP_INFO + userSetting.getServerId() + callId;
+        String key = VideoManagerConstants.WVP_OTHER_SEND_RTP_INFO + userSetting.getServerId() + "_"  + callId;
         OtherRtpSendInfo otherRtpSendInfo = new OtherRtpSendInfo();
         otherRtpSendInfo.setReceiveIp(mediaServerItem.getSdpIp());
         otherRtpSendInfo.setReceivePortForVideo(localPortForVideo);
@@ -147,7 +138,6 @@ public class RtpController {
         // 将信息写入redis中，以备后用
         redisTemplate.opsForValue().set(receiveKey, otherRtpSendInfo);
         if (isSend != null && isSend) {
-            String key = VideoManagerConstants.WVP_OTHER_SEND_RTP_INFO + userSetting.getServerId() + "_"  + callId;
             // 预创建发流信息
             int portForVideo = sendRtpPortManager.getNextPort(mediaServerItem.getId());
             int portForAudio = sendRtpPortManager.getNextPort(mediaServerItem.getId());
@@ -18,7 +18,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -115,20 +114,11 @@ public class ApiDeviceController {
                                    @RequestParam(required = false)String q,
                                    @RequestParam(required = false)Boolean online ){
  
-//        if (logger.isDebugEnabled()) {
-//            logger.debug("查询所有视频设备API调用");
-//        }
+
         JSONObject result = new JSONObject();
-        // 查询设备是否存在
-//        Device device = storager.queryVideoDevice(serial);
-//        if (device == null) {
-//            result.put("ChannelCount", 0);
-//            result.put("ChannelList", "[]");
-//            return result;
-//        }
         List<DeviceChannelExtend> deviceChannels;
         List<String> channelIds = null;
-        if (!StringUtils.isEmpty(code)) {
+        if (!ObjectUtils.isEmpty(code)) {
             String[] split = code.trim().split(",");
             channelIds = Arrays.asList(split);
         }