Commit Graph

583 Commits

Author SHA1 Message Date
lin
dd906dc7b9 去除旧的gps通知 2025-10-17 17:27:08 +08:00
lin
a064f27bf8 支持ABL风格地址 2025-09-18 18:53:12 +08:00
lin
e730bf2d15 [1078] 修复mediaServer入库错误 2025-07-17 07:03:11 +08:00
lin
48eff320fd [1078] 适配abl的播放1078 2025-07-09 12:32:31 +08:00
lin
bab5534134 Merge branch 'master' into dev/abl支持
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/MediaStatusNotifyMessageHandler.java
#	src/main/java/com/genersoft/iot/vmp/media/bean/MediaInfo.java
#	src/main/java/com/genersoft/iot/vmp/media/bean/MediaServer.java
#	src/main/java/com/genersoft/iot/vmp/media/bean/RecordInfo.java
#	src/main/java/com/genersoft/iot/vmp/service/bean/CloudRecordItem.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java
#	src/main/resources/application.yml
2025-07-03 14:58:24 +08:00
lin
75b1e8deb2 Merge branch '2.7.3'
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/event/subscribe/catalog/CatalogEventLister.java
2025-05-23 18:18:32 +08:00
lin
55f36f660b 修复集群播放BUG 2025-05-23 17:26:17 +08:00
648540858
7c7ef34045 Merge branch '2.7.3'
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeHolder.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPSender.java
2025-05-22 21:09:22 +08:00
lin
243f7f62b7 国标级联调整心跳逻辑 2025-05-22 17:40:10 +08:00
lin
b0b5a0f5e0 国标级联调整注册逻辑 2025-05-22 15:17:13 +08:00
648540858
65cd397a9c 增加云端录像手动删除 2025-04-14 22:46:37 +08:00
lin
eea367d6d7 增加录像seek和倍速播放接口 2025-04-12 21:24:02 +08:00
lin
aa1e497d76 临时提交 2025-04-10 17:11:31 +08:00
lin
a9cf5131e1 修复zlm普通版本接入异常 2025-03-21 11:30:05 +08:00
lin
06de25bb4d 修复转码时拉流代理无人观看无法移除的BUG, 修复根据请求IP返回流地址失败的BUG 2025-03-19 15:45:23 +08:00
648540858
0566bf916f [集群-自动切换过国标级联] 修复BUG 2025-01-02 17:26:50 +08:00
648540858
d022eb72d6 [集群-自动切换过国标级联] 添加检测wvp奔溃与重新注册 2025-01-02 16:16:50 +08:00
648540858
884fcb827f [集群-自动切换过国标级联] 添加数据库脚本 2025-01-02 14:29:13 +08:00
648540858
874733fa2c [RPC 云端录像] 修复服务ID 获取 2024-12-31 15:36:48 +08:00
648540858
32e90b2537 [RPC 云端录像] 修复时长显示 2024-12-31 15:13:56 +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
28961f51f7 完善数据库结构调用 2024-12-23 23:49:54 +08:00
648540858
8d6a978978 [redis下的多wvp] 优化服务间方法调用 2024-12-11 18:26:18 +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
cc56ed3355 临时提交 2024-11-27 22:44:22 +08:00
648540858
3b24a6c8ca 修复云端录像列表排序 2024-11-27 15:29:00 +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
6e8a3f6adf 修复sql模糊查询中含有特殊符号时查询不准备的BUG 2024-11-14 14:08:05 +08:00
648540858
98b4566c6c 移除操作日志记录到数据库功能 2024-10-29 16:56:14 +08:00
648540858
183d87b9b6 优化GPS内容的REDIS缓存存取 2024-10-28 09:19:49 +08:00
648540858
fe3f4f029e 优化推流鉴权信息的Redis缓存策略 2024-10-27 21:25:05 +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
bf3e181bdb 修复节点上线和下线时未清理redis流信息的BUG 2024-10-24 16:41:41 +08:00
648540858
189e56c839 优化部分redis scan查询 2024-10-21 17:42:26 +08:00
648540858
9506bef6cb 移除未使用的方法 2024-10-21 12:36:37 +08:00
648540858
59a52705cf 临时提交 2024-09-25 14:32:09 +08:00
648540858
3b2a28fd00 移除旧的数据库操作类 2024-09-24 15:59:47 +08:00
648540858
550b90b157 Merge branch 'master' into dev/master-通道结构重构
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
2024-09-18 09:10:12 +08:00
648540858
800d6c926a 修复数据库语法兼容以及redis接收推流信息导入 2024-09-14 15:19:07 +08:00
648540858
2e90344c89 临时提交 2024-09-09 11:16:02 +08:00
648540858
489fbe31a5 临时提交 2024-09-09 00:07:00 +08:00
648540858
3fafe83e88 临时提交 2024-09-07 22:37:32 +08:00
648540858
da441a67f8 临时提交 2024-09-06 17:56:24 +08:00
648540858
4597fb197d 临时提交 2024-09-04 10:30:26 +08:00