648540858
|
cb083223f8
|
统一国标设备与级联平台字符集的使用
|
2022-03-17 10:29:49 +08:00 |
|
648540858
|
ce2e412c69
|
修复推流关联平台的bug again
|
2022-03-16 10:12:31 +08:00 |
|
648540858
|
f2af3bd989
|
优化点播, 级联点播级联录像。级联列表显示订阅状态
|
2022-03-14 18:24:30 +08:00 |
|
648540858
|
ddc0779b4f
|
移除多余字段
|
2022-03-11 11:22:47 +08:00 |
|
648540858
|
63fec78d24
|
优化目录订阅以及国标级联目录订阅回复
|
2022-03-10 20:53:56 +08:00 |
|
648540858
|
13899f771b
|
优化ssrc释放逻辑，优化级联点播速度，去除等待流格式的配置项
|
2022-03-07 01:17:45 +08:00 |
|
648540858
|
7af0cc437a
|
优化国标级联录像预览
|
2022-03-03 18:23:52 +08:00 |
|
648540858
|
cc7f784198
|
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
|
1527b0e839
|
国标录像支持多端同时播放
|
2022-03-03 15:57:28 +08:00 |
|
648540858
|
f61d0c35d7
|
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
|
78bad59518
|
优化国标级联的目录订阅
|
2022-03-02 11:48:20 +08:00 |
|
648540858
|
6d8ea04fe0
|
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
|
4c53e56d90
|
解决对接中遇到的问题
|
2022-03-01 17:42:22 +08:00 |
|
648540858
|
1bbf270fec
|
实现国标录像级联播放，优化点播流程，加快点播速度
|
2022-02-27 20:01:31 +08:00 |
|
648540858
|
1fa0046395
|
Merge branch 'wvp-28181-2.0' into wvp-pro-record
|
2022-02-25 20:33:38 +08:00 |
|
648540858
|
bd4f730d79
|
规范数据库，解决bug
|
2022-02-25 20:33:02 +08:00 |
|
648540858
|
8dfb2fc4a2
|
实现国标的级联录像查询
|
2022-02-24 21:10:34 +08:00 |
|
648540858
|
e9d8aa2f13
|
规范数据库，添加必要约束，优化通道批量导入功能
|
2022-02-24 16:55:06 +08:00 |
|
648540858
|
b1ff3773a4
|
规范数据库，给各个标设置主键ID
|
2022-02-22 11:44:56 +08:00 |
|
648540858
|
b01b5540b5
|
修复候选通道查询bug
|
2022-01-25 12:20:52 +08:00 |
|
648540858
|
2661f47ca6
|
支持国标级联的目录订阅功能
|
2022-01-14 17:04:26 +08:00 |
|
lin
|
9166e3ff80
|
级联平台添加GPS订阅支持
|
2022-01-08 16:47:20 +08:00 |
|
648540858
|
0c964e9e70
|
为级联平台增加虚拟目录功能
|
2022-01-05 15:23:14 +08:00 |
|
648540858
|
f64016a6c7
|
优化通道更新逻辑
|
2021-12-28 18:54:50 +08:00 |
|
648540858
|
8489f48f92
|
添加第三方服务参与的推流直接转发到国标功能
|
2021-12-04 17:27:23 +08:00 |
|
648540858
|
94034c3c09
|
优化录像下载逻辑以及录像查询逻辑
|
2021-11-26 23:05:36 +08:00 |
|
648540858
|
34f5ac913e
|
重构28181信令结构，解决循环依赖导致的无法直接注入
|
2021-11-05 18:27:41 +08:00 |
|
648540858
|
681910aaa1
|
对需要向设备发起请求的http请求，使用缓存，等待设备请求返回的时候一次性释放所有请求
|
2021-11-02 10:40:29 +08:00 |
|
648540858
|
2ef79be1d6
|
处理报警和位置上报时使用fromHeader获取deviceId, xml的deviceId作为channelId使用。
|
2021-09-27 15:36:41 +08:00 |
|
648540858
|
e2b7ffb4e6
|
添加utf-8解析设备信息
|
2021-09-13 16:08:40 +08:00 |
|
648540858
|
0cfd24826f
|
优化内存溢出的问题
优化zlm集群默认zlm的存储
添加报警的存储以及相关接口
添加单元测试
|
2021-08-04 18:00:22 +08:00 |
|
lawrencehj
|
4683e590da
|
去除多余Import
|
2021-07-28 09:46:08 +08:00 |
|
64850858
|
7218c6fcd3
|
优化集群方案， 每个zlm一套ssrc；
优化集群下的docker接入逻辑；
更正sql脚本；
支持重启不设置设备离线。重启SIP事务不丢失
|
2021-07-26 11:40:32 +08:00 |
|
64850858
|
3281fd4bcf
|
添加zlm集群支持
|
2021-07-16 16:34:51 +08:00 |
|
64850858
|
fc6d4579e8
|
添加创建时间与更新时间
|
2021-06-07 16:44:48 +08:00 |
|
64850858
|
f0de960b30
|
设备信息增加最近注册时间和最近心跳时间，心跳超时时间变为可配置
|
2021-06-07 15:11:53 +08:00 |
|
64850858
|
356afaa5ac
|
增加zlm代理的secret自动添加， 增加配置文件的默认值，缺少非关键参数不会无法启动，简化配置文件给新手带来的压力，前端使用wvp代理流。
|
2021-06-04 16:31:45 +08:00 |
|
panlinlin
|
03fd4ba4cc
|
解决串流，解决编辑上级平台却新建了的问题
|
2021-04-15 17:48:52 +08:00 |
|
panlinlin
|
b502e2377d
|
修复添加级联平台是三个布尔字段无效的bug
|
2021-04-06 18:08:58 +08:00 |
|
panlinlin
|
850a5b2c6b
|
增加推流转发到国标，尚不完善
|
2021-04-02 19:04:01 +08:00 |
|
panlinlin
|
a3692072a1
|
添加拉流代理与国标关联, 支持代理rtsp/rtmp/...，转发到国标
|
2021-04-01 18:06:21 +08:00 |
|
lawrencehj
|
66b7d6e1ae
|
实现级联点播RTP推送
|
2021-03-09 20:05:37 +08:00 |
|
panlinlin
|
67a62aae4e
|
对级联点播信令进行处理
|
2021-03-02 18:23:06 +08:00 |
|
panlinlin
|
48c0893de3
|
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
# Conflicts:
# README.md
# src/main/java/com/genersoft/iot/vmp/gb28181/event/EventPublisher.java
# src/main/java/com/genersoft/iot/vmp/gb28181/event/alarm/AlarmEvent.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorFactory.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java
# src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
# src/main/java/com/genersoft/iot/vmp/vmanager/SseController/SseController.java
# src/main/java/com/genersoft/iot/vmp/vmanager/service/IPlayService.java
# src/main/java/com/genersoft/iot/vmp/vmanager/service/impl/PlayServiceImpl.java
# src/main/resources/wvp.sqlite
# web_src/.postcssrc.js
# web_src/src/components/UiHeader.vue
# web_src/src/main.js
# web_src/src/router/index.js
|
2021-02-25 18:10:02 +08:00 |
|
lawrencehj
|
347cac1859
|
去除冗余代码，修正编译报警项
|
2021-02-05 15:15:39 +08:00 |
|
Lawrence
|
9121ff65a1
|
增加移动位置处理支持
|
2021-01-27 15:29:51 +08:00 |
|
Lawrence
|
a6ed1268e3
|
添加报警响应、发布和SSE推送功能
|
2021-01-20 23:31:00 +08:00 |
|
Lawrence
|
8e9579f253
|
增加设备报警事件响应、发布和信息处理
|
2021-01-20 20:39:57 +08:00 |
|
panlinlin
|
41c1127f6c
|
修复国标校时的时区的错误导致时间差八个小时的一个错别字
|
2021-01-20 10:04:52 +08:00 |
|
panlinlin
|
9a30a0f23a
|
修复国标校时的时区的错误导致时间差八个小时
|
2021-01-20 09:53:25 +08:00 |
|