Commit Graph

216 Commits

Author SHA1 Message Date
lin
469804b8d3 修改位置分发逻辑 2025-11-17 16:04:47 +08:00
lin
fea157436b 优化redis 消息处理 2025-11-14 17:09:55 +08:00
lin
0607e1c3b2 修复三方接口获取播放地址失败 2025-11-05 23:08:05 +08:00
lin
311b59870c 支持服务端抽稀和服务发布 2025-11-02 23:50:07 +08:00
lin
952d38d69b 修复更新坐标系时参数坐标系转换失败 2025-10-29 14:31:53 +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
fd306d8ede 云端录像回放使用单文件播放 2025-09-19 18:02:53 +08:00
lin
a064f27bf8 支持ABL风格地址 2025-09-18 18:53:12 +08:00
lin
333965255f Merge branch 'master' into 重构/1078
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/common/enums/ChannelDataType.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/IGbChannelPlayService.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelPlayServiceImpl.java
2025-07-31 21:14:23 +08:00
lin
19b873ba5c 通用通道支持云台控制 2025-07-31 18:49:53 +08:00
lin
edeb8d6b3f 临时提交 2025-07-30 18:02:49 +08:00
lin
5874d4d1fa [1078] 修复webrtc地址 2025-07-15 18:37:53 +08:00
lin
48eff320fd [1078] 适配abl的播放1078 2025-07-09 12:32:31 +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
dd9c64d7a8 增加设备状态保持任务 2025-05-26 18:04:02 +08:00
lin
0c29c90d3b Merge branch 'master' into 重构/1078 2025-05-26 15:07:58 +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
dd17462b68 重构设备订阅保活和更新机制 2025-05-21 14:57:10 +08:00
648540858
3b7ba3eb46 Merge branch 'master' into dev/1078-newUI
# Conflicts:
#	src/main/resources/application.yml
2025-05-10 08:59:45 +08:00
lin
e2678f39e3 临时提交 2025-04-25 18:04:51 +08:00
lin
f0eb101130 [1078] 适配新的数据库结构 2025-03-24 17:53:43 +08:00
lin
20135726eb Merge branch 'master' into 重构/1078 2025-03-24 15:19:07 +08:00
lin
a4e810da12 调整代码位置 2025-03-20 14:18:41 +08:00
lin
1e98f1df65 移除无用类 2025-03-19 14:11:05 +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
lin
298fb05378 优化录像下载。 支持八倍速(设备支持的最高速度)下载 2025-03-13 16:48:15 +08:00
lin
e5c3f82d54 播放地址携带流来源信息 2025-03-12 16:09:54 +08:00
lin
e0f9c93b0f 修复方法名错别字 2025-03-12 15:02:32 +08:00
648540858
33abdb1db6 Merge branch 'master' into dev/数据库统合
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/IDeviceChannelService.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceChannelServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/control/cmd/DeviceControlQueryMessageHandler.java
#	src/main/java/com/genersoft/iot/vmp/streamProxy/service/impl/StreamProxyPlayServiceImpl.java
#	web_src/src/components/DeviceList.vue
2025-03-10 21:36:52 +08:00
lin
bc249b6786 [国标级联] 完善通用通道前端控制处理接口 2025-03-06 16:30:42 +08:00
lin
8a71208035 [国标级联] 增加通用通道云台控制和预置位处理接口 2025-03-06 16:01:05 +08:00
lin
b6c3f42a1f Merge branch 'refs/heads/master' into dev/数据库统合2
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/controller/DeviceConfig.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/controller/GBRecordController.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/IDeviceService.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/IGbChannelPlayService.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelPlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/streamProxy/service/impl/StreamProxyPlayServiceImpl.java
#	src/main/resources/配置详情.yml
2025-02-11 19:30:20 +08:00
lin
3fe131eed3 修复录制计划以来全局录像配置, 目前去除依赖,目前录制计划开启录像 2025-02-11 11:08:52 +08:00
648540858
d022eb72d6 [集群-自动切换过国标级联] 添加检测wvp奔溃与重新注册 2025-01-02 16:16:50 +08:00
648540858
884fcb827f [集群-自动切换过国标级联] 添加数据库脚本 2025-01-02 14:29:13 +08:00
648540858
28961f51f7 完善数据库结构调用 2024-12-23 23:49:54 +08:00
648540858
19453f7ca9 临时提交 2024-12-23 07:20:48 +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
98b4566c6c 移除操作日志记录到数据库功能 2024-10-29 16:56:14 +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