Commit Graph

3446 Commits

Author SHA1 Message Date
Jerry Yan
5aaa1c016b 即将过期状态判断错误 2025-06-12 09:50:29 +08:00
Jerry Yan
a948b78629 接口请求修复 2025-06-12 09:50:29 +08:00
Jerry Yan
f4ba4ef159 knife4j文档更新 2025-06-12 09:50:29 +08:00
Jerry Yan
44bd521446 spring redis 新配置风格 2025-06-11 10:08:03 +08:00
Jerry Yan
14c85838f4 springboot3 2025-06-11 10:08:03 +08:00
lin
98ea5846fe 心跳入库 支持批量入库 2025-06-10 09:45:02 +08:00
lin
8acd3fa521 修复设备列表查询丢失字段,导致编辑后都是心跳参数 2025-06-06 15:24:58 +08:00
lin
bae2b2524b 移除过时的web_src 2025-06-06 09:59:25 +08:00
lin
8d97ee613e 修复移动位置订阅无法关闭的BUG 2025-06-06 09:26:36 +08:00
lin
bc545f12a5 优化延时任务到期时间更新 2025-06-05 11:19:07 +08:00
lin
6a6071973c Merge remote-tracking branch 'origin/master' 2025-06-05 09:41:17 +08:00
lin
60e9fb3daa 修复推流列表和拉流代理的云端录像跳转错误 2025-06-05 09:40:43 +08:00
panlinlin
916553c559 订阅消息检查是否缺失Expires, 修复因华为的信令错误导致的空指针 2025-06-03 22:27:05 +08:00
lin
227239f7f7 去除调试日志 2025-06-03 17:17:04 +08:00
lin
e3f880627e 去除多余数据库脚本 2025-06-03 16:53:36 +08:00
lin
f4bbca78e5 优化通道变化消息发送以及增加设备状态丢失检测 2025-06-03 16:52:42 +08:00
lin
cc0c73a64d Merge branch 'master' into dev/设备和平台使用不同的优化策略 2025-06-03 11:31:38 +08:00
lin
111274c08a 修复通道共享状态过滤, 优化发流端口获取, 避免递归过多异常 2025-06-03 10:36:29 +08:00
lin
f9300d01ec 调整自动获取预置位的列表的时间 2025-05-30 14:23:24 +08:00
648540858
dccd27e9c2 修复空指针异常 2025-05-29 21:36:02 +08:00
lin
79be053db7 更新README 2025-05-29 17:52:40 +08:00
648540858
08fe740481 Merge pull request #1866 from xiaoQQya/fix/sql
fix: 修复 sql 语法错误
2025-05-29 17:29:55 +08:00
lin
ec9a0bcc76 修复talk模式Bye消息发送失败的BUG 2025-05-29 17:02:37 +08:00
lin
46d30a8fe2 Merge branch 'master' into dev/设备和平台使用不同的优化策略
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java
#	数据库/2.7.4/初始化-mysql-2.7.4.sql
#	数据库/2.7.4/初始化-postgresql-kingbase-2.7.4.sql
2025-05-29 15:31:52 +08:00
lin
578b54ed09 完善设备有效期到期机制 2025-05-29 15:29:00 +08:00
xiaoQQya
3845c03250 fix: 修复 sql 语法错误 2025-05-29 14:37:22 +08:00
648540858
58e82ec185 临时提交 2025-05-28 22:32:14 +08:00
648540858
a40446e42b 临时提交 2025-05-27 23:19:10 +08:00
lin
3ad5d43368 临时提交 2025-05-27 18:24:07 +08:00
lin
dd9c64d7a8 增加设备状态保持任务 2025-05-26 18:04:02 +08:00
lin
cb2ade744e 更新README 2025-05-26 11:02:21 +08:00
lin
4b7467e8e0 Merge branch '2.7.3' 2025-05-26 10:17:46 +08:00
lin
b1ff1ef54c 增加订阅日志 2025-05-26 10:16:52 +08:00
lin
9da6e874fb 修复时间戳发送错误导致seek失败 2025-05-26 09:54:33 +08:00
lin
a7f9cbd8ef 版本号提升 2025-05-26 09:53:58 +08:00
lin
ca37162dd5 Merge branch 'master' into dev/设备和平台使用不同的优化策略
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java
2025-05-26 09:09:36 +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
648540858
0df557750f Merge pull request #1859 from Digital631/master
修复了分配监控的页面自适应
2025-05-23 18:17:41 +08:00
lin
601d2b5d2b 修复集群推流BUG 2025-05-23 18:06:54 +08:00
lin
55f36f660b 修复集群播放BUG 2025-05-23 17:26:17 +08:00
尚鹏暃
1a2de7a1c6 修复了分配监控的页面自适应 2025-05-23 16:13:57 +08:00
尚鹏暃
97c53f07c8 修复了分配监控的页面自适应 2025-05-23 15:59:58 +08:00
lin
d825b986dd 推流列表和拉流代理支持根据来源ip返回流地址 2025-05-23 09:20:22 +08:00
648540858
a1a5c53fad 合并国标级联状态重构 2025-05-22 21:14:50 +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
706806a138 Merge pull request #1857 from sxh-nice/master
修复开始时间和结束时间写反问题
2025-05-22 14:58:58 +08:00
yosixiaohu
83f603238a 修复开始时间和结束时间写反问题 2025-05-22 13:50:06 +08:00
648540858
7bb0cc19f4 重构平台保活逻辑-启动对未离线的平台注销 2025-05-22 07:09:20 +08:00