aunix/wvp-GB28181-pro
1
0
Fork 0
mirror of https://gitee.com/pan648540858/wvp-GB28181-pro.git synced 2026-05-19 11:57:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,159 Commits 27 Branches 1 Tag 209 MiB
3fd7b0c025
Commit Graph

443 Commits

Author SHA1 Message Date
648540858
ed67afb7a2 添加云端录像获取视频播放地址的接口 2024-01-04 18:29:34 +08:00
648540858
5f4d148353 修复云端录像查询时间错误 2024-01-04 11:09:34 +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
37fcc77c26 优化日志 2024-01-03 15:12:04 +08:00
648540858
416dae00bf 优化接口 2023-12-28 00:15:18 +08:00
648540858
5ce562aea1 优化云台控制相关接口定义 2023-12-27 18:36:14 +08:00
648540858
456ef2c5e4 临时提交 2023-12-27 15:32:43 +08:00
648540858
66f32d799d 临时提交 2023-12-27 14:28:58 +08:00
648540858
a7f1bd95df 临时提交 2023-12-26 23:46:24 +08:00
648540858
14fe1936d0 合并主线 2023-12-26 18:34:41 +08:00
648540858
da8a7d67e4 Merge branch 'wvp-28181-2.0' into 结构优化 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/gbStream/GbStreamController.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java
 2023-12-26 15:42:34 +08:00
648540858
b3eb319e05 合并主线 2023-12-26 15:39:04 +08:00
648540858
07b182da98 Merge branch 'wvp-28181-2.0' into feature/record 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java
 2023-12-26 15:38:40 +08:00
648540858
f8d2b933b1 为每个接口添加调试接口需要的描述 2023-12-26 15:30:24 +08:00
648540858
7c07ae9421 修复文档页面不可用BUG，支持设置认证消息头来方便调用其他接口 2023-12-26 15:03:00 +08:00
648540858
746cd2543d 优化设备列表查询，支持搜索。支持获取流信息 2023-12-25 17:50:37 +08:00
648540858
8b9bac5cb3 添加摄像机控制接口 2023-12-23 00:49:28 +08:00
648540858
67507e64b2 优化预置位设置 2023-12-22 18:09:17 +08:00
648540858
35fd5eee63 优化预置位查询 2023-12-21 13:16:03 +08:00
648540858
8a605ad722 临时提交 2023-12-20 18:02:47 +08:00
648540858
6d0361edf8 Merge branch 'wvp-28181-2.0' into 结构优化 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlatformChannelServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformCatalogMapper.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java
#	src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java
 2023-12-19 17:27:50 +08:00
648540858
31ab6eb174 临时提交 2023-12-19 14:39:16 +08:00
648540858
74ce2be55b 临时提交 2023-12-18 23:44:37 +08:00
648540858
67d1ff0d26 Merge branch 'wvp-28181-2.0' into feature/record 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
 2023-12-18 14:23:48 +08:00
648540858
31dcde7cc1 临时提交 2023-12-11 22:49:48 +08:00
648540858
92669f192f 临时提交 2023-12-11 21:18:53 +08:00
648540858
b7af59b2ce 修复拉流代理 2023-12-11 14:52:52 +08:00
648540858
6678ac8605 临时提交 2023-12-08 18:05:14 +08:00
648540858
dc4385da74 临时提交 2023-12-07 18:04:53 +08:00
648540858
4897d9a501 临时提交 2023-12-06 18:18:24 +08:00
648540858
92e5ed2e30 优化前端云端录像的播放 2023-12-06 16:10:32 +08:00
648540858
7e136c9ac7 完成下载文件的前后调试 2023-12-06 15:11:21 +08:00
648540858
0d3845af59 添加移除共享到上级平台的通道 2023-12-05 23:23:48 +08:00
648540858
ad36354ef4 优化国标录像服务端，使用zlm新接口实现功能 2023-12-05 11:29:05 +08:00
648540858
3d5842e9e2 查询合并文件列表增加app，stream, callId过滤参数 2023-11-28 09:30:49 +08:00
648540858
d72f57c772 支持通用通道国标类型的播放 2023-11-24 10:12:36 +08:00
648540858
cbc0ca91b1 优化区域树 2023-11-17 17:59:14 +08:00
648540858
b96c9317e8 优化区域树 2023-11-16 14:24:50 +08:00
648540858
7d064b0830 优化区域树 2023-11-15 18:04:59 +08:00
648540858
fd71a96580 优化分组树 2023-11-15 11:24:56 +08:00
648540858
bcd5ce25ca 优化分组树 2023-11-14 18:36:40 +08:00
648540858
e96b39935d 支持生成国标ID 2023-11-10 16:03:47 +08:00
648540858
fed353c645 优化分组管理 2023-11-09 18:05:30 +08:00
648540858
6fb820e49c 修复分组更新BUG 2023-11-08 18:30:41 +08:00
648540858
2f9bd859f4 修复通道查询BUG 2023-11-07 18:27:57 +08:00
xiaoQQya
f78657473e fix(报警推送): 修复报警推送功能无效的问题 
该问题原因为 com.genersoft.iot.vmp.conf.GlobalResponseAdvice 类改变了 sse 响应体的数据结构，导致前端无法正确解析 sse 数据，调试后未发现 GlobalResponseAdvice 如何修改的 sse 数据结构，故根据 sse 消息体结构自定义实现了 sse 连接
 2023-11-06 20:34:58 +08:00
648540858
887f20524f 优化分组管理 2023-11-03 17:20:00 +08:00
648540858
e5ac02ff17 增加接口 2023-11-01 09:25:49 +08:00
648540858
5ff2faa5bd 添加日志 2023-10-25 15:02:15 +08:00
648540858
79f3ca9791 优化收藏功能 2023-10-25 14:45:45 +08:00