Lawrence
|
b8e67deb13
|
优化录像清单获取算法
|
2021-01-11 20:39:27 +08:00 |
|
panlinlin
|
8b4d8a76ac
|
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
|
2021-01-11 17:51:44 +08:00 |
|
panlinlin
|
021b820736
|
通过前端文件修复分页错误
|
2021-01-11 17:50:29 +08:00 |
|
panlinlin
|
d94135c9cd
|
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
|
2021-01-11 17:46:16 +08:00 |
|
648540858
|
e3943cb07e
|
Merge pull request #31 from BradyXuBin/master
修复分页错误和增加配置忽略文件
|
2021-01-11 17:37:38 +08:00 |
|
panlinlin
|
74c9e0400d
|
修复错误的使用stream作为ssrc导致的无法stop问题
|
2021-01-11 17:35:46 +08:00 |
|
BradyXuBin
|
255d2d4581
|
1.修复分页错误，pageHelper是从1开始,目前是在后端的+1解决。
2.增加忽略自己本身配置文件。
|
2021-01-11 17:33:43 +08:00 |
|
648540858
|
872d336ded
|
Merge pull request #29 from lawrencehj/wvp-28181-2.0
Wvp 28181 2.0
|
2021-01-11 11:24:56 +08:00 |
|
648540858
|
4005962c5b
|
Merge pull request #30 from lawrencehj/master
与2.0同步修正部分错误
|
2021-01-11 11:24:34 +08:00 |
|
Lawrence
|
e0eb295a79
|
离线设备禁用通道查看，避免后续无效操作
|
2021-01-11 09:35:07 +08:00 |
|
Lawrence
|
6f2cd3ec08
|
修改通道在线/离线描述，避免歧义
|
2021-01-11 09:27:04 +08:00 |
|
Lawrence
|
8801c7741b
|
与2.0同步修改
|
2021-01-11 09:18:00 +08:00 |
|
Lawrence
|
e739c379ae
|
报警响应处理去除catalog查询操作
|
2021-01-11 09:17:15 +08:00 |
|
Lawrence
|
fb69312642
|
修正录像回放错误
|
2021-01-11 09:16:16 +08:00 |
|
Lawrence
|
42450af885
|
修改通道在线/离线描述，避免歧义
|
2021-01-11 09:14:22 +08:00 |
|
Lawrence
|
a47a7ccb54
|
修正个别错误
|
2021-01-11 09:13:03 +08:00 |
|
Lawrence
|
b0b924ee71
|
离线设备禁用通道查看，避免后续无效操作
|
2021-01-11 09:11:56 +08:00 |
|
Lawrence
|
80f6ecc617
|
修改本地jar包路径描述，避免marven编译Warning
|
2021-01-11 09:10:56 +08:00 |
|
Lawrence
|
68cad9a953
|
调整格式
|
2021-01-10 23:14:58 +08:00 |
|
Lawrence
|
e8960c6f2f
|
取消报警响应后查询目录操作
|
2021-01-10 23:12:30 +08:00 |
|
Lawrence
|
d5026897c1
|
修正回放错误，优化sdp排序，提高设备兼容性
|
2021-01-10 23:11:30 +08:00 |
|
Lawrence
|
37b1978da5
|
删除多余注释
|
2021-01-10 23:08:47 +08:00 |
|
Lawrence
|
625842fd0d
|
Merge remote-tracking branch 'upstream/wvp-28181-2.0' into wvp-28181-2.0
|
2021-01-10 21:38:40 +08:00 |
|
panlinlin
|
658bec3ecc
|
国标级联--选择通道003-前端页面
|
2021-01-10 20:14:11 +08:00 |
|
Lawrence
|
fc4cd01f67
|
修改本地jar库路径描述，避免marven编译Warning
|
2021-01-09 14:58:08 +08:00 |
|
panlinlin
|
7ed4a26be6
|
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
|
2021-01-09 12:16:16 +08:00 |
|
panlinlin
|
0dc017704a
|
去除无用的配置项
|
2021-01-09 12:12:50 +08:00 |
|
panlinlin
|
3131310642
|
完成向上级联->选择通道-002
|
2021-01-08 17:35:05 +08:00 |
|
panlinlin
|
7e581e9d3a
|
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
|
1342aad032
|
修复检测字段是否存在带来的停止按钮无法点击
修改错别字
|
2021-01-08 17:27:13 +08:00 |
|
panlinlin
|
675ce2346d
|
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
|
2021-01-08 15:40:46 +08:00 |
|
panlinlin
|
224e904306
|
修复更新设备和通道信息时检测字段是否存在
|
2021-01-08 14:46:55 +08:00 |
|
panlinlin
|
d3578a957d
|
添加对水星云台控制的支持
|
2021-01-08 13:33:19 +08:00 |
|
panlinlin
|
422ce8aebb
|
完成向上级联->选择通道-001
|
2021-01-08 11:04:29 +08:00 |
|
panlinlin
|
0020402685
|
完成向上级联->选择通道-001
|
2021-01-08 11:02:53 +08:00 |
|
panlinlin
|
397e0c4a27
|
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
|
2021-01-07 16:52:18 +08:00 |
|
panlinlin
|
568141b2bc
|
增加云台控制的速度控制
|
2021-01-07 16:44:42 +08:00 |
|
panlinlin
|
059a5a678a
|
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
|
2021-01-07 15:31:16 +08:00 |
|
panlinlin
|
05960d3573
|
修复重启zlm导致的点播失败
|
2021-01-07 15:29:58 +08:00 |
|
panlinlin
|
9bf87971e7
|
完成向上级联->启动时自动注册
|
2021-01-07 14:56:10 +08:00 |
|
panlinlin
|
53ffefe091
|
完成向上级联->保存时注册或注销
|
2021-01-07 14:09:41 +08:00 |
|
panlinlin
|
54d7953179
|
完成向上级联->删除的时候注销
|
2021-01-07 13:15:39 +08:00 |
|
panlinlin
|
627a14f37e
|
完成向上级联->保活
|
2021-01-06 18:35:38 +08:00 |
|
panlinlin
|
9aa9b15b62
|
修改错误的注释
|
2021-01-06 10:01:28 +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
|
730a64be07
|
优化录像查询，优化注释
|
2021-01-05 14:35:43 +08:00 |
|
panlinlin
|
5ef229f02c
|
更新application.yml
|
2021-01-05 14:28:18 +08:00 |
|
panlinlin
|
70fca8ce5d
|
更新readme
|
2021-01-05 11:52:31 +08:00 |
|
panlinlin
|
381e3129a3
|
存储部分使用sqlite代替redis-4
|
2021-01-05 11:25:05 +08:00 |
|
panlinlin
|
dcd78a1cfa
|
存储部分使用sqlite代替redis-3
|
2021-01-04 18:30:44 +08:00 |
|