diff --git a/pom.xml b/pom.xml index 82d123434..c2958ae22 100644 --- a/pom.xml +++ b/pom.xml @@ -187,7 +187,6 @@ 1.4.6 - org.springdoc @@ -200,13 +199,6 @@ 1.6.10 - - - org.springdoc - springdoc-openapi-ui - 1.6.10 - - com.github.xiaoymin knife4j-springdoc-ui diff --git a/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java index 6be84b0a9..5822d64c5 100644 --- a/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java +++ b/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java @@ -27,12 +27,12 @@ public class SipConfig { private String id; private String password; - + Integer ptzSpeed = 50; Integer registerTimeInterval = 120; private boolean alarm = false; - private long timeout = 500; + private long timeout = 1000; } diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelPlayServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelPlayServiceImpl.java index 2e5b8e234..71c4b0b0a 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelPlayServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelPlayServiceImpl.java @@ -2,6 +2,7 @@ package com.genersoft.iot.vmp.gb28181.service.impl; import com.genersoft.iot.vmp.common.InviteSessionType; import com.genersoft.iot.vmp.common.StreamInfo; +import com.genersoft.iot.vmp.conf.exception.ControllerException; import com.genersoft.iot.vmp.conf.exception.ServiceException; import com.genersoft.iot.vmp.gb28181.bean.*; import com.genersoft.iot.vmp.common.enums.ChannelDataType; @@ -145,6 +146,9 @@ public class GbChannelPlayServiceImpl implements IGbChannelPlayService { deviceChannelPlayService.play(channel, record, callback); } catch (PlayException e) { callback.run(e.getCode(), e.getMsg(), null); + } catch (ControllerException e) { + log.error("[点播失败] {}({}), {}", channel.getGbName(), channel.getGbDeviceId(), e.getMsg()); + callback.run(Response.BUSY_HERE, "busy here", null); } catch (Exception e) { log.error("[点播失败] {}({})", channel.getGbName(), channel.getGbDeviceId(), e); callback.run(Response.BUSY_HERE, "busy here", null);