|
@@ -12,13 +12,19 @@ import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
|
|
|
import com.genersoft.iot.vmp.service.IDeviceService;
|
|
import com.genersoft.iot.vmp.service.IDeviceService;
|
|
|
import com.genersoft.iot.vmp.service.IMediaServerService;
|
|
import com.genersoft.iot.vmp.service.IMediaServerService;
|
|
|
import com.genersoft.iot.vmp.service.IPlatformService;
|
|
import com.genersoft.iot.vmp.service.IPlatformService;
|
|
|
|
|
+import com.genersoft.iot.vmp.service.impl.PlatformServiceImpl;
|
|
|
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
|
|
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
|
|
|
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
|
|
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.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.boot.CommandLineRunner;
|
|
import org.springframework.boot.CommandLineRunner;
|
|
|
import org.springframework.core.annotation.Order;
|
|
import org.springframework.core.annotation.Order;
|
|
|
import org.springframework.stereotype.Component;
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
|
|
|
|
|
+import javax.sip.InvalidArgumentException;
|
|
|
|
|
+import javax.sip.SipException;
|
|
|
|
|
+import java.text.ParseException;
|
|
|
import java.util.HashMap;
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
@@ -59,6 +65,8 @@ public class SipRunner implements CommandLineRunner {
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private ISIPCommanderForPlatform commanderForPlatform;
|
|
private ISIPCommanderForPlatform commanderForPlatform;
|
|
|
|
|
|
|
|
|
|
+ private final static Logger logger = LoggerFactory.getLogger(PlatformServiceImpl.class);
|
|
|
|
|
+
|
|
|
@Override
|
|
@Override
|
|
|
public void run(String... args) throws Exception {
|
|
public void run(String... args) throws Exception {
|
|
|
List<Device> deviceList = deviceService.getAllOnlineDevice();
|
|
List<Device> deviceList = deviceService.getAllOnlineDevice();
|
|
@@ -110,7 +118,11 @@ public class SipRunner implements CommandLineRunner {
|
|
|
if (jsonObject != null && jsonObject.getInteger("code") == 0) {
|
|
if (jsonObject != null && jsonObject.getInteger("code") == 0) {
|
|
|
ParentPlatform platform = platformService.queryPlatformByServerGBId(sendRtpItem.getPlatformId());
|
|
ParentPlatform platform = platformService.queryPlatformByServerGBId(sendRtpItem.getPlatformId());
|
|
|
if (platform != null) {
|
|
if (platform != null) {
|
|
|
- commanderForPlatform.streamByeCmd(platform, sendRtpItem.getCallId());
|
|
|
|
|
|
|
+ try {
|
|
|
|
|
+ commanderForPlatform.streamByeCmd(platform, sendRtpItem.getCallId());
|
|
|
|
|
+ } catch (InvalidArgumentException | ParseException | SipException e) {
|
|
|
|
|
+ logger.error("[命令发送失败] 国标级联 发送BYE: {}", e.getMessage());
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|