614 Commits

Author	SHA1	Message	Date
lin	d76d0483e3	增加图标信息	2025-10-28 16:26:15 +08:00
lin	2de4932f1e	支持云端录像打包下载	2025-10-23 17:44:49 +08:00
lin	24c7bfb756	临时提交	2025-10-22 10:55:15 +08:00
lin	29099cbaa4	临时提交	2025-10-11 21:37:41 +08:00
648540858	d4da1dc91c	支持点播、停止点播和云台控制	2025-10-07 10:56:18 +08:00
lin	eff1773101	定义第三方接口信息	2025-09-29 16:15:32 +08:00
lin	6469aefe22	支持从第三方读取地图配置	2025-09-25 15:27:30 +08:00
lin	1156880194	Merge branch 'master' into dev/springBoot3 ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/gb28181/controller/MediaController.java # src/main/java/com/genersoft/iot/vmp/jt1078/config/JT1078Controller.java	2025-09-24 08:38:29 +08:00
lin	ff0d54968d	zlm适配新的云端录像播放界面	2025-09-19 22:55:44 +08:00
lin	fd306d8ede	云端录像回放使用单文件播放	2025-09-19 18:02:53 +08:00
lin	a064f27bf8	支持ABL风格地址	2025-09-18 18:53:12 +08:00
lin	333965255f	Merge branch 'master' into 重构/1078 ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/common/enums/ChannelDataType.java # src/main/java/com/genersoft/iot/vmp/gb28181/service/IGbChannelPlayService.java # src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelPlayServiceImpl.java	2025-07-31 21:14:23 +08:00
lin	19b873ba5c	通用通道支持云台控制	2025-07-31 18:49:53 +08:00
lin	edeb8d6b3f	临时提交	2025-07-30 18:02:49 +08:00
lin	537d86ca89	[1078] 合并主线	2025-07-03 14:54:29 +08:00
lin	465e03d15d	Merge branch 'master' into 重构/1078 ... # Conflicts: # web/src/router/index.js # web/src/views/common/channelPlayer/chooseChannelForJt.vue # web/src/views/common/channelPlayer/jtDeviceEdit.vue # web/src/views/common/channelPlayer/jtDevicePlayer.vue # web_src/src/layout/UiHeader.vue # web_src/src/main.js # web_src/src/router/index.js	2025-07-03 09:41:55 +08:00
648540858	196ecad3a3	Merge pull request #1889 from q792602257/boot3 ... 升级至SpringBoot3	2025-06-13 09:28:20 +08:00
lin	b1da948513	修复录制计划查询方法名	2025-06-11 17:25:03 +08:00
Jerry Yan	14c85838f4	springboot3	2025-06-11 10:08:03 +08:00
648540858	3b7ba3eb46	Merge branch 'master' into dev/1078-newUI ... # Conflicts: # src/main/resources/application.yml	2025-05-10 08:59:45 +08:00
648540858	e22d96cfb7	调整文档指向地址	2025-05-10 08:01:08 +08:00
lin	4ad9f83ee9	登录后用户信息增加服务ID	2025-04-23 20:36:28 +08:00
lin	3b4a6018cb	修复云端录像seek问题	2025-04-16 18:07:04 +08:00
lin	1a9307003a	Merge remote-tracking branch 'origin/dev/前端页面修改' into dev/前端页面修改	2025-04-15 09:03:24 +08:00
648540858	65cd397a9c	增加云端录像手动删除	2025-04-14 22:46:37 +08:00
lin	f2e3016a48	修复云端录像seek不准确的问题	2025-04-14 12:43:05 +08:00
648540858	add88ec6b8	增加关闭服务接口以及在linux上安装为服务的脚本	2025-04-13 21:38:51 +08:00
648540858	c8822e2b86	优化云端录像播放逻辑	2025-04-13 20:14:48 +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	0329c8f5d1	Merge remote-tracking branch 'origin/master' into 重构/1078 ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/gb28181/dao/CommonGBChannelMapper.java # src/main/java/com/genersoft/iot/vmp/gb28181/dao/PlatformChannelMapper.java # src/main/java/com/genersoft/iot/vmp/gb28181/dao/provider/ChannelProvider.java # src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceChannelServiceImpl.java # 数据库/2.7.3/初始化-mysql-2.7.3.sql # 数据库/2.7.3/初始化-postgresql-kingbase-2.7.3.sql	2025-03-18 15:30:35 +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	171702e4ce	[接口文档] 补充缺少的登录信息描述	2025-03-11 09:46:33 +08:00
648540858	a8ad586204	临时提交	2024-12-31 15:58:53 +08:00
648540858	fe991f990d	临时提交	2024-12-31 15:46:32 +08:00
648540858	32e90b2537	[RPC 云端录像] 修复时长显示	2024-12-31 15:13: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	28961f51f7	完善数据库结构调用	2024-12-23 23:49:54 +08:00
648540858	51f126e571	Merge branch 'master' into 重构/1078 ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java # 数据库/2.7.3/初始化-mysql-2.7.3.sql # 数据库/2.7.3/初始化-postgresql-kingbase-2.7.3.sql	2024-12-19 23:19:09 +08:00
648540858	3e78af64de	增加RPC录像列表查询	2024-12-13 15:02:06 +08:00
648540858	f528735119	Merge branch 'master' into 重构/1078	2024-12-05 11:05:44 +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	2060a2117c	优化编码信息的展示	2024-11-14 17:05:12 +08:00
648540858	34e8ed70c7	优化zlm接入逻辑	2024-11-14 12:31:35 +08:00
648540858	e5fd66ef96	Merge branch 'master' into 重构/1078 ... # Conflicts: # pom.xml # src/main/java/com/genersoft/iot/vmp/conf/SpringDocConfig.java # src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceChannelServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java	2024-11-10 15:29:53 +08:00