Commit Graph

650 Commits

Author SHA1 Message Date
648540858
d70bfb53dd 修复兼容zlm-pro转码时无人管看自动移除失败的BUG 2024-05-20 11:37:07 +08:00
648540858
49101a37e0 兼容zlm-pro转码 2024-05-17 16:32:01 +08:00
648540858
5564cfb384 优化大量notify 移动位置订阅的入库 2024-05-13 17:22:36 +08:00
648540858
588b1da35a Merge branch 'refs/heads/2.7.0' into 271-优化notify存储
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestForMobilePositionProcessor.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMobilePositionMapper.java
2024-05-13 11:12:20 +08:00
648540858
e6a850891e 支持移动位置订阅通知的数据存储 2024-05-11 17:48:47 +08:00
648540858
186b00e9b3 支持下载多个云端录像的zip压缩包 2024-05-08 11:18:47 +08:00
648540858
d4cdf5510b 优化拉流代理调用流程 2024-04-30 14:39:53 +08:00
648540858
2113e8cf27 优化notify消息中目录的处理 2024-04-24 20:33:52 +08:00
648540858
66a681d679 优化notify消息中目录和移动位置的处理 2024-04-23 20:45:12 +08:00
648540858
901dee2bf4 修复转发国标notify-update时信息错误的问题 2024-04-23 10:12:00 +08:00
648540858
8cba63642f 优化notify消息处理 2024-04-22 20:29:36 +08:00
648540858
b57dbeac13 优化通道更新 2024-04-20 18:58:53 +08:00
648540858
1aa197510f 临时提交 2024-04-19 14:39:35 +08:00
648540858
87629b7fc7 临时提交 2024-04-19 10:32:28 +08:00
648540858
0dab86f0b8 临时提交 2024-04-19 10:22:34 +08:00
648540858
94436de3e1 临时提交 2024-04-18 18:31:37 +08:00
648540858
678bb33562 临时提交 2024-04-18 18:07:47 +08:00
648540858
5d36c2a337 临时提交 2024-04-18 17:51:56 +08:00
648540858
9adf12ca6a 临时提交 2024-04-18 17:34:00 +08:00
648540858
55a240bb45 临时提交 2024-04-18 15:52:34 +08:00
648540858
313243195e 修复通道位置的展示 2024-04-17 17:56:36 +08:00
648540858
bf6e09d231 修复多wvp国标级联机制 2024-04-17 12:56:22 +08:00
648540858
9c6765d44e 重构多wvp国标级联机制 2024-04-16 22:10:35 +08:00
648540858
b4168c02cb 优化多wvp国标级联推流 2024-04-16 00:10:38 +08:00
648540858
f9abfca003 临时提交 2024-04-15 21:33:22 +08:00
648540858
9bb5ef6522 修复多个wvp执行推流转发失败的BUG 2024-04-10 18:22:42 +08:00
648540858
aeb75c0df1 优化推流结束后发送BYE 2024-04-07 20:25:44 +08:00
648540858
7d53009987 优化推流通知 2024-04-07 20:06:48 +08:00
648540858
f1e902af7f 支持级联移动位置订阅通知转发 2024-03-28 16:28:41 +08:00
648540858
a2b1065fe9 修复redis推流设备推送bug 2024-03-27 16:51:02 +08:00
648540858
0f18d4cbe1 修复redis推流设备推送bug 2024-03-27 16:20:46 +08:00
648540858
3291c4b2e6 修复多平台推流无人观看redis通知 2024-03-21 16:54:44 +08:00
648540858
912c83dfd3 添加日志 2024-03-21 11:16:31 +08:00
648540858
bfafe45b26
Merge pull request #1371 from ancienter/develop
[bugfix]修复云端录像查询时间转换错误的问题
2024-03-18 15:39:32 +08:00
648540858
c6adfd24d9 修复redis开始推流的通知 2024-03-18 10:13:03 +08:00
leesam
00bb8d914a [bugfix]修复云端录像查询时间转换错误的问题 2024-03-15 09:42:25 +08:00
648540858
e1c8183adf 调整语音对讲超时任务位置 2024-03-14 11:03:52 +08:00
648540858
d1624e2d06 修复取消移动位置订阅失败的问题 2024-03-13 16:13:05 +08:00
648540858
dc8869be49 优化收到redis推动的推流设备信息更新内容重复的问题 2024-03-13 15:40:30 +08:00
648540858
e1d476a54a 处理收到redis推动的推流设备信息内容重复的问题 2024-03-13 15:24:09 +08:00
648540858
1fcdf5a8f3 Merge branch 'wvp-28181-2.0' into main-dev
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
2024-03-08 09:30:48 +08:00
648540858
5bf87ca330
Merge pull request #1270 from hexq/playback
Playback
2024-03-05 10:41:22 +08:00
648540858
38980826f9 修复平台删除时未移除心跳超时重新注册任务的问题 #1329 2024-03-04 14:32:57 +08:00
648540858
db6f722d20 优化国标级联语音喊话TCP主动模式 2024-02-27 18:02:12 +08:00
648540858
66210ec51a 支持国标级联语音喊话TCP主动模式 2024-02-27 17:41:14 +08:00
648540858
c8b0e66e0e 合并主线 2024-02-27 10:25:42 +08:00
648540858
509d9b3cbb Merge branch 'wvp-28181-2.0' into main-dev
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java
2024-02-27 10:22:13 +08:00
648540858
f6c48588da 支持支持主码流子码流切换 2024-02-22 17:22:28 +08:00
648540858
a9ab5c28e9 优化订阅机制,需要重新订阅时,取消命令发送后再发送订阅命令 #1273 2024-02-20 11:12:42 +08:00
648540858
f2f70fce98 修复合并错误 2024-02-07 20:53:13 +08:00