267 Commits

Author	SHA1	Message	Date
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	7bb0cc19f4	重构平台保活逻辑-启动对未离线的平台注销	2025-05-22 07:09:20 +08:00
648540858	1d172cb387	重构平台保活逻辑-启动对未离线的平台注销	2025-05-22 07:02:10 +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	198db8f684	修复分屏监控地址不一致	2025-05-12 09:00:36 +08:00
648540858	9903f25cc1	强化消息发送失败的处理	2025-05-11 22:00:33 +08:00
lin	40b6580611	修复同步通道为空时, 更新通道异常	2025-05-07 15:10:38 +08:00
lin	b159775b0e	去除重复执行代码	2025-04-29 17:27:44 +08:00
lin	fe02fdcc02	修复单通道设备编号一致时的判断	2025-04-27 10:17:16 +08:00
lin	e2678f39e3	临时提交	2025-04-25 18:04:51 +08:00
lin	4dd5864cf1	Merge branch 'master' into dev/前端页面修改	2025-04-24 08:43:41 +08:00
lin	a433003f74	增加异常处理	2025-04-22 11:24:20 +08:00
lin	eea367d6d7	增加录像seek和倍速播放接口	2025-04-12 21:24:02 +08:00
lin	aa1e497d76	临时提交	2025-04-10 17:11:31 +08:00
lin	481609ef72	修复录制计划开启录像失败的BUG	2025-04-09 16:48:50 +08:00
lin	b2072073a9	修复国标级联推送位置新	2025-03-20 09:56:35 +08:00
lin	ec74488b4a	修复国标级联注册失败	2025-03-20 09:21:01 +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	298fb05378	优化录像下载。 支持八倍速（设备支持的最高速度）下载	2025-03-13 16:48:15 +08:00
lin	5539f52d13	判断设备离线时发送状态查询确定设备真实状态，确定离线再设置为离线	2025-03-13 11:23:49 +08:00
lin	108cdf1a13	调整分屏页面全屏按钮位置	2025-03-13 10:35:25 +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	c0aec7562b	[国标级联] 调整云台控制调用逻辑	2025-03-05 17:20:55 +08:00
lin	1bed3dc5e0	增加日志	2025-02-19 11:07:09 +08:00
lin	158fbaac9c	Merge branch 'master' into dev/数据库统合	2025-02-19 09:48:26 +08:00
648540858	0de1ee8c19	Merge pull request #1772 from guobi777/master ... fix: 新增更新分组时校验节点编码唯一性	2025-02-19 09:47:54 +08:00
guo	e8c65bed62	fix: 新增更新分组时校验节点编码唯一性	2025-02-19 09:19:14 +08:00
lin	676e2d7ea9	message消息适配新的回调模式	2025-02-18 17:04:13 +08:00
lin	3da6444baa	调整设备控制相关的接口	2025-02-13 15:15:36 +08:00
lin	9618f23af8	修复message和sip消息超时未回复的判断机制	2025-02-12 20:54:20 +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
lin	3fe131eed3	修复录制计划以来全局录像配置， 目前去除依赖，目前录制计划开启录像	2025-02-11 11:08:52 +08:00
lin	c38c4e3979	[集群] 增加强制关键帧/看守位控制/拉框放大缩小/设备状态查询	2025-02-08 20:52:46 +08:00
lin	71390a7b51	[集群] 增加远程重启/录像控制/布防（或撤防）/重置报警， 增加关闭推流接口	2025-02-08 17:29:31 +08:00
lin	8ca982485c	[集群] 增加设备基本配置和设备配置查询	2025-02-08 10:45:47 +08:00