lin
|
b13207db92
|
临时提交
|
2025-10-10 17:08:32 +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
|
842647674a
|
升级spring boot版本。默认jdk版本升级至21
|
2025-09-24 10:24:42 +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
|
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
|
27c7969b8f
|
更新README
|
2025-09-12 10:35:24 +08:00 |
|
lin
|
6f577268ee
|
适配新版本zlm限流配置
|
2025-08-15 09:50:45 +08:00 |
|
lin
|
efbd302260
|
Merge branch 'master' into 重构/1078
|
2025-08-01 19:00:13 +08:00 |
|
lin
|
09f1ef20a7
|
通用通道支持录像回放以及录像控制
|
2025-08-01 18:59:15 +08:00 |
|
lin
|
e272d25939
|
[1078] 适配新结构接入通用通道支持云台控制
|
2025-08-01 14:39:33 +08:00 |
|
lin
|
2ee9a3fa71
|
[1078] 适配新结构接入通用通道
|
2025-07-31 21:21:31 +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
|
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
|
1bfb51c90e
|
Merge branch 'dev/abl支持' into 重构/1078
# Conflicts:
# src/main/resources/application.yml
|
2025-07-03 15:29:13 +08:00 |
|
lin
|
bab5534134
|
Merge branch 'master' into dev/abl支持
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/MediaStatusNotifyMessageHandler.java
# src/main/java/com/genersoft/iot/vmp/media/bean/MediaInfo.java
# src/main/java/com/genersoft/iot/vmp/media/bean/MediaServer.java
# src/main/java/com/genersoft/iot/vmp/media/bean/RecordInfo.java
# src/main/java/com/genersoft/iot/vmp/service/bean/CloudRecordItem.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java
# src/main/resources/application.yml
|
2025-07-03 14:58:24 +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 |
|
lin
|
f8e5e8f057
|
优化拉流代理播放机制
|
2025-07-01 17:07:10 +08:00 |
|
Jerry Yan
|
14c85838f4
|
springboot3
|
2025-06-11 10:08:03 +08:00 |
|
lin
|
d15307533a
|
Merge branch 'master' into 重构/1078
# Conflicts:
# src/main/resources/application.yml
|
2025-06-03 17:21:21 +08:00 |
|
lin
|
f4bbca78e5
|
优化通道变化消息发送以及增加设备状态丢失检测
|
2025-06-03 16:52:42 +08:00 |
|
lin
|
111274c08a
|
修复通道共享状态过滤， 优化发流端口获取， 避免递归过多异常
|
2025-06-03 10:36:29 +08:00 |
|
lin
|
1420fcfcd0
|
Merge branch 'master' into 重构/1078
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/service/bean/InviteErrorCode.java
# src/main/resources/application.yml
|
2025-05-29 17:10:32 +08:00 |
|
648540858
|
a40446e42b
|
临时提交
|
2025-05-27 23:19:10 +08:00 |
|
lin
|
0c29c90d3b
|
Merge branch 'master' into 重构/1078
|
2025-05-26 15:07:58 +08:00 |
|
lin
|
75b1e8deb2
|
Merge branch '2.7.3'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/event/subscribe/catalog/CatalogEventLister.java
|
2025-05-23 18:18:32 +08:00 |
|
lin
|
601d2b5d2b
|
修复集群推流BUG
|
2025-05-23 18:06:54 +08:00 |
|
lin
|
55f36f660b
|
修复集群播放BUG
|
2025-05-23 17:26:17 +08:00 |
|
648540858
|
7c7ef34045
|
Merge branch '2.7.3'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeHolder.java
# src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPSender.java
|
2025-05-22 21:09:22 +08:00 |
|
lin
|
243f7f62b7
|
国标级联调整心跳逻辑
|
2025-05-22 17:40:10 +08:00 |
|
lin
|
29ac4850f4
|
去除移除订阅时设置订阅周期
|
2025-05-21 18:06:07 +08:00 |
|
lin
|
dd17462b68
|
重构设备订阅保活和更新机制
|
2025-05-21 14:57:10 +08:00 |
|
lin
|
43916f27d7
|
Merge branch '2.7.3'
|
2025-05-19 14:39:01 +08:00 |
|
lin
|
c19fae68a3
|
升级fastjson版本以解决json序列化BUG
|
2025-05-19 11:26:58 +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 |
|