Commit Graph

2477 Commits (283d317652e98aca065edf3340739357991c2a9a)

Author SHA1 Message Date
648540858 a412f9c2d4 支持国标级联录像下载 2024-01-30 20:46:47 +08:00
648540858 02c0a45f11 支持国标级联录像播放 2024-01-30 19:14:05 +08:00
648540858 18214b8b82 支持国标级联录像查询 2024-01-30 18:13:35 +08:00
648540858 f146203fd3
Merge pull request #1289 from oulover/fix_wvp-28181-2.0_gbStreamId
Fix 推流列表-> 添加通道 报错: 错误: 字段 "gbStreamId" 不存在 ,改为:gb_stream_id 自测试通过
2024-01-30 14:11:09 +08:00
PengOu 1245ae7874 Fix 推流列表-> 添加通道 报错: 错误: 字段 "gbStreamId" 不存在 ,改为:gb_stream_id 自测试通过 2024-01-30 10:59:25 +08:00
648540858 3436e73e72 修复云端录像时间显示错误 2024-01-30 10:55:41 +08:00
648540858 398e0930ae catqlog查询支持回复平台信息 2024-01-30 00:00:49 +08:00
648540858 8402edaf01 支持国标级联报警复位, 布防撤防,录像控制,强制关键帧,设备重启,拉框放大缩小, 看守位控制 2024-01-29 23:37:47 +08:00
648540858 ab34cb37f3 修复空指针异常 2024-01-29 21:20:03 +08:00
648540858 0688bb91d2 临时提交 2024-01-29 20:48:19 +08:00
648540858 9c3967d67a
Merge pull request #1288 from pedoc/wvp-28181-2.0
修复未配置sipdomain时出现异常
2024-01-29 20:03:55 +08:00
648540858 695f9b7f4d 修复来自其他wvp的推流时平台名称未赋值的问题 2024-01-29 19:31:07 +08:00
648540858 70f3f3b431 临时提交 2024-01-29 18:57:12 +08:00
pedoc 3d68b56bb5
修复未配置sipdomain时出现异常 2024-01-29 18:05:17 +08:00
648540858 b17eea547a 支持国标级联云台控制 2024-01-29 17:19:38 +08:00
648540858 565acaefb5 临时提交 2024-01-29 12:32:35 +08:00
648540858 367acdaf97 支持国标控制命令解析 2024-01-28 00:41:24 +08:00
648540858 8892975d77 临时提交 2024-01-26 18:03:58 +08:00
648540858 2a84e44610 去除多余实现 2024-01-25 23:44:32 +08:00
648540858 993773860e 优化sedRTP的管理 2024-01-25 23:39:18 +08:00
648540858 dfb1b701d5 优化sendRtp管理 2024-01-25 19:58:59 +08:00
648540858 932eff1d73 修复国标级联点播 2024-01-25 18:18:42 +08:00
648540858 241d223b8a 添加日志 2024-01-25 17:46:38 +08:00
648540858 7c7c1cf398 优化国标级联通道发送 2024-01-25 17:04:40 +08:00
648540858 5d973ef246 支持国标级联通道查询 2024-01-24 19:11:50 +08:00
648540858 3821dba14d 支持通道列表云台类型和在线状态筛选 2024-01-24 10:54:02 +08:00
648540858 407828e880 优化国标级联接口 2024-01-23 16:20:36 +08:00
648540858 1411de77fe 临时提交 2024-01-23 09:56:05 +08:00
648540858 be8d66423f 优化国标级联 2024-01-23 00:07:17 +08:00
648540858 a8ba1630d2 合并主线 2024-01-22 17:55:27 +08:00
648540858 16548e4f3c Merge branch 'wvp-28181-2.0' into 结构优化 2024-01-22 17:03:32 +08:00
648540858 b3d21c7452 Merge branch '2.6.9' into wvp-28181-2.0 2024-01-22 16:35:17 +08:00
648540858 a9264a8bc0 修复assist使用https时无法请求的bug 2024-01-22 16:34:58 +08:00
648540858 6258e05574 Merge branch 'wvp-28181-2.0' into 结构优化
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/GbStreamServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlatformChannelServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java
2024-01-22 16:03:27 +08:00
648540858 e8770eec36 Merge branch '2.6.9' into wvp-28181-2.0 2024-01-22 16:02:28 +08:00
648540858 d68aebd409 指定service使用的数据源 2024-01-22 15:56:24 +08:00
648540858 b4358a6dbe 临时提交 2024-01-22 15:01:56 +08:00
648540858 e9fce889ba Merge branch 'wvp-28181-2.0' into 结构优化
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/RecordInfoQueryMessageHandler.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java
#	src/main/resources/all-application.yml
#	src/main/resources/application-dev.yml
#	src/main/resources/application-docker.yml
2024-01-22 12:12:36 +08:00
648540858 5a3b1c04d6 补充日志 2024-01-22 12:09:04 +08:00
648540858 97a87542a6 Merge branch '2.6.9' into wvp-28181-2.0
# Conflicts:
#	pom.xml
2024-01-22 10:37:13 +08:00
648540858 0e94aeaf5f 优化录像合并下载,支持不过滤zlm节点ID 2024-01-22 10:16:16 +08:00
648540858 07729fbe49 优化录像合并下载 2024-01-22 09:46:03 +08:00
648540858 9a89cf81b8 添加多数据源配置实例 2024-01-22 00:33:04 +08:00
648540858 79c8447298 支持使用多数据源 2024-01-22 00:29:09 +08:00
648540858 7cb4c5c1df 优化拉流代理的播放 2024-01-22 00:02:50 +08:00
648540858 46af350868 优化多节点国标级联国标录像查询 2024-01-21 22:38:50 +08:00
648540858 31df0fb3ff 修复级联点播时tcp模式信令回复的错误 2024-01-21 16:56:13 +08:00
648540858 d9d8aaca6e 拉流代理优化未完成 2024-01-21 15:19:31 +08:00
hexq 7055c53192 BUGFIX:回放时,优先从SDP中提取channelId,兼容从Subject无法提取到channelId的问题 2024-01-20 10:26:49 +08:00
hexq dd4e0d0d9c BUGFIX:向下级目录关联通道时,出现“未查询到目录xxx的信息" 2024-01-20 10:22:34 +08:00