aunix/wvp-GB28181-pro
1
0
Fork 0
mirror of https://gitee.com/pan648540858/wvp-GB28181-pro.git synced 2026-05-19 11:57:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,142 Commits 27 Branches 1 Tag 209 MiB
a4ca333abb
Commit Graph

2270 Commits

Author SHA1 Message Date
648540858
20f93d52d7 临时提交 2024-08-17 20:49:07 +08:00
panlinlin
4dd656b29b 完善目录推送 2024-08-17 08:02:39 +08:00
panlinlin
635458d19a 临时提交 2024-08-17 07:01:40 +08:00
648540858
aeb3cd6a22 临时提交 2024-08-16 17:59:53 +08:00
648540858
326025ee85 完成通道共享 2024-08-16 16:23:54 +08:00
panlinlin
976c089b7f 临时提交 2024-08-15 23:45:00 +08:00
648540858
abed3ecbec 临时提交 2024-08-15 17:45:24 +08:00
panlinlin
1cbd8d677c 临时提交 2024-08-15 00:03:53 +08:00
648540858
cce1d1de40 重构INVITE消息处理中的上级点播请求 2024-08-14 17:19:19 +08:00
648540858
d5621f9489 临时提交 2024-08-13 18:03:34 +08:00
648540858
ad240ba9a4 优化国标级联点播逻辑 2024-08-13 17:57:25 +08:00
648540858
213b218efa 临时提交 2024-08-12 18:00:06 +08:00
648540858
9a4a81a90e 临时提交 2024-08-12 15:30:01 +08:00
648540858
5ff232150d Merge remote-tracking branch 'origin/dev/master-通道结构重构' into dev/master-通道结构重构 2024-08-12 09:55:10 +08:00
648540858
bfa2c1b2e8 临时提交 2024-08-12 09:54:50 +08:00
panlinlin
0177831e86 临时提交 2024-08-11 23:20:42 +08:00
panlinlin
76a0d248ef 临时提交 2024-08-10 23:27:21 +08:00
648540858
baeffa4311
Merge pull request #1559 from koisi-io/fix 
[bugfix]修复前面几次合并所遗漏的一些问题
 2024-08-10 20:59:52 +08:00
648540858
2464052add
Merge pull request #1565 from mylvlin/master 
修复在ORACLE,达梦等数据库下的用户查询BUG
 2024-08-10 20:59:27 +08:00
648540858
d8d9f76d89 支持多WVP的推流播放 2024-08-09 17:55:39 +08:00
648540858
16708e385b 支持多WVP的推流播放 2024-08-09 16:27:08 +08:00
648540858
7f8a15f017 优化收到目录时的分组信息处理 2024-08-09 11:08:40 +08:00
panlinlin
a1671c3c3e 临时提交 2024-08-08 23:44:03 +08:00
648540858
8ab88c0f02 临时提交 2024-08-08 22:43:37 +08:00
648540858
9aad6ac719 临时提交 2024-08-08 17:47:08 +08:00
panlinlin
3e220a2c1e 临时提交 2024-08-07 23:45:29 +08:00
648540858
5abf5012eb 完善分组通道管理 2024-08-07 17:12:39 +08:00
648540858
a3f7753b84 Merge branch 'refs/heads/master' into dev/master-通道结构重构 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java
#	web_src/src/components/PushVideoList.vue
 2024-08-07 11:17:34 +08:00
648540858
c88681c7ad 合并分支 2024-08-07 10:41:54 +08:00
648540858
d97accee4a 临时提交 2024-08-06 16:55:33 +08:00
linshunhua
402ffa0b1e 修复在ORACLE,达梦等数据库下的用户查询BUG 2024-08-06 16:52:22 +08:00
koisi
5772d3f231
修复 87c071:合并271分支 的参数遗漏 
将推流信息记录至redis，由StreamPushItem变更成OnStreamChangedHookParam时，漏了设置serverId。
 2024-08-05 18:59:02 +08:00
648540858
ce0f0c4ac8 临时提交 2024-08-05 17:59:20 +08:00
koisi
c1a8e62f23
修复6月25日合并271时，变量类型未同步更新的问题 
处理ZLM推拉流事件的参数由StreamPushItem变更成OnStreamChangedHookParam了，然后有个地方没有同步更新。
 2024-08-05 17:04:58 +08:00
panlinlin
96bbd19e81 临时提交 2024-08-05 08:00:16 +08:00
panlinlin
18c51919a3 临时提交 2024-08-02 23:47:44 +08:00
648540858
91b8e7a595 临时提交 2024-08-02 17:48:32 +08:00
648540858
55c534ac90 临时提交 2024-08-02 14:46:20 +08:00
648540858
3f2c9f6451 临时提交 2024-08-01 17:50:34 +08:00
648540858
f7c98301ac 临时提交 2024-08-01 15:29:51 +08:00
Iwan Lebron
c7c94ee73d
修复 ZLMServerFactory 日志不打印 2024-08-01 14:47:43 +08:00
648540858
7ee3cdb801 完善行政区划管理 2024-07-31 15:07:54 +08:00
648540858
3ce973d2ee 临时提交 2024-07-30 17:58:18 +08:00
648540858
112cb2dfd8 临时提交 2024-07-29 17:44:34 +08:00
panlinlin
e285257f24 临时提交 2024-07-28 07:36:20 +08:00
648540858
8169983f21 临时提交 2024-07-28 06:19:18 +08:00
648540858
b246fd6a20 临时提交 2024-07-26 17:53:10 +08:00
648540858
a2b00a4f4e 临时提交 2024-07-25 18:02:22 +08:00
648540858
5a812e7f08 临时提交 2024-07-24 17:54:19 +08:00
648540858
6bd0cdd37b 临时提交 2024-07-23 18:00:47 +08:00
648540858
05fabc87a2 临时提交 2024-07-22 18:00:01 +08:00
648540858
ff5ba1698a Merge branch 'refs/heads/master' into dev/master-通道结构重构 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
 2024-07-22 14:29:54 +08:00
648540858
b7d671e6d9 优化录像下载流程 2024-07-22 14:21:23 +08:00
648540858
c96c29776d 临时提交 2024-07-22 14:20:40 +08:00
648540858
2f4d983f9f 修复拉流看方式回显 2024-07-22 11:07:58 +08:00
panlinlin
0b7d55ed74 修复拉流代理相关问题 2024-07-20 23:31:38 +08:00
panlinlin
80ac701748 临时提交 2024-07-20 06:44:53 +08:00
panlinlin
d201be2f88 修复设备初次注册无通道 2024-07-20 06:35:42 +08:00
panlinlin
1dc0cb0c83 临时提交 2024-07-19 20:29:10 +08:00
648540858
9f4e66a38b 优化拉流代理 2024-07-19 17:54:14 +08:00
648540858
78088ba53f 临时提交 2024-07-18 18:00:45 +08:00
648540858
4e6f7f8385
Merge pull request #1533 from wendy512/bugfix 
解决国标视频回放判断streamMode时空指针异常问题
 2024-07-18 14:09:15 +08:00
648540858
f331b0b0d3
Merge pull request #1524 from ZhaoYandong00/master 
修复在docker中使用，平台信息IP无法显示主机IP的问题
 2024-07-18 14:08:05 +08:00
wendy512
7732a1d180 解决国标视频回放判断streamMode时空指针异常问题 2024-07-18 13:40:47 +08:00
648540858
e46ad4e66a 临时提交 2024-07-17 17:56:26 +08:00
648540858
8c95485504 修复推流信息播放 2024-07-16 17:44:27 +08:00
648540858
d7abe7fb75 适配推流列表信息 2024-07-16 17:33:18 +08:00
648540858
90d298f7a7 临时提交 2024-07-15 17:59:41 +08:00
648540858
1dcb912910 调整推流导入的数据格式 2024-07-15 17:52:27 +08:00
648540858
d9c0d0637c 增加通道编辑以及通道重置功能 2024-07-15 17:39:47 +08:00
648540858
9d37e96f06 修复空指针异常 2024-07-15 16:30:21 +08:00
648540858
cb403689b4 添加通道编号构建页面 2024-07-12 17:52:05 +08:00
panlinlin
0853d7e842 临时提交 2024-07-11 23:52:34 +08:00
648540858
6619c5c53d 临时提交 2024-07-11 18:25:16 +08:00
648540858
a084fac7cd 优化通道数据显示 2024-07-10 17:33:04 +08:00
648540858
6ecf8af6ca 优化通道数据异常时的入库逻辑 2024-07-10 15:58:26 +08:00
648540858
b843958ed7 临时提交 2024-07-10 14:43:22 +08:00
648540858
bb609b7e09 临时提交 2024-07-10 10:51:35 +08:00
panlinlin
e73fb64283 临时提交 2024-07-10 00:12:45 +08:00
panlinlin
aa9397ca21 临时提交 2024-07-10 00:07:01 +08:00
648540858
61b811e701 临时提交 2024-07-09 18:00:44 +08:00
648540858
046e7802f3 临时提交 2024-07-09 17:55:51 +08:00
648540858
2235caca36 临时提交 2024-07-08 18:00:44 +08:00
648540858
4912ce16ec 临时提交 2024-07-08 17:44:35 +08:00
ZhaoYandong00
d1af677fff
修复在docker中使用，平台信息IP无法显示主机IP的问题 
配置sip,showip用来显示主机IP
 2024-07-08 16:34:29 +08:00
648540858
7b7512f84d 临时提交 2024-07-08 15:10:02 +08:00
648540858
fe921b860a Merge branch 'refs/heads/master' into dev/master-通道结构重构 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/resources/application.yml
 2024-07-08 14:09:48 +08:00
648540858
cf5ca3afb9 修复设备断网导致超时的空指针异常 2024-07-08 11:40:37 +08:00
panlinlin
052bbf16c3 临时提交 2024-07-07 07:28:54 +08:00
648540858
52aa4e6e85 实现GbChannelServiceImpl 2024-07-05 17:22:21 +08:00
648540858
1cb1b0bd36 临时提交 2024-07-04 18:00:41 +08:00
648540858
7936194718 调整数据库字段 2024-07-04 16:55:42 +08:00
648540858
b98cfd1fed 使用Slf4j注解打印日志 2024-07-03 17:24:35 +08:00
648540858
adf040ec4b 优化日志以及属性设置代码 2024-07-03 17:09:49 +08:00
648540858
799932f614 优化日志以及属性设置代码 2024-07-03 16:14:18 +08:00
648540858
10c852c00d 优化目录信息内容构建 2024-07-02 16:35:03 +08:00
648540858
324fef2908 临时提交 2024-07-01 17:59:14 +08:00
648540858
2c7dfa03a8 适配拉流代理 2024-07-01 17:13:12 +08:00
648540858
d1df17c007 适配拉流代理 2024-07-01 17:12:43 +08:00
panlinlin
e531e497c8 临时提交 2024-06-29 23:35:26 +08:00
panlinlin
69e7ab5439 临时提交 2024-06-29 12:01:42 +08:00
panlinlin
97bc8766bc 临时提交 2024-06-28 22:15:42 +08:00
648540858
b630190e30 临时提交 2024-06-28 18:06:09 +08:00
panlinlin
019af90f6e 临时提交 2024-06-28 07:36:28 +08:00
panlinlin
9c0e69c6c5 临时提交 2024-06-28 06:48:49 +08:00
panlinlin
7847bd6614 临时提交 2024-06-27 23:38:13 +08:00
panlinlin
03497c55f0 Merge branch 'refs/heads/master' into 1078 
# Conflicts:
#	src/main/resources/application.yml
 2024-06-27 21:52:59 +08:00
648540858
88c021948f 临时提交 2024-06-27 18:41:58 +08:00
648540858
b2aa5c839d 临时提交 2024-06-27 17:51:13 +08:00
648540858
400eef2d2e 临时提交 2024-06-27 16:02:43 +08:00
648540858
1616a2a731 Merge remote-tracking branch 'gitee-c/dev/master-通道结构重构' into dev/master-通道结构重构 2024-06-26 18:41:37 +08:00
648540858
f32eb14125 临时提交 2024-06-26 18:36:32 +08:00
648540858
81049b5a9e 临时提交 2024-06-25 17:46:33 +08:00
648540858
7255e5a887 临时提交 2024-06-25 16:59:22 +08:00
648540858
e4c11bfebe Merge branch 'refs/heads/master' into dev/master-通道结构重构 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestForCatalogProcessor.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
#	src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
 2024-06-25 16:46:47 +08:00
648540858
68fce9177f 临时提交 2024-06-25 16:45:31 +08:00
648540858
87c071fd5e 合并271分支 2024-06-25 10:24:35 +08:00
648540858
57a230afb3 Merge branch 'refs/heads/2.7.1' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
 2024-06-25 09:45:34 +08:00
panlinlin
b22e894e94 1078-通道信息增加数据库ID 2024-06-21 21:46:55 +08:00
panlinlin
282e0db96e 1078-调整通道信息 2024-06-21 21:30:15 +08:00
panlinlin
397ac956de 调整通用通道的位置 2024-06-21 16:05:13 +08:00
648540858
050882d6a6 修复推流时存入推流数据的问题 2024-06-20 22:35:48 +08:00
648540858
306c42b4b7 临时提交 2024-06-20 22:29:50 +08:00
648540858
246c01b1c8 重命名通道信息 2024-06-20 20:49:17 +08:00
648540858
40bf2d6642 添加通道信息 2024-06-20 20:24:15 +08:00
648540858
e0c957a0c5 Merge branch 'refs/heads/master' into dev/master-通道结构重构 2024-06-20 20:06:01 +08:00
648540858
5e82aa5f39 优化拉流代理国标级联点播 2024-06-20 20:04:48 +08:00
648540858
5c40608458 临时提交 2024-06-20 20:04:29 +08:00
648540858
45410d8091 优化拉流代理国标级联点播 2024-06-20 19:46:48 +08:00
648540858
099c65ff40 调整点播默认超时时间为10秒 2024-06-20 19:30:25 +08:00
648540858
6e4268a670 调整推流数据写入redis 2024-06-20 18:12:35 +08:00
panlinlin
5db39a2265 1078-完善接入国标通道页面以及属性 2024-06-20 06:21:20 +08:00
648540858
f5abf8df4c 修改排序 2024-06-19 16:00:26 +08:00
648540858
afe80a7be1 调整获取监听信息的逻辑 2024-06-18 10:00:32 +08:00
panlinlin
358799a391 1078-添加接入国标通道页面以及属性 2024-06-18 05:55:42 +08:00
648540858
1909c7f71f 调整参数名称 2024-06-17 10:08:09 +08:00
648540858
b1d9ea8082
Merge pull request #1492 from iwanlebron/master 
修复参数名称
 2024-06-17 10:06:51 +08:00
panlinlin
4ba04661ab 1078-添加接入国标通道表 2024-06-16 09:14:35 +08:00
panlinlin
36e15c80b0 1078-增加位置信息并发处理能力 2024-06-16 06:41:57 +08:00
648540858
107caf1171 调整前端使用转码后的流 2024-06-14 17:24:57 +08:00
648540858
f3ea07bdcd 调整转码后的流的输出位置 2024-06-14 17:03:55 +08:00
648540858
aa56bb3c26 优化docker内ip变化的情况 2024-06-14 09:47:19 +08:00
panlinlin
07a8ef9e25 SIP只有一个监听时，直接返回 2024-06-14 00:03:57 +08:00
panlinlin
70e6d919e9 设备使用的注册网卡信息变化时，更新设备信息 2024-06-13 23:40:32 +08:00
panlinlin
7b46769a16 修复国标录像下载后负载统计未清除的BUG 2024-06-13 23:15:51 +08:00
648540858
da2662ab27 国标28181-支持自动识别网卡监听，可以不再配置SIP.IP 2024-06-13 18:10:01 +08:00
648540858
4ad711f61a 去除调试日志日志 2024-06-13 16:21:34 +08:00
648540858
93532a6b3b Merge remote-tracking branch 'origin/1078' into 1078 2024-06-12 12:49:58 +08:00
648540858
e0adc7306b Merge branch 'refs/heads/master' into 1078 2024-06-12 12:49:47 +08:00
648540858
6c9d213394 Merge remote-tracking branch 'origin/master' 2024-06-12 11:10:22 +08:00
648540858
0ac27b03ff 增加设备上线判断双逻辑，兼容大华注册后不再发送注册的设备 2024-06-12 11:10:10 +08:00
panlinlin
291a87e1f7 1078-支持自动点播 2024-06-12 00:22:16 +08:00
panlinlin
46bf5b7a39 1078-支持无人观看自动停流 2024-06-11 23:49:55 +08:00
panlinlin
b070b57259 拉流代理状态变化时，支持推送到国标平台 2024-06-11 23:10:12 +08:00
648540858
2cf7178cb7 Merge branch 'refs/heads/2.7.1' 2024-06-11 10:14:14 +08:00
648540858
f8ef14bfea 修复移动位置位置订阅上报间隔为0的bug 2024-06-11 10:08:13 +08:00
panlinlin
824690a37f 1078-终端参数回显 2024-06-10 15:20:48 +08:00
Iwan Lebron
f6157cc42c
修复参数名称 2024-06-10 09:18:37 +08:00
panlinlin
3410fae879 1078-添加终端参数的前端UI 2024-06-10 08:30:22 +08:00
panlinlin
f564ff0aba 1078-支持设备录像FTP方式下载 2024-06-10 00:33:55 +08:00
panlinlin
a030c15c8f 1078-支持设备录像播放以及播放控制 2024-06-09 22:09:04 +08:00
panlinlin
4b90298c99 1078-支持设备录像检索播放 2024-06-09 20:50:59 +08:00
panlinlin
b4dddb0b08 1078-支持云台控制 2024-06-08 23:55:06 +08:00
panlinlin
18cfba612b 1078-支持快照的展示 2024-06-08 22:58:23 +08:00
panlinlin
6074638f5b 1078-支持控制是否要音频 2024-06-08 22:47:25 +08:00
panlinlin
dbb2492640 1078-修复断开连接时设备未下线的BUG 2024-06-08 21:54:58 +08:00
648540858
942a41c630 1078-增加流地址标识 2024-06-08 00:56:05 +08:00
648540858
595d9be283 1078-优化点播以及通道表结构 2024-06-08 00:46:08 +08:00
wangxinlong
208e034822 录像下载失败未正常释放ssrc 2024-06-07 18:13:45 +08:00
648540858
0103d5819b 1078-调整页面 2024-06-07 14:03:41 +08:00
648540858
972ef30f8d 1078-部标通道添加音频控制 2024-06-07 07:21:40 +08:00
648540858
913d358a11 1078-部标通道添加音频控制 2024-06-07 00:20:52 +08:00
648540858
5d5d654410 1078-添加部标通道页面 2024-06-07 00:10:36 +08:00
648540858
619a86e0ed 修复循环引用 2024-06-06 19:59:48 +08:00
648540858
f7d811a299 1078-调整业务信息 2024-06-06 07:26:20 +08:00
648540858
2226d34898 修复空指针异常 2024-06-06 00:29:52 +08:00
648540858
5c826ef449 1078-添加通道信息 2024-06-06 00:23:16 +08:00
648540858
2127cbeca3 调整收到移动位置订阅后开启定时任务 2024-06-05 22:45:13 +08:00
648540858
0de2bb54cd 1078-完成录像文件下载 2024-06-04 23:59:08 +08:00
648540858
83875a5905 1078-修复ftp-server对文件上传的通知 2024-06-04 07:15:05 +08:00
648540858
3728219177 1078-添加录像上传 2024-06-02 00:50:45 +08:00
648540858
e8d832d0a5 1078-添加ftpserver 2024-05-30 23:41:22 +08:00
648540858
89101b2731 1078-增加ftp-server 2024-05-30 18:36:24 +08:00
648540858
56fdbd34f4 1078-优化回放流地址格式 2024-05-30 11:34:18 +08:00
648540858
6efff9daf9 1078-优化回放 2024-05-30 10:29:14 +08:00
648540858
74c98c8636 1078-录像回放控制 2024-05-29 23:53:20 +08:00
648540858
15a551d983 1078-标记待实现 9105 2024-05-29 18:40:31 +08:00
648540858
2b1645729b 1078-切换码流类型 2024-05-29 18:36:19 +08:00
648540858
84ef932964 1078-修复双向对讲 2024-05-29 18:27:10 +08:00
648540858
2aef6ab6f1 1078-支持语音广播 2024-05-29 17:34:38 +08:00
648540858
de6a3ceb76 1078-双向对讲完成 2024-05-29 17:26:28 +08:00
648540858
87ecf68332 1078-双向对讲 2024-05-29 16:55:07 +08:00
648540858
01fbf102c2 Merge branch 'refs/heads/master' into 1078 2024-05-29 15:03:20 +08:00
648540858
764d04b497 调整上级观看消息的发送 2024-05-29 15:02:51 +08:00
648540858
a945078788 1078-语音对讲 2024-05-29 00:02:31 +08:00
648540858
9ece77d54a 1078-点播添加类型 2024-05-28 18:58:16 +08:00
648540858
37b79633f0 Merge branch 'refs/heads/master' into 1078 2024-05-28 18:40:44 +08:00
648540858
bec35ebf94 调整录像进度获取流程 2024-05-28 16:06:08 +08:00
648540858
c69b64c756 修复CSEQ重置错误 #1449 2024-05-28 10:23:17 +08:00
648540858
de390d3982 Merge branch 'refs/heads/2.7.1' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
 2024-05-28 10:16:46 +08:00
648540858
adfce4464d 1078-终端上传乘客流量 2024-05-27 23:55:44 +08:00
648540858
c8ddee905f 1078-补充终端音视频参数设置 + 查询终端音视频属性 2024-05-27 23:29:59 +08:00
648540858
1efabbe4cc 支持把推流的额外参数加入redis缓存 2024-05-24 10:50:29 +08:00
648540858
3a056acbc1 合并271分支 2024-05-24 10:18:29 +08:00
648540858
de6baa157e 合并271分支 2024-05-24 08:51:09 +08:00
648540858
8bdc406903 Merge branch 'refs/heads/2.7.1' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java
 2024-05-24 08:50:14 +08:00
648540858
8be6979911 1078-图像分析报警参数设置 2024-05-24 00:15:52 +08:00
648540858
aeeb61d141 合并271分支 2024-05-23 17:47:43 +08:00
648540858
475b8a49a3 优化录像文件信息入库 2024-05-23 17:44:30 +08:00
648540858
2c89fae49a Merge branch 'refs/heads/2.7.1' 
# Conflicts:
#	pom.xml
#	src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestForMobilePositionProcessor.java
#	src/main/java/com/genersoft/iot/vmp/media/bean/MediaServer.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/ICloudRecordService.java
#	src/main/java/com/genersoft/iot/vmp/service/bean/CloudRecordItem.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java
 2024-05-23 17:32:15 +08:00
648540858
fe9b8154e0 去除调试日志 2024-05-23 17:15:14 +08:00
648540858
2daa59d78c 支持彻底关闭文档页面 + 修复云端录像偶现callId错误问题 2024-05-23 17:10:45 +08:00
648540858
1e9cdfe87f 1078-单独视频通道参数设置+特殊报警录像参数设置+视频相关报警屏蔽字 2024-05-22 21:24:47 +08:00
648540858
9817bf3fb7 1078-音视频参数设置+音视频通道列表设置 2024-05-21 23:58:23 +08:00
648540858
82ab524fc4 1078-音视频参数设置+音视频通道列表设置 2024-05-21 23:56:51 +08:00
648540858
d70bfb53dd 修复兼容zlm-pro转码时无人管看自动移除失败的BUG 2024-05-20 11:37:07 +08:00
648540858
e085258d74 1078-数据下行透传+数据上行透传 + 数据压缩上报 + 平台 RSA公钥 + 终端 RSA公钥 2024-05-20 00:04:04 +08:00
648540858
2f1ebca335 1078-单条存储多媒体数据检索上传命令 2024-05-19 23:50:37 +08:00
648540858
b626a583f4 1078-录音 2024-05-19 17:50:40 +08:00
648540858
dcc20d0d15 1078-存储多媒体数据上传接口优化 2024-05-19 17:08:31 +08:00
648540858
6af9b8da1f 1078-存储多媒体数据上传 2024-05-18 16:52:02 +08:00
648540858
e9562d7d31 1078-存储多媒体数据上传命令 2024-05-18 07:29:15 +08:00
648540858
b0e25ef784 1078-修复分包消息处理 2024-05-18 05:59:23 +08:00
648540858
49101a37e0 兼容zlm-pro转码 2024-05-17 16:32:01 +08:00
648540858
7ddf066878 1078-修复存储多媒体数据检索 2024-05-17 07:43:28 +08:00
bradyx
6e8071d820 fix: 系统启动时，停止已启动国标推流抛出异常被系统捕获，启动服务失败。 2024-05-15 13:52:16 +08:00
648540858
9161a090f6 1078-存储多媒体数据检索接口 2024-05-15 13:15:14 +08:00
648540858
7bf548492a 1078-修复摄像头立即拍摄命令应答 2024-05-14 23:21:57 +08:00
648540858
e02a047eb2 1078-存储多媒体数据检索 + 存储多媒体数据检索应答 2024-05-14 13:13:58 +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
aaa1d3a46f 1078-摄像头立即拍摄命令 2024-05-12 07:36:29 +08:00
648540858
db4ba4035f Merge branch 'refs/heads/master' into 1078 2024-05-12 06:53:53 +08:00
BradyXu
72b437cc52 修复当上级平台点播时，上级平台和下级平台局域网不通时，导致推流失败。推流目标IP地址改为配置的SDP发流IP，如果SDP发流IP存在的话。否则还是从连接中获取推流目标IP 2024-05-12 02:15:41 +08:00
648540858
e6a850891e 支持移动位置订阅通知的数据存储 2024-05-11 17:48:47 +08:00
648540858
17e9631de4 修复多节点时端口丢失的问题 2024-05-09 23:53:36 +08:00
648540858
632075da9b 优化接收BYE消息后的处理 2024-05-09 23:41:27 +08:00
648540858
cc71b7d9ca 1078-定位数据批量上传+多媒体事件信息上传+多媒体数据上传 2024-05-09 00:03:54 +08:00
648540858
c6e3df685a 1078-上报驾驶员身份信息请求+驾驶员身份信息采集上报 2024-05-08 22:51:29 +08:00
648540858
622d72b3f0 解决刷新通道异常 2024-05-08 12:16:18 +08:00
648540858
186b00e9b3 支持下载多个云端录像的zip压缩包 2024-05-08 11:18:47 +08:00
648540858
ad67155d73 1078-查询区域或线路数据 2024-05-06 23:58:17 +08:00
648540858
2112fffc26 1078-查询区域或线路数据应答... 2024-05-06 18:00:26 +08:00
648540858
364d613ccb 1078-修复删除路线 2024-05-06 16:05:16 +08:00
648540858
c53e4f6fbc 1078-设置路线 2024-05-06 15:55:14 +08:00
648540858
cc91db30c5 1078-查询区域或线路数据 2024-05-05 23:02:49 +08:00
648540858
00749619da 1078-设置路线... 2024-05-05 21:54:56 +08:00
648540858
9280b57974 1078-设置路线... 2024-05-04 23:19:27 +08:00
648540858
a3149139e2 1078-设置多边形区域+删除多边形区域 2024-05-04 21:56:47 +08:00
648540858
58401b1444 1078-设置多边形区域... 2024-05-04 14:57:48 +08:00