lin
826b251544
修复上报的坐标未按照坐标系转换的BUG
2025-11-05 11:34:59 +08:00
lin
08206ca824
优化地图信息窗口逻辑，修复拉流代理播放
2025-10-27 19:02:57 +08:00
lin
2de4932f1e
支持云端录像打包下载
2025-10-23 17:44:49 +08:00
lin
61c64589b2
临时提交
2025-09-30 23:17:40 +08:00
lin
77594dae3d
支持从第三方同步分组信息
2025-09-27 21:03:20 +08:00
lin
8d6fe0c9d8
优化地图展示流程，已经默认统一坐标为wgs84
2025-09-25 18:06:58 +08:00
lin
6469aefe22
支持从第三方读取地图配置
2025-09-25 15:27:30 +08:00
lin
0ed37d58ec
完善录像回放播放器切换
2025-09-23 18:04:30 +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
fb9ff67701
支持ABL录像回放
2025-09-17 18:19:33 +08:00
lin
403e7648f9
优化ABL结果封装完成
2025-09-16 17:57:59 +08:00
lin
4c97022c78
[1078] 支持语音对讲 中心广播模式
2025-07-28 17:50:03 +08:00
lin
44ed06bcbe
[1078] 支持无人观看自动停流
2025-07-15 18:11:23 +08:00
lin
48eff320fd
[1078] 适配abl的播放1078
2025-07-09 12:32:31 +08:00
lin
d15307533a
Merge branch 'master' into 重构/1078
...
# Conflicts:
# src/main/resources/application.yml
2025-06-03 17:21:21 +08:00
lin
111274c08a
修复通道共享状态过滤， 优化发流端口获取， 避免递归过多异常
2025-06-03 10:36:29 +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
lin
e2678f39e3
临时提交
2025-04-25 18:04:51 +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
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
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
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
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
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
