1371 Commits

Author	SHA1	Message	Date
lin	e0f9c93b0f	修复方法名错别字	2025-03-12 15:02:32 +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	60d2ed10ec	[SIP事务] 修复无法根据流信息移除的事务	2025-03-06 16:03:28 +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	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
648540858	c5eca3ca0e	修复sip消息订阅事件移除失败的BUG	2025-02-12 22:55:51 +08:00
lin	b7d0eb793d	去除多余注释	2025-02-12 20:58:58 +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
648540858	0cde02c397	[集群] 修复语音对讲支持	2025-01-21 17:45:48 +08:00
648540858	ba27819874	[集群] 增加语音对讲支持	2025-01-21 17:35:21 +08:00
648540858	135f3054e6	[集群] 修复获取国标设备未赋值serverId的BUG	2025-01-21 17:08:21 +08:00
648540858	4e66e2bc6d	[集群] 增加通道刷新状态消息	2025-01-21 17:04:51 +08:00
648540858	01f491c026	[集群] 修复同步通道时的通道上下线消息发送	2025-01-21 17:00:37 +08:00
648540858	3bae4ce63e	Merge branch 'master' into dev/数据库统合 ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/streamProxy/service/impl/StreamProxyPlayServiceImpl.java	2025-01-17 10:53:08 +08:00
648540858	464c989986	国标收流时流传输模式默认使用TCP被动	2025-01-12 22:24:47 +08:00
648540858	5480e68b86	Merge pull request #1747 from QianNangong/master ... 修复上级点播国标级联的拉流代理相机，当流上线很慢时，收到来自上级的 ACK 早于流注册导致推流失败的问题	2025-01-11 20:32:40 +08:00
648540858	8ff68b2291	Merge branch 'master' into dev/数据库统合	2025-01-06 09:35:04 +08:00
648540858	812760efc3	增加日志	2025-01-06 09:34:32 +08:00
Li Keqing	469717523b	修复当拉流代理上线很慢时，收到来自上级的 ACK 早于流注册导致推流失败的问题	2025-01-03 19:32:49 +08:00
648540858	63fbafe687	[集群] 支持通道刷新	2025-01-03 17:52:38 +08:00
648540858	a2e7cd0323	[集群] 修复catalog 递归循环BUG	2025-01-03 17:34:30 +08:00
648540858	85427497bf	Merge branch 'master' into dev/数据库统合	2025-01-03 17:27:25 +08:00
648540858	5cf5c506b1	优化SIP消息回复判定条件，修复目录推送BUG #1725	2025-01-03 17:21:09 +08:00
648540858	a9a4c7a4e5	[集群] 修复BUG	2025-01-03 16:34:11 +08:00
648540858	42322c75cc	[集群] 优化国标级联目录更新	2025-01-03 16:21:20 +08:00
648540858	232fa760e2	[集群] 支持国标级联目录更新	2025-01-03 15:34:53 +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	b0b3f32e03	[集群] 支持国标级联更新	2025-01-02 18:34:22 +08:00
648540858	7fb07848ab	[集群-自动切换过国标级联] 修复BUG	2025-01-02 17:33:10 +08:00
648540858	347b2a6a4c	[集群-自动切换过国标级联] 修复BUG	2025-01-02 17:32:27 +08:00
648540858	0566bf916f	[集群-自动切换过国标级联] 修复BUG	2025-01-02 17:26:50 +08:00