panlinlin
|
1c8b072268
|
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
|
2021-01-11 17:46:16 +08:00 |
|
648540858
|
34e73875b8
|
Merge pull request #31 from BradyXuBin/master
修复分页错误和增加配置忽略文件
|
2021-01-11 17:37:38 +08:00 |
|
panlinlin
|
19da2fb6ed
|
修复错误的使用stream作为ssrc导致的无法stop问题
|
2021-01-11 17:35:46 +08:00 |
|
BradyXuBin
|
8265496f60
|
1.修复分页错误，pageHelper是从1开始,目前是在后端的+1解决。
2.增加忽略自己本身配置文件。
|
2021-01-11 17:33:43 +08:00 |
|
648540858
|
42d837b70f
|
Merge pull request #29 from lawrencehj/wvp-28181-2.0
Wvp 28181 2.0
|
2021-01-11 11:24:56 +08:00 |
|
648540858
|
823c09eb6c
|
Merge pull request #30 from lawrencehj/master
与2.0同步修正部分错误
|
2021-01-11 11:24:34 +08:00 |
|
Lawrence
|
50c0cec22c
|
离线设备禁用通道查看，避免后续无效操作
|
2021-01-11 09:35:07 +08:00 |
|
Lawrence
|
32ea365979
|
修改通道在线/离线描述，避免歧义
|
2021-01-11 09:27:04 +08:00 |
|
Lawrence
|
62342c6d37
|
与2.0同步修改
|
2021-01-11 09:18:00 +08:00 |
|
Lawrence
|
ef51d17dd2
|
报警响应处理去除catalog查询操作
|
2021-01-11 09:17:15 +08:00 |
|
Lawrence
|
b1f4810025
|
修正录像回放错误
|
2021-01-11 09:16:16 +08:00 |
|
Lawrence
|
6ce6b95b56
|
修改通道在线/离线描述，避免歧义
|
2021-01-11 09:14:22 +08:00 |
|
Lawrence
|
b82b61038b
|
修正个别错误
|
2021-01-11 09:13:03 +08:00 |
|
Lawrence
|
f0f4537d80
|
离线设备禁用通道查看，避免后续无效操作
|
2021-01-11 09:11:56 +08:00 |
|
Lawrence
|
b146f40862
|
修改本地jar包路径描述，避免marven编译Warning
|
2021-01-11 09:10:56 +08:00 |
|
Lawrence
|
eec405028f
|
调整格式
|
2021-01-10 23:14:58 +08:00 |
|
Lawrence
|
11a04000b6
|
取消报警响应后查询目录操作
|
2021-01-10 23:12:30 +08:00 |
|
Lawrence
|
572b1aaba7
|
修正回放错误，优化sdp排序，提高设备兼容性
|
2021-01-10 23:11:30 +08:00 |
|
Lawrence
|
d32fc9e801
|
删除多余注释
|
2021-01-10 23:08:47 +08:00 |
|
Lawrence
|
d4eefffa51
|
Merge remote-tracking branch 'upstream/wvp-28181-2.0' into wvp-28181-2.0
|
2021-01-10 21:38:40 +08:00 |
|
panlinlin
|
a796db6249
|
国标级联--选择通道003-前端页面
|
2021-01-10 20:14:11 +08:00 |
|
Lawrence
|
6002969517
|
修改本地jar库路径描述，避免marven编译Warning
|
2021-01-09 14:58:08 +08:00 |
|
panlinlin
|
8765ce134b
|
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
|
2021-01-09 12:16:16 +08:00 |
|
panlinlin
|
440e070188
|
去除无用的配置项
|
2021-01-09 12:12:50 +08:00 |
|
panlinlin
|
15c1edc055
|
完成向上级联->选择通道-002
|
2021-01-08 17:35:05 +08:00 |
|
panlinlin
|
37b6afb9b2
|
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
|
2021-01-08 17:31:49 +08:00 |
|
panlinlin
|
82ee2034b1
|
修复检测字段是否存在带来的停止按钮无法点击
修改错别字
|
2021-01-08 17:27:13 +08:00 |
|
panlinlin
|
44521509d7
|
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
|
2021-01-08 15:40:46 +08:00 |
|
panlinlin
|
781247e1af
|
修复更新设备和通道信息时检测字段是否存在
|
2021-01-08 14:46:55 +08:00 |
|
panlinlin
|
3aeb164c8d
|
添加对水星云台控制的支持
|
2021-01-08 13:33:19 +08:00 |
|
panlinlin
|
b4a7cfb563
|
完成向上级联->选择通道-001
|
2021-01-08 11:04:29 +08:00 |
|
panlinlin
|
2383f1515f
|
完成向上级联->选择通道-001
|
2021-01-08 11:02:53 +08:00 |
|
panlinlin
|
71a1dd8fc6
|
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
|
2021-01-07 16:52:18 +08:00 |
|
panlinlin
|
a3afe9cc34
|
增加云台控制的速度控制
|
2021-01-07 16:44:42 +08:00 |
|
panlinlin
|
29c52dbdda
|
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
|
2021-01-07 15:31:16 +08:00 |
|
panlinlin
|
370b71939c
|
修复重启zlm导致的点播失败
|
2021-01-07 15:29:58 +08:00 |
|
panlinlin
|
4cbf7205e2
|
完成向上级联->启动时自动注册
|
2021-01-07 14:56:10 +08:00 |
|
panlinlin
|
56bfa58efd
|
完成向上级联->保存时注册或注销
|
2021-01-07 14:09:41 +08:00 |
|
panlinlin
|
4ed02aa69b
|
完成向上级联->删除的时候注销
|
2021-01-07 13:15:39 +08:00 |
|
panlinlin
|
a8a36efb93
|
完成向上级联->保活
|
2021-01-06 18:35:38 +08:00 |
|
panlinlin
|
80682bbe9d
|
修改错误的注释
|
2021-01-06 10:01:28 +08:00 |
|
panlinlin
|
20669ed768
|
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
|
3a6fc34a11
|
优化录像查询，优化注释
|
2021-01-05 14:35:43 +08:00 |
|
panlinlin
|
59237e9a55
|
更新application.yml
|
2021-01-05 14:28:18 +08:00 |
|
panlinlin
|
37957b7407
|
更新readme
|
2021-01-05 11:52:31 +08:00 |
|
panlinlin
|
b88ead03f9
|
存储部分使用sqlite代替redis-4
|
2021-01-05 11:25:05 +08:00 |
|
panlinlin
|
82c682c512
|
存储部分使用sqlite代替redis-3
|
2021-01-04 18:30:44 +08:00 |
|
panlinlin
|
15bee5e37d
|
存储部分使用sqlite代替redis-2
|
2020-12-31 13:22:22 +08:00 |
|
panlinlin
|
2ab8b942bd
|
存储部分使用sqlite代替redis
|
2020-12-31 13:15:50 +08:00 |
|
panlinlin
|
59f7fb1063
|
增加对 需要扩展SDP的设备的单独设置
|
2020-12-28 11:45:40 +08:00 |
|