Commit Graph

1044 Commits

Author SHA1 Message Date
lin
826b251544 修复上报的坐标未按照坐标系转换的BUG 2025-11-05 11:34:59 +08:00
lin
0eefabd034 修复相关BUG 2025-11-04 11:22:03 +08:00
lin
5d471ded1a 完善地图的抽稀展示、执行和保存 2025-11-03 15:52:20 +08:00
lin
091d6e67ee 优化流信息存储的兼容性 2025-10-29 15:56:29 +08:00
lin
952d38d69b 修复更新坐标系时参数坐标系转换失败 2025-10-29 14:31:53 +08:00
lin
a02ac63be4 Merge branch 'master' into dev/springBoot3 2025-10-24 17:13:57 +08:00
lin
b151aec5a0 修复开启订阅和取消订阅时EventId不一致 2025-10-24 16:54:12 +08:00
lin
0e331d6b97 临时提交 2025-10-22 22:39:17 +08:00
lin
aae673e47e 临时提交 2025-10-22 18:19:48 +08:00
lin
dd906dc7b9 去除旧的gps通知 2025-10-17 17:27:08 +08:00
lin
c10c982954 临时提交 2025-10-17 15:26:32 +08:00
lin
87afbe3f89 临时提交 2025-10-17 15:19:21 +08:00
lin
b13207db92 临时提交 2025-10-10 17:08:32 +08:00
lin
61c64589b2 临时提交 2025-09-30 23:17:40 +08:00
lin
8d6fe0c9d8 优化地图展示流程,已经默认统一坐标为wgs84 2025-09-25 18:06:58 +08:00
lin
842647674a 升级spring boot版本。默认jdk版本升级至21 2025-09-24 10:24:42 +08:00
guoshq
e91e96077a [后端] 修复目录设置/位置移动的订阅逻辑:订阅周期必须 ≥30 秒,取消订阅时允许周期设为 0 2025-09-17 13:38:23 +08:00
lin
93724bac98 修复预置位查询空指针 2025-08-12 12:28:51 +08:00
yosixiaohu
2877d67e92 修复GB28181预置位查询只能返回10条数据BUG 2025-08-09 11:14:39 +08:00
lin
1da487f02a [1078] 优化鉴权码位置,支持1078国标级联 2025-08-06 15:17:44 +08:00
lin
19b873ba5c 通用通道支持云台控制 2025-07-31 18:49:53 +08:00
lin
867b26b9a8 Merge branch 'master' into dev/通用通道云台控制 2025-07-30 10:34:58 +08:00
elpx
3cec9d2bd1 修改ip与port的拼接方式,以支持ipv6 2025-07-28 23:57:16 +08:00
韩浩然XiaoQiTong
65553e966e
Update SIPCommander.java 2025-07-28 10:29:47 +08:00
XiaoQiTong
f9f9d03502 修复预置位查询指令海康平台响应不了的问题 2025-07-27 16:22:50 +08:00
XiaoQiTong
47571962e6 解决获取所有预置位返回错误的bug 2025-07-27 16:19:57 +08:00
lin
3c88f86a73 Merge branch 'master' into dev/通用通道云台控制 2025-07-07 18:03:39 +08:00
lin
4765d0efa6 调整国标级联通道发送逻辑 2025-07-07 17:56:06 +08:00
lin
70356c08d2 调整国标级联通道发送逻辑 2025-07-07 16:17:14 +08:00
lin
51759535fc 临时提交 2025-07-07 09:30:04 +08:00
lin
1c55bc3fd1 预置位查询支持多段返回 2025-06-19 15:12:47 +08:00
Jerry Yan
1b35fbd0e0 支持关闭返回Date Header,进而实现关闭对摄像头的校时功能
Fixes #1700
2025-06-12 16:05:06 +08:00
lin
98ea5846fe 心跳入库 支持批量入库 2025-06-10 09:45:02 +08:00
panlinlin
916553c559 订阅消息检查是否缺失Expires, 修复因华为的信令错误导致的空指针 2025-06-03 22:27:05 +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
648540858
dccd27e9c2 修复空指针异常 2025-05-29 21:36:02 +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
648540858
a40446e42b 临时提交 2025-05-27 23:19:10 +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
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
lin
601d2b5d2b 修复集群推流BUG 2025-05-23 18:06:54 +08:00
lin
55f36f660b 修复集群播放BUG 2025-05-23 17:26:17 +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