648540858
|
14174ff400
|
Merge branch 'wvp-28181-2.0' into wvp-pro-record
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookSubscribe.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
|
2022-03-03 16:28:32 +08:00 |
|
648540858
|
2eb1ca2d94
|
国标录像支持多端同时播放
|
2022-03-03 15:57:28 +08:00 |
|
648540858
|
1dcdbc3742
|
Merge branch 'wvp-28181-2.0' into wvp-pro-record
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
|
2022-03-02 12:52:37 +08:00 |
|
648540858
|
f5640fddb7
|
优化国标级联的目录订阅
|
2022-03-02 11:48:20 +08:00 |
|
648540858
|
29191373aa
|
Merge branch 'wvp-28181-2.0' into wvp-pro-record
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java
# web_src/src/components/control.vue
|
2022-03-01 22:07:01 +08:00 |
|
648540858
|
4c53b10737
|
解决对接中遇到的问题
|
2022-03-01 17:42:22 +08:00 |
|
648540858
|
9c5b1060af
|
支持删除在线设备
|
2022-02-28 17:56:27 +08:00 |
|
648540858
|
10f776678e
|
Merge branch 'wvp-28181-2.0' into wvp-pro-record
|
2022-02-25 20:33:38 +08:00 |
|
648540858
|
7400ace65d
|
规范数据库,解决bug
|
2022-02-25 20:33:02 +08:00 |
|
648540858
|
0191e93768
|
同步主线
|
2022-02-23 21:55:46 +08:00 |
|
648540858
|
2157bb0270
|
规范数据库,给各个标设置主键ID
|
2022-02-22 11:44:56 +08:00 |
|
648540858
|
9442c37ce7
|
优化级联添加通道流程
|
2022-02-15 17:41:09 +08:00 |
|
朱俊杰
|
37a84e6691
|
新增实时监控功能
左边是设备通道树,右边是分屏预览
|
2022-02-10 14:45:33 +08:00 |
|
648540858
|
646419e4ad
|
#247
|
2022-01-28 16:45:12 +08:00 |
|
648540858
|
abc65c6317
|
优化目录移除时默认目录的选择
|
2022-01-25 17:14:10 +08:00 |
|
648540858
|
46cf650a86
|
优化通道选择是通道的查询
|
2022-01-21 18:00:15 +08:00 |
|
648540858
|
3f5e885e82
|
目录默认节点被删除时,重置默认节点为根节点
|
2022-01-21 14:10:49 +08:00 |
|
648540858
|
e8090bc84c
|
修复bug与目录订阅添加最小值60
|
2022-01-19 10:23:52 +08:00 |
|
648540858
|
fa346513db
|
优化级联选择通道页面添加方式
|
2022-01-17 16:46:28 +08:00 |
|
648540858
|
385fdb95f1
|
优化级联选择通道逻辑
|
2022-01-17 15:48:08 +08:00 |
|
648540858
|
29d69267f9
|
优化通道选择页面样式和优化拉框放大与缩小的接口路径
|
2022-01-17 10:16:58 +08:00 |
|
szy833
|
c6202b3b27
|
feat(): 增加拉框放大,缩小。接收下级设备控制信令增加200返回。
|
2022-01-15 22:29:59 +08:00 |
|
648540858
|
ac1a4a027a
|
支持国标级联的目录订阅功能
|
2022-01-14 17:04:26 +08:00 |
|
648540858
|
bfcb4d2335
|
合并主分支
|
2022-01-13 16:39:32 +08:00 |
|
648540858
|
f99c9cac6a
|
优化通道更新
|
2022-01-13 16:24:37 +08:00 |
|
648540858
|
cea7d51139
|
去除功能的重复实现
|
2022-01-05 15:25:19 +08:00 |
|
648540858
|
6e0f7fae6e
|
为级联平台增加虚拟目录功能
|
2022-01-05 15:23:14 +08:00 |
|
648540858
|
0c10e8d9d3
|
优化info消息的cseq计数
|
2021-12-14 18:41:50 +08:00 |
|
648540858
|
54568adfdd
|
优化录像下载逻辑以及录像查询逻辑
|
2021-11-26 23:05:36 +08:00 |
|
648540858
|
d87ff7bf4d
|
添加回放控制界面,优化录像查询接口
|
2021-11-24 18:48:02 +08:00 |
|
648540858
|
08c45876df
|
优化倍速播放参数
|
2021-11-24 15:10:10 +08:00 |
|
chenparty
|
4142601a4b
|
增加回放控制功能(回放暂停、回放恢复、回放拖动播放、回放倍速播放)
|
2021-11-23 17:09:15 +08:00 |
|
648540858
|
0199676a6d
|
查询流地址时mediaServerId改为可选
|
2021-11-22 17:29:16 +08:00 |
|
chenparty
|
d5739409e5
|
fix bug
|
2021-11-17 15:30:38 +08:00 |
|
chenparty
|
6de761d1c3
|
修复command字段接口文档类型
Change command type from Integer to String
|
2021-11-09 12:02:06 +08:00 |
|
648540858
|
f1217682a9
|
重构28181信令结构,解决循环依赖导致的无法直接注入
|
2021-11-05 18:27:41 +08:00 |
|
648540858
|
31e340e8e2
|
修改云台控制接口使其更加直观
|
2021-11-03 14:58:48 +08:00 |
|
648540858
|
b1e5a86916
|
去除查询类api调用的日志
|
2021-11-02 16:56:24 +08:00 |
|
648540858
|
bb226c431e
|
修复订阅sip消息导致的内存溢出以及录像回放的问题
|
2021-11-02 16:50:22 +08:00 |
|
648540858
|
3b21f385cd
|
对需要向设备发起请求的http请求,使用缓存,等待设备请求返回的时候一次性释放所有请求
|
2021-11-02 10:40:29 +08:00 |
|
648540858
|
61a8113c39
|
修改错别字
|
2021-10-18 17:31:28 +08:00 |
|
648540858
|
6dc4b8a79a
|
修复点播与录像回放sdp信息sdp-ip的取值错误,修复回放信令错误
|
2021-10-15 15:05:02 +08:00 |
|
648540858
|
5e8a7ce21e
|
添加utf-8解析设备信息
|
2021-09-13 16:08:40 +08:00 |
|
648540858
|
3578c1c040
|
优化登录体验。修复因为流地址导致的录像服务无法识别
|
2021-08-31 09:44:19 +08:00 |
|
648540858
|
9e8cab609d
|
添加角色相关的接口,用户信息添加角色信息
|
2021-08-10 15:42:15 +08:00 |
|
648540858
|
3cd1434341
|
添加用户操作
修正报警清理接口
|
2021-08-05 07:25:12 +08:00 |
|
648540858
|
724b288232
|
优化内存溢出的问题
优化zlm集群默认zlm的存储
添加报警的存储以及相关接口
添加单元测试
|
2021-08-04 18:00:22 +08:00 |
|
lawrencehj
|
f5b019e998
|
更正打字错误
|
2021-07-28 16:29:38 +08:00 |
|
lawrencehj
|
99d7bea977
|
去除多余Import
|
2021-07-28 09:46:08 +08:00 |
|
64850858
|
95ed662935
|
修复stream-none-reader-delay-ms为-1时不自动关闭流
|
2021-07-26 17:22:40 +08:00 |
|