648540858
|
a412f9c2d4
|
支持国标级联录像下载
|
2024-01-30 20:46:47 +08:00 |
|
648540858
|
02c0a45f11
|
支持国标级联录像播放
|
2024-01-30 19:14:05 +08:00 |
|
648540858
|
18214b8b82
|
支持国标级联录像查询
|
2024-01-30 18:13:35 +08:00 |
|
648540858
|
398e0930ae
|
catqlog查询支持回复平台信息
|
2024-01-30 00:00:49 +08:00 |
|
648540858
|
8402edaf01
|
支持国标级联报警复位， 布防撤防，录像控制，强制关键帧，设备重启，拉框放大缩小， 看守位控制
|
2024-01-29 23:37:47 +08:00 |
|
648540858
|
0688bb91d2
|
临时提交
|
2024-01-29 20:48:19 +08:00 |
|
648540858
|
70f3f3b431
|
临时提交
|
2024-01-29 18:57:12 +08:00 |
|
648540858
|
b17eea547a
|
支持国标级联云台控制
|
2024-01-29 17:19:38 +08:00 |
|
648540858
|
565acaefb5
|
临时提交
|
2024-01-29 12:32:35 +08:00 |
|
648540858
|
367acdaf97
|
支持国标控制命令解析
|
2024-01-28 00:41:24 +08:00 |
|
648540858
|
8892975d77
|
临时提交
|
2024-01-26 18:03:58 +08:00 |
|
648540858
|
993773860e
|
优化sedRTP的管理
|
2024-01-25 23:39:18 +08:00 |
|
648540858
|
dfb1b701d5
|
优化sendRtp管理
|
2024-01-25 19:58:59 +08:00 |
|
648540858
|
932eff1d73
|
修复国标级联点播
|
2024-01-25 18:18:42 +08:00 |
|
648540858
|
407828e880
|
优化国标级联接口
|
2024-01-23 16:20:36 +08:00 |
|
648540858
|
1411de77fe
|
临时提交
|
2024-01-23 09:56:05 +08:00 |
|
648540858
|
b4358a6dbe
|
临时提交
|
2024-01-22 15:01:56 +08:00 |
|
648540858
|
e9fce889ba
|
Merge branch 'wvp-28181-2.0' into 结构优化
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/RecordInfoQueryMessageHandler.java
# src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java
# src/main/resources/all-application.yml
# src/main/resources/application-dev.yml
# src/main/resources/application-docker.yml
|
2024-01-22 12:12:36 +08:00 |
|
648540858
|
5a3b1c04d6
|
补充日志
|
2024-01-22 12:09:04 +08:00 |
|
648540858
|
46af350868
|
优化多节点国标级联国标录像查询
|
2024-01-21 22:38:50 +08:00 |
|
648540858
|
31df0fb3ff
|
修复级联点播时tcp模式信令回复的错误
|
2024-01-21 16:56:13 +08:00 |
|
648540858
|
d9d8aaca6e
|
拉流代理优化未完成
|
2024-01-21 15:19:31 +08:00 |
|
648540858
|
782e8b9800
|
修复sendRtpItem写入不及时导致的发流失败
|
2024-01-19 15:43:08 +08:00 |
|
648540858
|
f0e9c85c85
|
修复拉流代理
|
2024-01-18 18:19:26 +08:00 |
|
648540858
|
bd52096884
|
Merge branch 'wvp-28181-2.0' into 结构优化
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
|
2024-01-18 14:55:13 +08:00 |
|
648540858
|
ebc65b40d3
|
添加收到invite消息后的日志，减少国标级联推送代理流的等待时间
|
2024-01-18 14:54:03 +08:00 |
|
648540858
|
1538ad358d
|
Merge branch 'wvp-28181-2.0' into 结构优化
|
2024-01-18 10:17:21 +08:00 |
|
648540858
|
7f79b92568
|
修复设备在事务内注销失败的问题
|
2024-01-18 10:17:03 +08:00 |
|
648540858
|
f38d561e60
|
支持通用通道播放
|
2024-01-17 18:05:39 +08:00 |
|
648540858
|
9c3eb1493d
|
合并主线
|
2024-01-16 14:56:22 +08:00 |
|
648540858
|
2a4a0d36f2
|
Merge branch 'wvp-28181-2.0' into 结构优化
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/service/impl/GbStreamServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlatformChannelServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java
# src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformGbStreamMapper.java
# src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/gbStream/GbStreamController.java
|
2024-01-16 14:53:26 +08:00 |
|
648540858
|
88721511e7
|
Merge branch '2.6.9' into wvp-28181-2.0
|
2024-01-16 14:51:17 +08:00 |
|
648540858
|
13e2a96dae
|
添加删除通道时通知的日志
|
2024-01-15 15:39:28 +08:00 |
|
648540858
|
0371f5a96e
|
修复国标级联全部添加与全部删除
|
2024-01-15 15:31:20 +08:00 |
|
648540858
|
1d28869fd3
|
优化拉流代理接口哦i
|
2024-01-12 18:26:14 +08:00 |
|
648540858
|
d287ff7763
|
Merge branch 'wvp-28181-2.0' into 结构优化
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/event/subscribe/catalog/CatalogEventLister.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
|
2024-01-12 14:20:01 +08:00 |
|
648540858
|
e5a9dd24ef
|
Merge branch '2.6.9' into wvp-28181-2.0
|
2024-01-12 14:17:01 +08:00 |
|
648540858
|
2b2efb59a6
|
修复多个推流推送到上级是不完整的问题，修改平台注销时不删除自己模拟的订阅信息
|
2024-01-11 14:56:11 +08:00 |
|
648540858
|
731a7e32c2
|
Merge branch 'wvp-28181-2.0' into 结构优化
|
2024-01-10 16:18:15 +08:00 |
|
648540858
|
64be28ed77
|
Merge branch '2.6.9' into wvp-28181-2.0
|
2024-01-10 16:17:53 +08:00 |
|
648540858
|
c25a99d60b
|
修复空指针异常
|
2024-01-10 16:17:29 +08:00 |
|
648540858
|
0c10c77a56
|
优化录像路径的设置
|
2024-01-10 11:14:49 +08:00 |
|
648540858
|
9b1c6c46a8
|
Merge branch 'wvp-28181-2.0' into 结构优化
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestForCatalogProcessor.java
|
2024-01-08 16:21:39 +08:00 |
|
648540858
|
b15e559eae
|
Merge branch '2.6.9' into wvp-28181-2.0
|
2024-01-08 16:18:28 +08:00 |
|
648540858
|
a74fb6ecd6
|
优化目录订阅处理，保证存储异常时不影响后续操作
|
2024-01-08 15:03:07 +08:00 |
|
648540858
|
d2e7f247a6
|
Merge branch 'wvp-28181-2.0' into 结构优化
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/service/impl/GbStreamServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformGbStreamMapper.java
|
2024-01-04 18:35:32 +08:00 |
|
648540858
|
a2cac5ca12
|
Merge branch '2.6.9' into wvp-28181-2.0
# Conflicts:
# pom.xml
|
2024-01-04 18:34:46 +08:00 |
|
648540858
|
6120e6bd7b
|
添加金仓数据库x86驱动，优化兼容接口通道列表查询。修复多个通道同时推送
|
2024-01-04 17:26:47 +08:00 |
|
648540858
|
b4fb076246
|
Merge branch 'wvp-28181-2.0' into 结构优化
# Conflicts:
# sql/2.6.9更新.sql
# src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
# src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
# src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java
# src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java
# 数据库/old/common.sql
|
2024-01-03 15:35:21 +08:00 |
|
648540858
|
416dae00bf
|
优化接口
|
2023-12-28 00:15:18 +08:00 |
|