Commit Graph

1018 Commits

Author SHA1 Message Date
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
lin
b0b5a0f5e0 国标级联调整注册逻辑 2025-05-22 15:17:13 +08:00
lin
29ac4850f4 去除移除订阅时设置订阅周期 2025-05-21 18:06:07 +08:00
lin
dd17462b68 重构设备订阅保活和更新机制 2025-05-21 14:57:10 +08:00
lin
d524905edb 增加设备和平台在线状态不同的同步策略 2025-05-19 15:52:56 +08:00
lin
a83a48e40e 修复因发送失败消息捕捉导致的消息处理异常 2025-05-13 15:25:17 +08:00
lin
f1fb046774 修复播放弹窗下的地址复制 2025-05-12 16:10:24 +08:00
648540858
9903f25cc1 强化消息发送失败的处理 2025-05-11 22:00:33 +08:00
lin
b348b2d3a9 通道表增加索引 2025-04-03 09:06:16 +08:00
lin
a4e810da12 调整代码位置 2025-03-20 14:18:41 +08:00
lin
b2072073a9 修复国标级联推送位置新 2025-03-20 09:56:35 +08:00
lin
ec74488b4a 修复国标级联注册失败 2025-03-20 09:21:01 +08:00
lin
4af1e3859a 修复空指针异常 2025-03-14 16:55:08 +08:00
lin
298fb05378 优化录像下载。 支持八倍速(设备支持的最高速度)下载 2025-03-13 16:48:15 +08:00
lin
5539f52d13 判断设备离线时发送状态查询确定设备真实状态,确定离线再设置为离线 2025-03-13 11:23:49 +08:00
lin
e5c3f82d54 播放地址携带流来源信息 2025-03-12 16:09:54 +08:00
lin
b904e594a1 Merge branch 'dev/数据库统合'
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/controller/DeviceQuery.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/event/EventPublisher.java
2025-03-12 14:20:28 +08:00
lin
cb5a09214a 移除多余代码 2025-03-11 15:11:45 +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
c0d043ecd9 [国标级联] 增加前端控制指令解析 2025-03-06 15:27:25 +08:00
lin
c0aec7562b [国标级联] 调整云台控制调用逻辑 2025-03-05 17:20:55 +08:00
lin
676e2d7ea9 message消息适配新的回调模式 2025-02-18 17:04:13 +08:00
lin
3da6444baa 调整设备控制相关的接口 2025-02-13 15:15:36 +08:00
648540858
c5eca3ca0e 修复sip消息订阅事件移除失败的BUG 2025-02-12 22:55:51 +08:00
lin
9618f23af8 修复message和sip消息超时未回复的判断机制 2025-02-12 20:54:20 +08:00