613 Commits

Author	SHA1	Message	Date
648540858	475b8a49a3	优化录像文件信息入库	2024-05-23 17:44:30 +08:00
648540858	2daa59d78c	支持彻底关闭文档页面 + 修复云端录像偶现callId错误问题	2024-05-23 17:10:45 +08:00
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	9c6765d44e	重构多wvp国标级联机制	2024-04-16 22:10:35 +08:00
648540858	b4168c02cb	优化多wvp国标级联推流	2024-04-16 00:10:38 +08:00
648540858	7d53009987	优化推流通知	2024-04-07 20:06:48 +08:00
648540858	f1e902af7f	支持级联移动位置订阅通知转发	2024-03-28 16:28:41 +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	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	562dbb0857	Merge remote-tracking branch 'origin/main-dev' into main-dev ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java	2024-02-07 20:37:23 +08:00
648540858	2e7c9a7341	Merge branch 'wvp-28181-2.0' into main-dev ... # Conflicts: # pom.xml # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java # src/main/java/com/genersoft/iot/vmp/media/zlm/AssistRESTfulUtils.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java # src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeFactory.java # src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java # src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java # src/main/resources/all-application.yml # src/main/resources/application-dev.yml	2024-02-07 20:30:37 +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	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	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	79c8447298	支持使用多数据源	2024-01-22 00:29:09 +08:00
hexq	dd4e0d0d9c	BUGFIX：向下级目录关联通道时，出现“未查询到目录xxx的信息"	2024-01-20 10:22:34 +08:00
648540858	55b15f8ba6	Merge branch '2.6.9' into wvp-28181-2.0	2024-01-19 17:45:11 +08:00
648540858	cf8a1261b5	支持合并录像使用https	2024-01-19 17:44:31 +08:00
648540858	47e5d2b00b	Merge branch '2.6.9' into wvp-28181-2.0	2024-01-19 15:58:50 +08:00
648540858	85f20df9de	修复空指针异常	2024-01-19 15:05:24 +08:00
648540858	88721511e7	Merge branch '2.6.9' into wvp-28181-2.0	2024-01-16 14:51:17 +08:00