648540858
|
a5f1422466
|
[WVP集群] 合并主线
|
2024-12-27 11:18:29 +08:00 |
|
648540858
|
e05d988755
|
Merge branch 'master' into dev/数据库统合
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceMapper.java
# src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelPlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlatformChannelServiceImpl.java
|
2024-12-27 10:57:42 +08:00 |
|
648540858
|
081bb6de18
|
完善通道数据类型的保存与展示
|
2024-12-24 23:35:01 +08:00 |
|
648540858
|
28961f51f7
|
完善数据库结构调用
|
2024-12-23 23:49:54 +08:00 |
|
648540858
|
59e3175f00
|
调整代码对通道类型的调用
|
2024-12-23 18:37:24 +08:00 |
|
648540858
|
19453f7ca9
|
临时提交
|
2024-12-23 07:20:48 +08:00 |
|
648540858
|
b78e6dfd70
|
Merge branch 'master' into dev/数据库统合
|
2024-12-16 17:55:46 +08:00 |
|
648540858
|
696d182f6a
|
兼容科达国标级联语音对讲
|
2024-12-16 15:49:38 +08:00 |
|
648540858
|
7e21b6adb7
|
修复RPC录像下载停止
|
2024-12-13 17:56:23 +08:00 |
|
648540858
|
26d2dd0450
|
修复RPC录像下载停止
|
2024-12-13 17:52:33 +08:00 |
|
648540858
|
e16ca179a6
|
新增RPC录像回放暂停和恢复
|
2024-12-13 17:28:38 +08:00 |
|
648540858
|
eb8d69d50b
|
添加遗漏的错误返回
|
2024-12-13 15:20:53 +08:00 |
|
648540858
|
3769e70094
|
移除错误方法
|
2024-12-13 15:09:50 +08:00 |
|
648540858
|
3e78af64de
|
增加RPC录像列表查询
|
2024-12-13 15:02:06 +08:00 |
|
648540858
|
d69b5d810b
|
[redis下的多wvp] 优化服务间方法调用
|
2024-12-13 15:01:40 +08:00 |
|
648540858
|
1b8826715d
|
支持点播同一个redis下的其他wvp
|
2024-12-13 15:01:26 +08:00 |
|
648540858
|
93afd46d0f
|
增加RPC录像回放和录像下载
|
2024-12-12 17:46:51 +08:00 |
|
648540858
|
ee590d6597
|
增加RPC调用停止实时流播放
|
2024-12-12 16:30:40 +08:00 |
|
648540858
|
4056955c59
|
修复点播调用判断
|
2024-12-12 12:44:11 +08:00 |
|
648540858
|
9d96658696
|
支持国标级联点播其他wvp的国标设备
|
2024-12-12 10:15:04 +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
|
1c76f7bfea
|
Merge branch 'master' into dev/数据库统合
|
2024-12-11 14:10:13 +08:00 |
|
648540858
|
69a32f4519
|
修复批量设置子码流类型
|
2024-12-11 11:43:41 +08:00 |
|
648540858
|
e62d106a1f
|
临时提交
|
2024-12-11 09:56:09 +08:00 |
|
648540858
|
72da4cfa3c
|
Merge branch 'master' into dev/数据库统合
# Conflicts:
# README.md
|
2024-12-09 15:47:15 +08:00 |
|
648540858
|
bcb54fa148
|
Merge remote-tracking branch 'origin/dev/录制计划'
|
2024-12-09 15:23:48 +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
|
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
|
d3f53db160
|
Merge branch 'master' into dev/录制计划
|
2024-11-27 14:20:59 +08:00 |
|
648540858
|
e9a53b766e
|
调整目录查询的结果展示逻辑
|
2024-11-27 11:04:26 +08:00 |
|
648540858
|
f625fb6aed
|
修复大华对讲talk模式
|
2024-11-27 10:11:49 +08:00 |
|
648540858
|
57e1934f02
|
Merge branch 'master' into dev/录制计划
|
2024-11-26 20:59:27 +08:00 |
|
648540858
|
4e165fe243
|
优化目录查询的WebUI逻辑
|
2024-11-26 11:20:12 +08:00 |
|
648540858
|
1567f2e3e7
|
增加通道关联以及录制计划接口完善
|
2024-11-21 23:20:56 +08:00 |
|
648540858
|
0cacdb5928
|
增加数据库结构以及接口
|
2024-11-20 22:33:21 +08:00 |
|
648540858
|
ea2751e29b
|
添加录制计划的页面与通道查询接口
|
2024-11-19 16:42:11 +08:00 |
|
648540858
|
6e8a3f6adf
|
修复sql模糊查询中含有特殊符号时查询不准备的BUG
|
2024-11-14 14:08:05 +08:00 |
|
648540858
|
86879aa58d
|
临时提交
|
2024-11-14 09:59:16 +08:00 |
|
648540858
|
5c2b4f386b
|
优化播放页面的预置位控制
|
2024-11-08 17:40:05 +08:00 |
|
648540858
|
dbe4c80896
|
修复设备编辑无法清理收流IP的BUG
|
2024-11-07 20:33:02 +08:00 |
|
648540858
|
1e8e3d729f
|
国标通道编辑支持选择现有的行政区划和虚拟组织
|
2024-11-07 16:27:39 +08:00 |
|
648540858
|
89d5d0c023
|
Merge branch 'master' into dev/WebUI优化
|
2024-11-07 14:05:10 +08:00 |
|
648540858
|
35e3ec5c54
|
优化通道管理/业务分组页面逻辑
|
2024-11-07 13:28:46 +08:00 |
|
648540858
|
9a29f44c86
|
优化通道管理/行政区划页面逻辑
|
2024-11-05 18:23:58 +08:00 |
|
Kairlec
|
677a9e785a
|
修复级联语音广播在上级实时点播视频时下不会向上级发送INVITE
|
2024-11-04 14:40:29 +08:00 |
|
Li Keqing
|
93af1b4454
|
修复开启 auto-apply-play 后通过报空指针的问题
|
2024-11-01 09:49:20 +08:00 |
|
648540858
|
dc3e99fe57
|
合并 #1626 的修改
|
2024-10-30 16:11:31 +08:00 |
|