Commit Graph

113 Commits

Author SHA1 Message Date
lin
3e162ea358 优化错误处理,回滚播放器版本,重构RTP服务器接口以区分不同的接口功能,优化参数数量 2026-04-14 18:11:14 +08:00
lin
a33e7949a4 支持心跳和注册统计 2026-01-26 15:55:07 +08:00
lin
31549bce09 去除心跳信息入库,提升性能 2026-01-25 21:59:42 +08:00
lin
469804b8d3 修改位置分发逻辑 2025-11-17 16:04:47 +08:00
lin
0607e1c3b2 修复三方接口获取播放地址失败 2025-11-05 23:08:05 +08:00
lin
311b59870c 支持服务端抽稀和服务发布 2025-11-02 23:50:07 +08:00
lin
dd906dc7b9 去除旧的gps通知 2025-10-17 17:27:08 +08:00
lin
f724451058 临时提交 2025-10-13 15:35:12 +08:00
lin
77594dae3d 支持从第三方同步分组信息 2025-09-27 21:03:20 +08:00
lin
6469aefe22 支持从第三方读取地图配置 2025-09-25 15:27:30 +08:00
lin
1420fcfcd0 Merge branch 'master' into 重构/1078
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/service/bean/InviteErrorCode.java
#	src/main/resources/application.yml
2025-05-29 17:10:32 +08:00
lin
578b54ed09 完善设备有效期到期机制 2025-05-29 15:29:00 +08:00
lin
0c29c90d3b Merge branch 'master' into 重构/1078 2025-05-26 15:07:58 +08:00
lin
243f7f62b7 国标级联调整心跳逻辑 2025-05-22 17:40:10 +08:00
lin
0329c8f5d1 Merge remote-tracking branch 'origin/master' into 重构/1078
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/dao/CommonGBChannelMapper.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/dao/PlatformChannelMapper.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/dao/provider/ChannelProvider.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceChannelServiceImpl.java
#	数据库/2.7.3/初始化-mysql-2.7.3.sql
#	数据库/2.7.3/初始化-postgresql-kingbase-2.7.3.sql
2025-03-18 15:30:35 +08:00
648540858
d022eb72d6 [集群-自动切换过国标级联] 添加检测wvp奔溃与重新注册 2025-01-02 16:16:50 +08:00
648540858
e5fd66ef96 Merge branch 'master' into 重构/1078
# Conflicts:
#	pom.xml
#	src/main/java/com/genersoft/iot/vmp/conf/SpringDocConfig.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceChannelServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
2024-11-10 15:29:53 +08:00
648540858
daa8e8358c 修复点播异常后无法再次点播的BUG 2024-10-29 18:20:24 +08:00
648540858
5304620861 重构报警SSE推送 2024-10-29 15:57:52 +08:00
648540858
296cf1e3fe 调整推流鉴权信息的RedisKEY 2024-10-27 23:45:31 +08:00
648540858
6fc8db8bd0 优化INVITE事务REDIS缓存存取 2024-10-25 18:03:30 +08:00
648540858
059635c2cc 修复国标点播缓存启动未清理的BUG 2024-10-25 17:41:50 +08:00
648540858
ef66bd8781 移除无用方法和变量 2024-10-25 15:08:05 +08:00
648540858
193f80963d 优化国标设备的Redis缓存策略 2024-10-24 18:32:37 +08:00
648540858
7abafef230 优化媒体节点的Redis缓存策略 2024-10-24 18:25:55 +08:00
648540858
189e56c839 优化部分redis scan查询 2024-10-21 17:42:26 +08:00
648540858
277f2db137 Merge branch 'master' into 重构/1078
# Conflicts:
#	pom.xml
#	src/main/java/com/genersoft/iot/vmp/gb28181/bean/CommonGBChannel.java
#	src/main/java/com/genersoft/iot/vmp/jt1078/codec/decode/Jt808Decoder.java
#	src/main/java/com/genersoft/iot/vmp/jt1078/codec/netty/Jt808Handler.java
#	src/main/java/com/genersoft/iot/vmp/jt1078/codec/netty/TcpServer.java
#	src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/Re.java
#	src/main/java/com/genersoft/iot/vmp/media/service/IMediaNodeServerService.java
#	src/main/java/com/genersoft/iot/vmp/media/service/IMediaServerService.java
#	src/main/java/com/genersoft/iot/vmp/media/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaNodeServerService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/utils/CivilCodeUtil.java
#	src/main/resources/application.yml
#	web_src/src/layout/UiHeader.vue
#	web_src/src/router/index.js
2024-10-18 13:55:23 +08:00
648540858
7cc4c9d14a 临时提交 2024-09-09 17:56:46 +08:00
648540858
489fbe31a5 临时提交 2024-09-09 00:07:00 +08:00
648540858
da441a67f8 临时提交 2024-09-06 17:56:24 +08:00
648540858
fa47f619ba 临时提交 2024-09-03 18:00:35 +08:00
panlinlin
36e15c80b0 1078-增加位置信息并发处理能力 2024-06-16 06:41:57 +08:00
648540858
87ecf68332 1078-双向对讲 2024-05-29 16:55:07 +08:00
648540858
a945078788 1078-语音对讲 2024-05-29 00:02:31 +08:00
648540858
db4ba4035f Merge branch 'refs/heads/master' into 1078 2024-05-12 06:53:53 +08:00
648540858
d41d6b34af Merge branch 'refs/heads/2.7.0'
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/bean/SendRtpItem.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZlmHttpHookSubscribe.java
#	src/main/java/com/genersoft/iot/vmp/service/IDeviceChannelService.java
#	src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisGbPlayMsgListener.java
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamCloseResponseListener.java
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisStreamMsgListener.java
#	src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
#	src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
2024-04-23 20:59:20 +08:00
648540858
b4168c02cb 优化多wvp国标级联推流 2024-04-16 00:10:38 +08:00
648540858
f9abfca003 临时提交 2024-04-15 21:33:22 +08:00
648540858
05c83cf6ef Merge branch 'master' into 1078 2024-04-11 09:39:04 +08:00
648540858
82ca3a778a 优化媒体节点redis数据格式 2024-04-09 22:52:06 +08:00
648540858
26bbeac6c7 1078-添加录像回放开始和停止 2024-04-06 00:06:40 +08:00
648540858
603ce18573 1078-添加点播支持 2024-04-02 23:26:40 +08:00
648540858
b90dc789b4 优化媒体节点服务的代码结构 2024-03-21 23:39:32 +08:00
648540858
2e7c9a7341 Merge branch 'wvp-28181-2.0' into main-dev
# Conflicts:
#	pom.xml
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/AssistRESTfulUtils.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeFactory.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java
#	src/main/resources/all-application.yml
#	src/main/resources/application-dev.yml
2024-02-07 20:30:37 +08:00
648540858
67e4060053 添加推流信息专属redis数据 2023-11-30 18:09:43 +08:00
648540858
b7ad0a907f 合并pr 优化sql 2023-10-27 18:06:46 +08:00
648540858
88350873ee Merge branch 'wvp-28181-2.0' into main-dev
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/info/InfoRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/MessageHandlerAbstract.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
2023-09-11 11:21:50 +08:00
648540858
91e49745e4 修复心跳异常,支持通道列表,推流列表,拉流代理列表直接查看对应的云端录像,兼容大于INT的ssrc的格式化 2023-08-16 01:55:50 +08:00
648540858
3e2486d0ab Merge branch '2.6.8' into wvp-28181-2.0 2023-08-08 09:50:31 +08:00
648540858
874a57387a 支持与第三方对接PS流 2023-08-08 09:49:27 +08:00