aunix/wvp-GB28181-pro
1
0
Fork 0
mirror of https://gitee.com/pan648540858/wvp-GB28181-pro.git synced 2026-05-21 21:07:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,709 Commits 27 Branches 1 Tag 209 MiB
b22e894e94
Commit Graph

2032 Commits

Author SHA1 Message Date
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
648540858
4a5de5a2db 1078-设置矩形区域+删除矩形区域 2024-05-04 14:35:45 +08:00
648540858
faa0a01b9f 1078-设置圆形区域 2024-05-04 00:09:12 +08:00
648540858
5dd49b3d44 1078-设置圆形区域... 2024-05-03 18:58:49 +08:00
648540858
4011e54dd8 1078-设置圆形区域... 2024-05-03 01:02:00 +08:00
648540858
738b3b6a8e 1078-车辆控制应答 2024-05-02 07:35:44 +08:00
648540858
a5bfe5049d 1078-车辆控制 2024-05-02 07:29:00 +08:00
648540858
c946b97514 1078-优化消息汇报消息体的解析 2024-05-02 06:43:59 +08:00
648540858
0fc0cd6e41 1078-优化编码 2024-05-02 06:25:09 +08:00
648540858
734f0c7e04 1078-设置电话本+电话回拨 2024-05-02 05:21:50 +08:00
648540858
16bc3dabd6 1078-修改文本信息下发标记类型注释 2024-05-02 04:46:34 +08:00
648540858
7c833f3d12 1078-文本信息下发 2024-05-01 15:07:38 +08:00
648540858
e5acf7f1e4 1078-人工确认报警消息+链路检测 2024-05-01 10:05:33 +08:00
648540858
eb43ffd98f 1078-临时提交 2024-05-01 00:01:55 +08:00
648540858
e45b2479d3 1078-临时位置跟踪控制+位置信息查询 2024-04-30 23:37:44 +08:00
648540858
2ae4226e89 修复云端录像按年月查询时时间条件错误的BUG 2024-04-30 15:45:39 +08:00
648540858
edfd528dd5 Merge remote-tracking branch 'origin/master' 2024-04-30 15:01:43 +08:00
648540858
d4cdf5510b 优化拉流代理调用流程 2024-04-30 14:39:53 +08:00
648540858
7bdde6907a 1078-添加设备属性查询接口 2024-04-30 12:13:49 +08:00
648540858
5be7c7636e 1078-查询终端属性完成 2024-04-30 00:42:22 +08:00
648540858
76580d8fdc 1078-查询终端属性... 2024-04-30 00:28:40 +08:00
648540858
5b489d7c26 1078-设置终端参数-添加接口 2024-04-29 23:06:15 +08:00
648540858
5a392372cb 1078-添加设备控制 2024-04-29 22:15:21 +08:00
648540858
8aa97ba695 1078-添加设备控制 2024-04-29 22:12:27 +08:00
648540858
516c5ce3d1 1078-添加设备控制 2024-04-29 22:01:26 +08:00
648540858
9facff13b1 1078-添加发送分包支持 2024-04-29 21:24:08 +08:00
648540858
91b81ceb7a 1078-添加发送分包支持 2024-04-29 16:27:01 +08:00
648540858
06b27beedc 1078-设置终端参数... 2024-04-29 07:00:00 +08:00
648540858
bc356849c7 1078-设置终端参数... 2024-04-29 00:05:04 +08:00
WuPeng
424c0b6333 修改on_stream_none_reader返回值 2024-04-28 14:31:38 +08:00
648540858
8ade012a6e 合并分支 2024-04-26 17:49:28 +08:00
648540858
5e359b64d6 合并分支 2024-04-26 17:41:00 +08:00
648540858
6bd3a187a0 合并分支 2024-04-26 15:42:31 +08:00
648540858
3f6ef955f5 修复空指针异常 2024-04-26 15:02:49 +08:00
648540858
39c3274294 合并分支 2024-04-25 17:53:24 +08:00
648540858
225940825b 1078-设置终端参数... 2024-04-24 23:34:21 +08:00
648540858
62122f95f0 1078-完善查询终端参数接口 2024-04-24 23:15:07 +08:00
648540858
67b846fe2f 1078-支持8103 修改注释错误 2024-04-24 22:21:47 +08:00
648540858
b89af9a693 Merge branch 'refs/heads/2.7.0' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
 2024-04-24 20:51:28 +08:00
648540858
2113e8cf27 优化notify消息中目录的处理 2024-04-24 20:33:52 +08:00
648540858
44aa37ad6e 优化notify消息中目录的处理 2024-04-24 16:12:42 +08:00
648540858
c21d973977 修复收到catalog消息是更新导致是否有音频的设置失效的BUG 2024-04-24 14:59:41 +08:00