178 Commits

Author	SHA1	Message	Date
lin	5db66b0f40	修复分组信息缺少的行政区划编码 #1914	2025-08-27 09:56:50 +08:00
lin	e555df52d3	[1078] 通用通道支持位置更新	2025-08-06 06:38:37 +08:00
lin	c75122008c	通用通道支持停止实时流	2025-08-01 15:58:30 +08:00
lin	19b873ba5c	通用通道支持云台控制	2025-07-31 18:49:53 +08:00
XiaoQiTong	e9c227a3cf	修复查询缓存少流媒体字段，导致指定流媒体收流失效问题	2025-07-27 16:29:00 +08:00
lin	8d488b33e9	调整菜单结构，增加通道列表，支持节点搜索	2025-07-02 17:21:20 +08:00
xiaoQQya	1c25f2f190	feat: 新增国标收流通道列表查看	2025-06-26 11:46:14 +08:00
Jerry Yan	68806b4202	支持查询时根据channelId查询报警 ... Fixes #795	2025-06-11 13:00:27 +08:00
lin	98ea5846fe	心跳入库 支持批量入库	2025-06-10 09:45:02 +08:00
lin	8acd3fa521	修复设备列表查询丢失字段，导致编辑后都是心跳参数	2025-06-06 15:24:58 +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
648540858	08fe740481	Merge pull request #1866 from xiaoQQya/fix/sql ... fix: 修复 sql 语法错误	2025-05-29 17:29:55 +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
xiaoQQya	3845c03250	fix: 修复 sql 语法错误	2025-05-29 14:37:22 +08:00
648540858	58e82ec185	临时提交	2025-05-28 22:32:14 +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
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	5224f2b5c0	增加数据库脚本	2025-05-19 10:39:49 +08:00
Iwan Lebron	17a7b23239	fix sql err	2025-05-19 10:39:24 +08:00
xiaoQQya	63100f3b90	fix: 修复使用 postgres 数据库时通道列表查询乱序的问题	2025-04-10 14:12:53 +08:00
xiaoQQya	40a95c70e8	fix: 修复使用 postgres 数据库时设备列表查询可能乱序的问题	2025-04-10 14:11:04 +08:00
lin	b2072073a9	修复国标级联推送位置新	2025-03-20 09:56:35 +08:00
lin	ec74488b4a	修复国标级联注册失败	2025-03-20 09:21:01 +08:00
lin	ccafa0ea01	解决推流设备状态更新异常	2025-03-19 16:22:38 +08:00
lin	867d1bfb9b	支持清理异常业务分组节点，使通道可被挂载	2025-03-14 15:32:03 +08:00
lin	4dce850aea	行政区划支持异常数据补充行政区划节点以及清理异常行政区划节点使通道可被挂载	2025-03-14 14:53:47 +08:00
648540858	cbcd99da40	支持展示行政区划节点异常的通道数据	2025-03-13 23:12:39 +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
648540858	135f3054e6	[集群] 修复获取国标设备未赋值serverId的BUG	2025-01-21 17:08:21 +08:00
648540858	01f491c026	[集群] 修复同步通道时的通道上下线消息发送	2025-01-21 17:00:37 +08:00
648540858	3903bc31b5	Merge branch 'master' into dev/数据库统合	2025-01-03 15:10:23 +08:00
648540858	cb7c41c3c1	[国标级联] 优化catalog推送代码	2025-01-03 15:10:02 +08:00
648540858	0566bf916f	[集群-自动切换过国标级联] 修复BUG	2025-01-02 17:26:50 +08:00
648540858	5cd509b644	修改平台名称	2025-01-02 17:19:03 +08:00
648540858	157d0a1e71	修复平台查询sql错误	2025-01-02 16:35:45 +08:00
648540858	91b0ba4d5e	[集群-自动切换过国标级联] 启动时自动注册上级只注册本平台的上级	2025-01-02 16:30:02 +08:00
648540858	d022eb72d6	[集群-自动切换过国标级联] 添加检测wvp奔溃与重新注册	2025-01-02 16:16:50 +08:00
648540858	884fcb827f	[集群-自动切换过国标级联] 添加数据库脚本	2025-01-02 14:29:13 +08:00
648540858	317f771fa2	Merge branch 'master' into dev/数据库统合 ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/gb28181/service/IDeviceChannelService.java # web_src/src/components/DeviceList.vue	2024-12-30 16:00:58 +08:00
648540858	0dd2826b9e	优化设备订阅的操作方式	2024-12-30 15:59:15 +08:00