150 Commits

Author	SHA1	Message	Date
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
648540858	7751eae913	Merge branch 'master' into dev/数据库统合	2024-12-27 15:31:27 +08:00
Li Keqing	dade2854b1	修复级联状态推成 0 和 1 而不是 ON 和 OFF 的问题	2024-12-27 15:18:56 +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	ce73b6feb1	修复清理通道错误	2024-12-27 09:53:27 +08:00
648540858	28961f51f7	完善数据库结构调用	2024-12-23 23:49:54 +08:00
648540858	f5ae9718d4	临时提交	2024-12-23 18:39:54 +08:00
648540858	59e3175f00	调整代码对通道类型的调用	2024-12-23 18:37:24 +08:00
648540858	9d96658696	支持国标级联点播其他wvp的国标设备	2024-12-12 10:15:04 +08:00
648540858	1c76f7bfea	Merge branch 'master' into dev/数据库统合	2024-12-11 14:10:13 +08:00
648540858	69a32f4519	修复批量设置子码流类型	2024-12-11 11:43:41 +08:00
648540858	e62d106a1f	临时提交	2024-12-11 09:56:09 +08:00
648540858	4b2d819ba2	[录制计划] 完善和优化录制计划执行	2024-11-29 15:38:55 +08:00
648540858	8a06562a88	[录制计划] 增加录制计划执行	2024-11-28 18:00:52 +08:00
648540858	24c3c45565	[录制计划] 修复关联通道	2024-11-27 17:59:54 +08:00
648540858	1567f2e3e7	增加通道关联以及录制计划接口完善	2024-11-21 23:20:56 +08:00
648540858	0cacdb5928	增加数据库结构以及接口	2024-11-20 22:33:21 +08:00
648540858	2dcbee74b0	新增添加录制计划接口	2024-11-20 18:37:39 +08:00
648540858	ea2751e29b	添加录制计划的页面与通道查询接口	2024-11-19 16:42:11 +08:00
648540858	3c814f33a5	修复Notify消息中的状态更新	2024-11-15 10:56:16 +08:00
648540858	6e8a3f6adf	修复sql模糊查询中含有特殊符号时查询不准备的BUG	2024-11-14 14:08:05 +08:00
648540858	86879aa58d	临时提交	2024-11-14 09:59:16 +08:00
648540858	dbe4c80896	修复设备编辑无法清理收流IP的BUG	2024-11-07 20:33:02 +08:00
648540858	35e3ec5c54	优化通道管理/业务分组页面逻辑	2024-11-07 13:28:46 +08:00
648540858	9a29f44c86	优化通道管理/行政区划页面逻辑	2024-11-05 18:23:58 +08:00
648540858	dc3e99fe57	合并 #1626 的修改	2024-10-30 16:11:31 +08:00
648540858	4f12ad6236	设备列表支持按照IP检索	2024-10-29 16:17:17 +08:00
648540858	fee8d2f8cd	优化Catalog查询内存占用高的问题	2024-10-26 23:15:18 +08:00
648540858	059635c2cc	修复国标点播缓存启动未清理的BUG	2024-10-25 17:41:50 +08:00