778 Commits

Author	SHA1	Message	Date
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	45b3d9322c	增加云端录像手动删除	2025-04-14 22:54:30 +08:00
648540858	65cd397a9c	增加云端录像手动删除	2025-04-14 22:46:37 +08:00
lin	f2e3016a48	修复云端录像seek不准确的问题	2025-04-14 12:43:05 +08:00
648540858	c8822e2b86	优化云端录像播放逻辑	2025-04-13 20:14:48 +08:00
lin	eea367d6d7	增加录像seek和倍速播放接口	2025-04-12 21:24:02 +08:00
lin	9d0c8f91b9	临时提交	2025-04-10 18:00:12 +08:00
lin	aa1e497d76	临时提交	2025-04-10 17:11:31 +08:00
648540858	69f1056836	录制计划时间精确到分钟	2025-04-04 23:30:18 +08:00
lin	298fb05378	优化录像下载。 支持八倍速（设备支持的最高速度）下载	2025-03-13 16:48:15 +08:00
lin	009f1cb0f3	更新readme， 增加数据库更新脚本	2025-03-12 14:28:50 +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
南宫茜	9f9141704e	修复一个可能触发 NPE 的问题	2025-02-19 17:03:49 +08:00
lin	158fbaac9c	Merge branch 'master' into dev/数据库统合	2025-02-19 09:48:26 +08:00
JerryYan	d0d0776d4a	[BUG] 修复执行录像计划定时任务时，没有录像任务导致的java.util.ConcurrentModificationException ... 报错内容： ``` java.util.ConcurrentModificationException: null at java.util.HashMap$HashIterator.nextNode(HashMap.java:1469) at java.util.HashMap$KeyIterator.next(HashMap.java:1493) at com.genersoft.iot.vmp.service.impl.RecordPlanServiceImpl.stopStreams(RecordPlanServiceImpl.java:143) at com.genersoft.iot.vmp.service.impl.RecordPlanServiceImpl.execution(RecordPlanServiceImpl.java:92) ``` 做出的修改： 按照下面的逻辑搬上来了	2025-02-18 09:36:15 +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	ea12e3465f	修复语音对讲后停止点播失败的BUG	2025-02-11 16:06:18 +08:00
lin	3fe131eed3	修复录制计划以来全局录像配置， 目前去除依赖，目前录制计划开启录像	2025-02-11 11:08:52 +08:00
648540858	874733fa2c	[RPC 云端录像] 修复服务ID 获取	2024-12-31 15:36:48 +08:00
648540858	32e90b2537	[RPC 云端录像] 修复时长显示	2024-12-31 15:13:56 +08:00
648540858	08a75d38a8	[RPC 云端录像] 增加云端录像播放	2024-12-31 14:54:11 +08:00
648540858	a4af7eb9a1	Merge branch 'master' into dev/数据库统合	2024-12-27 17:14:48 +08:00
南宫茜	8d662769d7	修复比较符	2024-12-27 15:54:06 +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	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	696d182f6a	兼容科达国标级联语音对讲	2024-12-16 15:49:38 +08:00
648540858	ea18593125	Merge branch 'master' into dev/数据库统合	2024-12-11 15:20:31 +08:00
648540858	1b023da64f	修复录制计划取消通道关联时未及时停止通道点播	2024-12-11 15:17:17 +08:00
648540858	72da4cfa3c	Merge branch 'master' into dev/数据库统合 ... # Conflicts: # README.md	2024-12-09 15:47:15 +08:00
648540858	5777a8e93c	去除动态数据库切换	2024-12-06 17:11:22 +08:00
648540858	4b2d819ba2	[录制计划] 完善和优化录制计划执行	2024-11-29 15:38:55 +08:00
648540858	8a06562a88	[录制计划] 增加录制计划执行	2024-11-28 18:00:52 +08:00
648540858	21cf05861b	[录制计划] 修复计划选择与回显	2024-11-28 10:15:03 +08:00
648540858	cc56ed3355	临时提交	2024-11-27 22:44:22 +08:00
648540858	24c3c45565	[录制计划] 修复关联通道	2024-11-27 17:59:54 +08:00
648540858	d3f53db160	Merge branch 'master' into dev/录制计划	2024-11-27 14:20:59 +08:00
648540858	f625fb6aed	修复大华对讲talk模式	2024-11-27 10:11:49 +08:00
648540858	1567f2e3e7	增加通道关联以及录制计划接口完善	2024-11-21 23:20:56 +08:00
648540858	4b694954d4	临时提交	2024-11-21 20:50:22 +08:00
648540858	0cacdb5928	增加数据库结构以及接口	2024-11-20 22:33:21 +08:00
648540858	6e8a3f6adf	修复sql模糊查询中含有特殊符号时查询不准备的BUG	2024-11-14 14:08:05 +08:00
648540858	f106675dc6	支持历史日志的查看，过滤以及下载	2024-11-03 14:37:30 +08:00
648540858	711fefa168	去除不常用的日志文件打印	2024-11-03 07:38:42 +08:00
648540858	a6993b35fd	实现日志文件检索和日志文件下载接口	2024-11-03 00:32:39 +08:00
648540858	396961ea20	策略配置文件增加注释与使用Lombok	2024-10-30 15:19:17 +08:00
648540858	98b4566c6c	移除操作日志记录到数据库功能	2024-10-29 16:56:14 +08:00