347 Commits

Author	SHA1	Message	Date
lin	1da487f02a	[1078] 优化鉴权码位置，支持1078国标级联	2025-08-06 15:17:44 +08:00
lin	efbd302260	Merge branch 'master' into 重构/1078	2025-08-01 19:00:13 +08:00
lin	09f1ef20a7	通用通道支持录像回放以及录像控制	2025-08-01 18:59:15 +08:00
lin	c75122008c	通用通道支持停止实时流	2025-08-01 15:58:30 +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	8ec950d515	通用通道支持巡航组	2025-07-31 20:54:08 +08:00
lin	19b873ba5c	通用通道支持云台控制	2025-07-31 18:49:53 +08:00
lin	b7a2b6816b	[1078] 完善录像下载	2025-07-10 18:48:25 +08:00
lin	51759535fc	临时提交	2025-07-07 09:30:04 +08:00
xiaoQQya	1c25f2f190	feat: 新增国标收流通道列表查看	2025-06-26 11:46:14 +08:00
lin	1c55bc3fd1	预置位查询支持多段返回	2025-06-19 15:12:47 +08:00
lin	f4bbca78e5	优化通道变化消息发送以及增加设备状态丢失检测	2025-06-03 16:52:42 +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	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	bcf08d27fa	重构平台保活逻辑	2025-05-21 23:17:52 +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	f7f3ed4c5b	Merge branch 'master' into dev/设备和平台使用不同的优化策略	2025-05-19 14:42:44 +08:00
lin	2dcd070fbe	调整PR修复方式	2025-05-19 14:42:26 +08:00
lin	5224f2b5c0	增加数据库脚本	2025-05-19 10:39:49 +08:00
lin	a83a48e40e	修复因发送失败消息捕捉导致的消息处理异常	2025-05-13 15:25:17 +08:00
648540858	9903f25cc1	强化消息发送失败的处理	2025-05-11 22:00:33 +08:00
lin	481609ef72	修复录制计划开启录像失败的BUG	2025-04-09 16:48:50 +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
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	c0d043ecd9	[国标级联] 增加前端控制指令解析	2025-03-06 15:27:25 +08:00
lin	3da6444baa	调整设备控制相关的接口	2025-02-13 15:15:36 +08:00
lin	5808c7aff5	[集群] 重构message消息接受返回值的方式	2025-02-12 17:20:12 +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	d08248aae9	调整心跳间隔的设置机制以及状态的判断	2025-02-11 18:16:05 +08:00
lin	ea12e3465f	修复语音对讲后停止点播失败的BUG	2025-02-11 16:06:18 +08:00
648540858	01f491c026	[集群] 修复同步通道时的通道上下线消息发送	2025-01-21 17:00:37 +08:00
648540858	884fcb827f	[集群-自动切换过国标级联] 添加数据库脚本	2025-01-02 14:29:13 +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	19453f7ca9	临时提交	2024-12-23 07:20:48 +08:00
648540858	93afd46d0f	增加RPC录像回放和录像下载	2024-12-12 17:46:51 +08:00
648540858	e62d106a1f	临时提交	2024-12-11 09:56:09 +08:00
648540858	24c3c45565	[录制计划] 修复关联通道	2024-11-27 17:59:54 +08:00
648540858	d3f53db160	Merge branch 'master' into dev/录制计划	2024-11-27 14:20:59 +08:00
648540858	e9a53b766e	调整目录查询的结果展示逻辑	2024-11-27 11:04:26 +08:00
648540858	f625fb6aed	修复大华对讲talk模式	2024-11-27 10:11:49 +08:00
648540858	57e1934f02	Merge branch 'master' into dev/录制计划	2024-11-26 20:59:27 +08:00