Shikong/wvp-gb28181-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
402 Commits 2 Branches 0 Tags 42 MiB
b37a77f23f
Commit Graph

34 Commits

Author SHA1 Message Date
lawrencehj
df34954c9e 实现级联点播RTP推送 2021-03-09 20:05:37 +08:00
panlinlin
2f165d595a 对级联点播信令进行处理 2021-03-02 18:23:06 +08:00
panlinlin
0f58218bad 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
a8603075d4 去除冗余代码，修正编译报警项 2021-02-05 15:15:39 +08:00
Lawrence
84ecc89f8a 增加移动位置处理支持 2021-01-27 15:29:51 +08:00
Lawrence
abbfef2aef 添加报警响应、发布和SSE推送功能 2021-01-20 23:31:00 +08:00
Lawrence
6811b8dc5c 增加设备报警事件响应、发布和信息处理 2021-01-20 20:39:57 +08:00
panlinlin
2b850ba781 修复国标校时的时区的错误导致时间差八个小时的一个错别字 2021-01-20 10:04:52 +08:00
panlinlin
dfb3454f6e 修复国标校时的时区的错误导致时间差八个小时 2021-01-20 09:53:25 +08:00
panlinlin
503f891c9e 完成向上级联->点播--增加了sdp解析 
修复修改平台主键带来的bug
 2021-01-15 17:21:02 +08:00
panlinlin
cf8a22f50b Merge remote-tracking branch 'origin/master' into wvp-28181-2.0 2021-01-15 15:33:24 +08:00
panlinlin
e960720298 通过重写的方式解决与国标时间格式不一致的问题， 不需要修改jar包了。 2021-01-15 15:28:47 +08:00
panlinlin
6c4da7bebe 完成向上级联->通道推送 
修复选择通道是查询的bug
 2021-01-14 14:49:38 +08:00
panlinlin
54d7953179 完成向上级联->删除的时候注销 2021-01-07 13:15:39 +08:00
panlinlin
627a14f37e 完成向上级联->保活 2021-01-06 18:35:38 +08:00
panlinlin
34135cce5d Merge remote-tracking branch 'origin/master' into wvp-28181-2.0 
# Conflicts:
#	README.md
#	src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorFactory.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHTTPProxyController.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/jdbc/VideoManagerJdbcStoragerImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/redis/VideoManagerRedisStoragerImpl.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/playback/PlaybackController.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java
#	src/main/resources/application-dev.yml
#	web_src/src/components/gb28181/devicePlayer.vue
 2021-01-05 15:56:19 +08:00
panlinlin
dcd78a1cfa 存储部分使用sqlite代替redis-3 2021-01-04 18:30:44 +08:00
panlinlin
3d83775468 存储部分使用sqlite代替redis 2020-12-31 13:15:50 +08:00
panlinlin
b0080159d9 去除ssrc作为流ID传递，ssrc只作为sdp消息使用。动态端口的情况下支持固定流地址，同时支持未点播时直接播放流地址，代码自动发起点播 2020-12-19 21:52:20 +08:00
648540858
14003b9805 [UI] 完成国标级联的CURD 2020-11-23 18:17:20 +08:00
648540858
1904978856 添加addParentPlatform, queryParentPlatformList 接口 2020-11-20 18:02:01 +08:00
648540858
9361943e47 修复ui录象播放 
优化录象查询接口
 2020-10-26 11:40:46 +08:00
648540858
4d9a62339d 去除lombok框架 
添加流传输模式udp/tcp被动支持
 2020-10-16 16:49:41 +08:00
648540858
cc61ed4a07 去除lombok框架 2020-10-16 14:57:10 +08:00
648540858
1947edb69a 引入lombok框架 
优化redis存储结构
 2020-10-16 11:24:36 +08:00
648540858
3ec3b88456 修复点播判断错误导致的15s超长延时 
增加默认不关闭推流, 无人观看超时或点击停止按钮关闭流
修复点播其他bug
 2020-10-14 14:39:10 +08:00
648540858
f9ab13a145 添加通道音频设置 
添加media配置
 2020-10-13 17:16:38 +08:00
648540858
d881c98224 web页面集成 2020-10-10 17:33:02 +08:00
648540858
57fd18cd7c 增加分页,搜索,等 2020-09-30 17:59:11 +08:00
648540858
da14c7f24c 拆分redis中device与channel的存储方式 
支持分页
接口直接返回播放地址
 2020-09-25 17:22:22 +08:00
swwheihei
d8eeb70707 改名 2020-07-16 16:10:49 +08:00
songww
3a502b36a8 完善ssrc符合国标，并完善很多小问题 2020-05-10 22:33:21 +08:00
songww
bf7ab3fe2b 优化代码结构，提供NVR录像检索接口 2020-05-08 21:57:07 +08:00
songww
70091f29f2 初始提交 2020-05-07 21:55:45 +08:00