Commit Graph

3757 Commits

Author SHA1 Message Date
648540858
93afd46d0f 增加RPC录像回放和录像下载 2024-12-12 17:46:51 +08:00
648540858
4f6e6b8e8e 修复PRC点播 2024-12-12 17:04:08 +08:00
648540858
304e596440 优化RPC时间定义 2024-12-12 17:00:58 +08:00
648540858
ee590d6597 增加RPC调用停止实时流播放 2024-12-12 16:30:40 +08:00
648540858
4056955c59 修复点播调用判断 2024-12-12 12:44:11 +08:00
648540858
0a06ae9475 优化RPC调用 2024-12-12 12:42:57 +08:00
648540858
9d96658696 支持国标级联点播其他wvp的国标设备 2024-12-12 10:15:04 +08:00
648540858
9159f4a7a1 修改RedisRpcChannelPlayController路径 2024-12-12 09:43:24 +08:00
648540858
541726a43c 调整通用点播RPC调用 2024-12-12 09:37:12 +08:00
648540858
ca9b5c2054 修改媒体节点表数据结构 2024-12-12 09:29:49 +08:00
648540858
8d6a978978 [redis下的多wvp] 优化服务间方法调用 2024-12-11 18:26:18 +08:00
648540858
5d26e3776d 支持点播同一个redis下的其他wvp 2024-12-11 16:59:48 +08:00
648540858
ea18593125 Merge branch 'master' into dev/数据库统合 2024-12-11 15:20:31 +08:00
648540858
1b023da64f 修复录制计划取消通道关联时未及时停止通道点播 2024-12-11 15:17:17 +08:00
648540858
1c76f7bfea Merge branch 'master' into dev/数据库统合 2024-12-11 14:10:13 +08:00
648540858
70310f918e 修复新增zlm节点初始化端口错误 2024-12-11 14:04:55 +08:00
648540858
69a32f4519 修复批量设置子码流类型 2024-12-11 11:43:41 +08:00
648540858
e62d106a1f 临时提交 2024-12-11 09:56:09 +08:00
648540858
bf3f141fe3 Merge branch 'master' into dev/数据库统合 2024-12-11 09:52:56 +08:00
648540858
79627201f5 修复历史日志文件下载 2024-12-10 22:55:02 +08:00
648540858
8495cd0f23 为行政区划树以及业务分组树添加通道增加提示以及添加业务分组支持选择行政区划 2024-12-10 22:45:08 +08:00
648540858
ad07fa5eb7 为行政区划树以及业务分组树添加操作提示 2024-12-10 22:21:45 +08:00
648540858
f616cc7da2 添加行政区划树以及业务分组树的操作提示 2024-12-10 22:02:47 +08:00
648540858
b2469e131c 优化录制计划关联全部通道提示 2024-12-10 21:59:40 +08:00
648540858
72da4cfa3c Merge branch 'master' into dev/数据库统合
# Conflicts:
#	README.md
2024-12-09 15:47:15 +08:00
648540858
6eb8249f0a 更新README 2024-12-09 15:46:40 +08:00
648540858
bcb54fa148 Merge remote-tracking branch 'origin/dev/录制计划' 2024-12-09 15:23:48 +08:00
648540858
09404f59b4 Merge branch 'master' into dev/数据库统合 2024-12-09 15:09:15 +08:00
648540858
4d7eddc510 Merge pull request #1712 from lvdoubaobao/master
修复加载行政区域文件乱码问题
2024-12-09 14:51:42 +08:00
648540858
4591881c77 Merge branch 'master' into master 2024-12-09 14:51:32 +08:00
648540858
4e48eb6cab 修复添加通道时未设置设备ID 2024-12-09 14:41:14 +08:00
xpf
dd38127deb fix 加载行政区域文件乱码问题 2024-12-09 14:30:36 +08:00
648540858
1c16523c24 Merge branch 'master' into dev/数据库统合 2024-12-09 14:28:22 +08:00
648540858
c0ef6a4524 指定读取行政区划文件编码 2024-12-09 14:27:54 +08:00
648540858
045150163e 更新readme 2024-12-09 10:30:56 +08:00
648540858
5777a8e93c 去除动态数据库切换 2024-12-06 17:11:22 +08:00
648540858
5bbd461d88 修复WebUi长时间不退出登录的BUG 2024-12-05 16:21:50 +08:00
648540858
1323d081e8 Merge remote-tracking branch 'origin/重构/1078' into 重构/1078 2024-12-05 11:06:06 +08:00
648540858
f528735119 Merge branch 'master' into 重构/1078 2024-12-05 11:05:44 +08:00
648540858
7e9af0bee8 [播放弹窗] 移除无效代码 2024-11-29 17:26:28 +08:00
648540858
4b2d819ba2 [录制计划] 完善和优化录制计划执行 2024-11-29 15:38:55 +08:00
648540858
8a06562a88 [录制计划] 增加录制计划执行 2024-11-28 18:00:52 +08:00
648540858
a739701621 Merge branch 'master' into dev/录制计划 2024-11-28 14:38:51 +08:00
648540858
f7ed06e5f5 调整通用点播代码封装 2024-11-28 14:38:20 +08:00
648540858
21cf05861b [录制计划] 修复计划选择与回显 2024-11-28 10:15:03 +08:00
648540858
cc56ed3355 临时提交 2024-11-27 22:44:22 +08:00
648540858
24c3c45565 [录制计划] 修复关联通道 2024-11-27 17:59:54 +08:00
648540858
3b24a6c8ca 修复云端录像列表排序 2024-11-27 15:29:00 +08:00
648540858
a753f80177 调整云端录像的控件大小 2024-11-27 15:00:47 +08:00
648540858
d3f53db160 Merge branch 'master' into dev/录制计划 2024-11-27 14:20:59 +08:00