1327 Commits

Author	SHA1	Message	Date
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
648540858	ea2ef923ac	增加日志	2025-01-02 17:20:16 +08:00
648540858	5cd509b644	修改平台名称	2025-01-02 17:19:03 +08:00
648540858	5db9033372	[集群-自动切换过国标级联] 修复BUG	2025-01-02 17:07:38 +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	af04669d49	Merge branch 'master' into dev/数据库统合	2025-01-02 14:46:16 +08:00
648540858	b37c0e264c	修复 #1743	2025-01-02 14:45:45 +08:00
648540858	884fcb827f	[集群-自动切换过国标级联] 添加数据库脚本	2025-01-02 14:29:13 +08:00
claire	d7ebe93337	增加光圈速度范围判断	2025-01-02 14:20:04 +08:00
claire	daeb48f62a	修复设备云台控制关于速度的错误描述，水平垂直控制速度为00H~FFH(0-255),变倍控制速度为0H~FH(0-15)，聚焦速度为00H~FFH(0-255),光圈速度为00H~FFH(0-255)	2025-01-02 14:16:44 +08:00
648540858	c2eecc43e7	Merge branch 'master' into dev/数据库统合	2024-12-31 16:16:33 +08:00
648540858	3367b70c61	增加日志	2024-12-31 16:15:43 +08:00
648540858	0cebbee0a9	[RPC] 增加订阅支持	2024-12-30 16:19:14 +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	45337311ec	[国标PTZ] 添加调用其他wvp的云台控制	2024-12-30 10:27:49 +08:00
648540858	115b41e001	[国标PTZ] 添加调用其他wvp的云台控制	2024-12-27 17:53:25 +08:00
648540858	45862480aa	Merge branch 'master' into dev/数据库统合	2024-12-27 17:38:07 +08:00
648540858	058909197e	[国标PTZ] 调整云台控制调用	2024-12-27 17:37:50 +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	a5f1422466	[WVP集群] 合并主线	2024-12-27 11:18:29 +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	081bb6de18	完善通道数据类型的保存与展示	2024-12-24 23:35:01 +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	19453f7ca9	临时提交	2024-12-23 07:20:48 +08:00
648540858	1b9799eb1f	Merge branch 'master' into dev/数据库统合	2024-12-20 10:24:53 +08:00
648540858	4757cbd34e	调整MediaStatus内容	2024-12-19 23:14:45 +08:00
Li Keqing	a43a98e185	回复正确的 MediaStatus 内容	2024-12-19 09:24:09 +08:00
648540858	0ff4d04698	Merge branch 'master' into dev/数据库统合2	2024-12-18 15:05:23 +08:00
648540858	03033e6ac9	添加异常处理	2024-12-18 11:30:07 +08:00
648540858	b78e6dfd70	Merge branch 'master' into dev/数据库统合	2024-12-16 17:55:46 +08:00
648540858	90e5c35975	修复创建SIP回复时使用了错误的状态码	2024-12-16 17:00:44 +08:00
648540858	696d182f6a	兼容科达国标级联语音对讲	2024-12-16 15:49:38 +08:00
648540858	7e21b6adb7	修复RPC录像下载停止	2024-12-13 17:56:23 +08:00
648540858	26d2dd0450	修复RPC录像下载停止	2024-12-13 17:52:33 +08:00
648540858	3b4818c579	调整停止录像下载	2024-12-13 17:41:02 +08:00
648540858	e16ca179a6	新增RPC录像回放暂停和恢复	2024-12-13 17:28:38 +08:00
648540858	6c5535ef1e	添加遗漏的数据返回	2024-12-13 15:21:21 +08:00
648540858	eb8d69d50b	添加遗漏的错误返回	2024-12-13 15:20:53 +08:00