Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,201 Commits
17 Branches
1 Tag
55 MiB
Commit Graph

2368 Commits (01f491c02600e8fd6febdeb6e2db00df1ac21f7b)

Author SHA1 Message Date
648540858 26ee38aebe Merge branch 'master' into dev/数据库统合 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/streamProxy/bean/StreamProxy.java
#	src/main/java/com/genersoft/iot/vmp/streamProxy/bean/StreamProxyParam.java
 2024-12-31 10:33:12 +08:00
648540858 f078c6f7a0 [拉流代理] 修复 #1718 2024-12-31 10:31:03 +08:00
648540858 8f7016878d [拉流代理] 增加单独的字段管理每次拉流需要的节点 2024-12-31 10:17:49 +08:00
648540858 7e89b5f97f 临时提交 2024-12-31 09:31:58 +08:00
648540858 6dc64c05ee [RPC] 修复推流播放 2024-12-30 17:05:31 +08:00
648540858 f70aabc2b2 [RPC] 推流播放 2024-12-30 16:59:08 +08:00
648540858 3d2a87f61d 修复推流流注册时写入节点ID 2024-12-30 16:47:03 +08:00
648540858 c2fb892f2a 修复推流流注册时写入服务ID 2024-12-30 16:39:48 +08:00
648540858 785da6d5ef 调整前端获取服务ID方式 2024-12-30 16:32:37 +08:00
648540858 0cebbee0a9 [RPC] 增加订阅支持 2024-12-30 16:19:14 +08:00
648540858 317f771fa2 Merge branch 'master' into dev/数据库统合 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/IDeviceChannelService.java
#	web_src/src/components/DeviceList.vue
 2024-12-30 16:00:58 +08:00
648540858 0dd2826b9e 优化设备订阅的操作方式 2024-12-30 15:59:15 +08:00
648540858 45337311ec [国标PTZ] 添加调用其他wvp的云台控制 2024-12-30 10:27:49 +08:00
648540858 115b41e001 [国标PTZ] 添加调用其他wvp的云台控制 2024-12-27 17:53:25 +08:00
648540858 45862480aa Merge branch 'master' into dev/数据库统合 2024-12-27 17:38:07 +08:00
648540858 058909197e [国标PTZ] 调整云台控制调用 2024-12-27 17:37:50 +08:00
648540858 a4af7eb9a1 Merge branch 'master' into dev/数据库统合 2024-12-27 17:14:48 +08:00
648540858 f2c7a06516 [推流列表] 播放时根据实际状态更新状态 2024-12-27 17:14:26 +08:00
648540858 c231faeff6 [推流列表] 直接使用节点服务接口校验推流状态 2024-12-27 17:05:49 +08:00
南宫茜 8d662769d7
修复比较符 2024-12-27 15:54:06 +08:00
648540858 7751eae913 Merge branch 'master' into dev/数据库统合 2024-12-27 15:31:27 +08:00
Li Keqing dade2854b1 修复级联状态推成 0 和 1 而不是 ON 和 OFF 的问题 2024-12-27 15:18:56 +08:00
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 460f73555e [推流设备] 修复推流中重启服务导致无法继续播放 2024-12-27 10:42:40 +08:00
648540858 ce73b6feb1 修复清理通道错误 2024-12-27 09:53:27 +08:00
648540858 081bb6de18 完善通道数据类型的保存与展示 2024-12-24 23:35:01 +08:00
648540858 28961f51f7 完善数据库结构调用 2024-12-23 23:49:54 +08:00
648540858 f5ae9718d4 临时提交 2024-12-23 18:39:54 +08:00
648540858 59e3175f00 调整代码对通道类型的调用 2024-12-23 18:37:24 +08:00
648540858 19453f7ca9 临时提交 2024-12-23 07:20:48 +08:00
648540858 825daad355 调整数据库结构 2024-12-22 08:35:36 +08:00
648540858 1b9799eb1f Merge branch 'master' into dev/数据库统合 2024-12-20 10:24:53 +08:00
648540858 4757cbd34e 调整MediaStatus内容 2024-12-19 23:14:45 +08:00
Li Keqing a43a98e185 回复正确的 MediaStatus 内容 2024-12-19 09:24:09 +08:00
648540858 0ff4d04698 Merge branch 'master' into dev/数据库统合2 2024-12-18 15:05:23 +08:00
648540858 03033e6ac9 添加异常处理 2024-12-18 11:30:07 +08:00
648540858 b78e6dfd70 Merge branch 'master' into dev/数据库统合 2024-12-16 17:55:46 +08:00
648540858 90e5c35975 修复创建SIP回复时使用了错误的状态码 2024-12-16 17:00:44 +08:00
648540858 b37b9f3b03 支持配置管理页面登录超时时间 2024-12-16 16:14:28 +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 3b4818c579 调整停止录像下载 2024-12-13 17:41:02 +08:00
648540858 e16ca179a6 新增RPC录像回放暂停和恢复 2024-12-13 17:28:38 +08:00
648540858 6c5535ef1e 添加遗漏的数据返回 2024-12-13 15:21:21 +08:00
648540858 eb8d69d50b 添加遗漏的错误返回 2024-12-13 15:20:53 +08:00
648540858 3769e70094 移除错误方法 2024-12-13 15:09:50 +08:00
648540858 59f1ab4e77 Merge remote-tracking branch 'github/dev/数据库统合' into dev/数据库统合2 2024-12-13 15:07:55 +08:00
648540858 3e78af64de 增加RPC录像列表查询 2024-12-13 15:02:06 +08:00
648540858 152a4954aa 增加RPC调用停止实时流播放 2024-12-13 15:02:02 +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 bd26ffdf00 Merge branch 'master' into dev/数据库统合 2024-12-13 09:39:32 +08:00
648540858 6f28e6b497 优化线程池配置 2024-12-12 23:44:41 +08:00
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 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 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 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 5777a8e93c 去除动态数据库切换 2024-12-06 17:11:22 +08:00
648540858 5bbd461d88 修复WebUi长时间不退出登录的BUG 2024-12-05 16:21:50 +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 d3f53db160 Merge branch 'master' into dev/录制计划 2024-11-27 14:20:59 +08:00
648540858 e198b2f66c 兼容只支持只支持语音数据对讲的设备 2024-11-27 11:08:08 +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 4b694954d4 临时提交 2024-11-21 20:50:22 +08:00
648540858 0cacdb5928 增加数据库结构以及接口 2024-11-20 22:33:21 +08:00
648540858 2dcbee74b0 新增添加录制计划接口 2024-11-20 18:37:39 +08:00
648540858 ea2751e29b 添加录制计划的页面与通道查询接口 2024-11-19 16:42:11 +08:00
648540858 d2f9102ff0 增加录制计划类 2024-11-18 18:00:21 +08:00
648540858 bd35c9be97 修复编码信息赋值错误 2024-11-18 16:40:48 +08:00
648540858 8a42f15d34 优化zlm接入是拉流代理的逻辑 2024-11-18 16:26:14 +08:00