roouzenn/wvp
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into dev/数据库统合

Browse Source 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/streamProxy/service/impl/StreamProxyPlayServiceImpl.java
This commit is contained in:
648540858
2025-01-17 10:53:08 +08:00
parent 8ff68b2291 464c989986
commit 3bae4ce63e
10 changed files with 94 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java
View File

@@ -446,7 +446,7 @@ public class DeviceServiceImpl implements IDeviceService {
device.setCreateTime(DateUtil.getNow());
device.setUpdateTime(DateUtil.getNow());
if(device.getStreamMode() == null) {
device.setStreamMode("UDP");
device.setStreamMode("TCP-PASSIVE");
}
deviceMapper.addCustomDevice(device);
}

7
src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelPlayServiceImpl.java
View File

@@ -162,12 +162,7 @@ public class GbChannelPlayServiceImpl implements IGbChannelPlayService {
public void playProxy(CommonGBChannel channel, ErrorCallback<StreamInfo> callback){
// 拉流代理通道
try {
StreamInfo streamInfo = streamProxyPlayService.start(channel.getDataDeviceId());
if (streamInfo == null) {
callback.run(Response.BUSY_HERE, "busy here", null);
}else {
callback.run(InviteErrorCode.SUCCESS.getCode(), InviteErrorCode.SUCCESS.getMsg(), streamInfo);
}
streamProxyPlayService.start(channel.getDataDeviceId(), callback);
}catch (Exception e) {
callback.run(Response.BUSY_HERE, "busy here", null);
}

4
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java
View File

@@ -166,7 +166,7 @@ public class RegisterRequestProcessor extends SIPRequestProcessorParent implemen
if (device == null) {
device = new Device();
device.setStreamMode("UDP");
device.setStreamMode("TCP-PASSIVE");
device.setCharset("GB2312");
device.setGeoCoordSys("WGS84");
device.setMediaServerId("auto");
@@ -174,7 +174,7 @@ public class RegisterRequestProcessor extends SIPRequestProcessorParent implemen
device.setOnLine(false);
} else {
if (ObjectUtils.isEmpty(device.getStreamMode())) {
device.setStreamMode("UDP");
device.setStreamMode("TCP-PASSIVE");
}
if (ObjectUtils.isEmpty(device.getCharset())) {
device.setCharset("GB2312");

2
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/DeviceInfoResponseMessageHandler.java
View File

@@ -79,7 +79,7 @@ public class DeviceInfoResponseMessageHandler extends SIPRequestProcessorParent
device.setModel(getText(rootElement, "Model"));
device.setFirmware(getText(rootElement, "Firmware"));
if (ObjectUtils.isEmpty(device.getStreamMode())) {
device.setStreamMode("UDP");
device.setStreamMode("TCP-PASSIVE");
}
deviceService.updateDevice(device);