648540858
|
ce2e412c69
|
修复推流关联平台的bug again
|
2022-03-16 10:12:31 +08:00 |
|
648540858
|
8ad6c7dbba
|
使用zlm原生的rtp随机端口配置
|
2022-03-15 15:37:22 +08:00 |
|
648540858
|
c9d2c69155
|
修复多平台同时导入时的bug
|
2022-03-15 11:44:11 +08:00 |
|
648540858
|
f2af3bd989
|
优化点播, 级联点播级联录像。级联列表显示订阅状态
|
2022-03-14 18:24:30 +08:00 |
|
648540858
|
13899f771b
|
优化ssrc释放逻辑，优化级联点播速度，去除等待流格式的配置项
|
2022-03-07 01:17:45 +08:00 |
|
李防
|
a1cb002609
|
修改3个小bug
|
2022-03-05 17:05:05 +08:00 |
|
648540858
|
d6d226ef2c
|
Merge branch 'wvp-28181-2.0' into wvp-pro-record
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
|
2022-03-04 15:27:28 +08:00 |
|
648540858
|
b48e93e97a
|
去除lombok，readme更新
|
2022-03-04 10:30:55 +08:00 |
|
648540858
|
7af0cc437a
|
优化国标级联录像预览
|
2022-03-03 18:23:52 +08:00 |
|
648540858
|
42cbec85e8
|
Merge branch 'wvp-28181-2.0' into wvp-pro-record
|
2022-03-03 16:55:20 +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
|
0c909e0c85
|
Merge pull request #365 from TristingChen/zlm-node-manage
fixed--多节点管理zlm,wvp重启之后节点中的redis在线状态bug修复
|
2022-03-03 16:23:03 +08:00 |
|
648540858
|
1527b0e839
|
国标录像支持多端同时播放
|
2022-03-03 15:57:28 +08:00 |
|
chenjialing
|
6e147c44e2
|
节点管理--某个zlm节点删除之后，数据库中仍有数据，导致再次添加该zlm节点
|
2022-03-03 15:40:12 +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
|
ac56757291
|
支持删除在线设备
|
2022-02-28 17:56:27 +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
|
48fac476dc
|
同步主线
|
2022-02-23 21:55:46 +08:00 |
|
648540858
|
b1ff3773a4
|
规范数据库，给各个标设置主键ID
|
2022-02-22 11:44:56 +08:00 |
|
648540858
|
479a07f879
|
兼容海康不规范的xml，大幅度提高通道分页查询速度，优化节点的保活。
|
2022-02-20 16:22:43 +08:00 |
|
648540858
|
84bebc2bd1
|
优化级联添加通道流程
|
2022-02-15 17:41:09 +08:00 |
|
648540858
|
ba7a73a13f
|
Merge remote-tracking branch 'github/wvp-28181-2.0' into wvp-28181-2.0
|
2022-02-15 09:13:16 +08:00 |
|
朱俊杰
|
2f599af6d7
|
mapper改用注释方式
|
2022-02-14 10:18:00 +08:00 |
|
648540858
|
4a6eed9459
|
推流导入支持添加平台信息与目录信息
|
2022-02-11 16:45:06 +08:00 |
|
朱俊杰
|
3789e8616f
|
新增实时监控功能
左边是设备通道树，右边是分屏预览
|
2022-02-10 14:45:33 +08:00 |
|
648540858
|
8cbbf1470b
|
为推流列表增加批量移除功能
|
2022-02-07 18:30:43 +08:00 |
|
648540858
|
d3d42ef9bd
|
为推流列表增加搜索功能
|
2022-02-07 14:12:34 +08:00 |
|
648540858
|
457bfe6433
|
#247
|
2022-01-28 16:45:12 +08:00 |
|
648540858
|
e57dc37e50
|
优化目录移除时默认目录的选择
|
2022-01-25 17:14:10 +08:00 |
|
648540858
|
c9a3d41325
|
兼容mysql5低版本
|
2022-01-25 16:23:29 +08:00 |
|
648540858
|
2afaa89599
|
优化文件导入判断
|
2022-01-25 15:43:52 +08:00 |
|
648540858
|
b01b5540b5
|
修复候选通道查询bug
|
2022-01-25 12:20:52 +08:00 |
|
648540858
|
963cc1b4b3
|
优化通道选择是通道的查询
|
2022-01-21 18:00:15 +08:00 |
|
648540858
|
4a87514e4a
|
目录默认节点被删除时，重置默认节点为根节点
|
2022-01-21 14:10:49 +08:00 |
|
648540858
|
63aa34be19
|
处理服务重启或设备重新上线时的订阅，优化通道导入重复的处理
|
2022-01-20 16:48:30 +08:00 |
|
648540858
|
41cec21a25
|
修复bug与目录订阅添加最小值60
|
2022-01-19 10:23:52 +08:00 |
|
648540858
|
194f901847
|
优化级联选择通道页面添加方式
|
2022-01-17 16:46:28 +08:00 |
|
648540858
|
7e45f9dc8a
|
优化级联选择通道逻辑
|
2022-01-17 15:48:08 +08:00 |
|
648540858
|
88580908b1
|
优化通道选择页面样式和优化拉框放大与缩小的接口路径
|
2022-01-17 10:16:58 +08:00 |
|
szy833
|
08cbabcba1
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-01-16 23:32:51 +08:00 |
|
648540858
|
70c613e509
|
支持推流通道预导入
|
2022-01-16 10:40:57 +08:00 |
|
szy833
|
b74e310e98
|
feat(): 增加拉框放大，缩小。接收下级设备控制信令增加200返回。
|
2022-01-15 22:29:59 +08:00 |
|
648540858
|
2661f47ca6
|
支持国标级联的目录订阅功能
|
2022-01-14 17:04:26 +08:00 |
|
648540858
|
0949c2f4cc
|
合并主分支
|
2022-01-13 16:39:32 +08:00 |
|
648540858
|
59890314e4
|
优化通道更新
|
2022-01-13 16:24:37 +08:00 |
|
648540858
|
0bfe596889
|
去除功能的重复实现
|
2022-01-05 15:25:19 +08:00 |
|