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
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
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
20135726eb
Merge branch 'master' into 重构/1078
2025-03-24 15:19:07 +08:00
lin
ec74488b4a
修复国标级联注册失败
2025-03-20 09:21:01 +08:00
lin
ccafa0ea01
解决推流设备状态更新异常
2025-03-19 16:22:38 +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
lin
676e2d7ea9
message消息适配新的回调模式
2025-02-18 17:04:13 +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
3da6444baa
调整设备控制相关的接口
2025-02-13 15:15:36 +08:00
lin
9618f23af8
修复message和sip消息超时未回复的判断机制
2025-02-12 20:54:20 +08:00
lin
5808c7aff5
[集群] 重构message消息接受返回值的方式
2025-02-12 17:20:12 +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
