Commit Graph

206 Commits

Author SHA1 Message Date
648540858
354a39961a 优化点播, 级联点播级联录像。级联列表显示订阅状态 2022-03-14 18:24:30 +08:00
648540858
b2c953fc76 优化ssrc释放逻辑,优化级联点播速度,去除等待流格式的配置项 2022-03-07 01:17:45 +08:00
李防
cbea5f64c9 修改3个小bug 2022-03-05 17:05:05 +08:00
648540858
83671d8f10 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
b10a65483d 去除lombok,readme更新 2022-03-04 10:30:55 +08:00
648540858
d21322a932 优化国标级联录像预览 2022-03-03 18:23:52 +08:00
648540858
01a619f9e3 Merge branch 'wvp-28181-2.0' into wvp-pro-record 2022-03-03 16:55:20 +08:00
648540858
14174ff400 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
b019106c44 Merge pull request #365 from TristingChen/zlm-node-manage
fixed--多节点管理zlm,wvp重启之后节点中的redis在线状态bug修复
2022-03-03 16:23:03 +08:00
648540858
2eb1ca2d94 国标录像支持多端同时播放 2022-03-03 15:57:28 +08:00
chenjialing
af885ca4d9 节点管理--某个zlm节点删除之后,数据库中仍有数据,导致再次添加该zlm节点 2022-03-03 15:40:12 +08:00
648540858
1dcdbc3742 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
f5640fddb7 优化国标级联的目录订阅 2022-03-02 11:48:20 +08:00
648540858
29191373aa 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
4c53b10737 解决对接中遇到的问题 2022-03-01 17:42:22 +08:00
648540858
9c5b1060af 支持删除在线设备 2022-02-28 17:56:27 +08:00
648540858
10f776678e Merge branch 'wvp-28181-2.0' into wvp-pro-record 2022-02-25 20:33:38 +08:00
648540858
7400ace65d 规范数据库,解决bug 2022-02-25 20:33:02 +08:00
648540858
0191e93768 同步主线 2022-02-23 21:55:46 +08:00
648540858
2157bb0270 规范数据库,给各个标设置主键ID 2022-02-22 11:44:56 +08:00
648540858
5bcd8495e0 兼容海康不规范的xml,大幅度提高通道分页查询速度,优化节点的保活。 2022-02-20 16:22:43 +08:00
648540858
9442c37ce7 优化级联添加通道流程 2022-02-15 17:41:09 +08:00
648540858
d4fe0fb325 Merge remote-tracking branch 'github/wvp-28181-2.0' into wvp-28181-2.0 2022-02-15 09:13:16 +08:00
朱俊杰
54df5df031 mapper改用注释方式 2022-02-14 10:18:00 +08:00
648540858
bf66f8f694 推流导入支持添加平台信息与目录信息 2022-02-11 16:45:06 +08:00
朱俊杰
37a84e6691 新增实时监控功能
左边是设备通道树,右边是分屏预览
2022-02-10 14:45:33 +08:00
648540858
d07a5680f3 为推流列表增加批量移除功能 2022-02-07 18:30:43 +08:00
648540858
e0028a87cb 为推流列表增加搜索功能 2022-02-07 14:12:34 +08:00
648540858
646419e4ad #247 2022-01-28 16:45:12 +08:00
648540858
abc65c6317 优化目录移除时默认目录的选择 2022-01-25 17:14:10 +08:00
648540858
5c2d27f75d 兼容mysql5低版本 2022-01-25 16:23:29 +08:00
648540858
1dbb559b38 优化文件导入判断 2022-01-25 15:43:52 +08:00
648540858
2e60339e0a 修复候选通道查询bug 2022-01-25 12:20:52 +08:00
648540858
46cf650a86 优化通道选择是通道的查询 2022-01-21 18:00:15 +08:00
648540858
3f5e885e82 目录默认节点被删除时,重置默认节点为根节点 2022-01-21 14:10:49 +08:00
648540858
7d88827415 处理服务重启或设备重新上线时的订阅,优化通道导入重复的处理 2022-01-20 16:48:30 +08:00
648540858
e8090bc84c 修复bug与目录订阅添加最小值60 2022-01-19 10:23:52 +08:00
648540858
fa346513db 优化级联选择通道页面添加方式 2022-01-17 16:46:28 +08:00
648540858
385fdb95f1 优化级联选择通道逻辑 2022-01-17 15:48:08 +08:00
648540858
29d69267f9 优化通道选择页面样式和优化拉框放大与缩小的接口路径 2022-01-17 10:16:58 +08:00
szy833
4bd4f50b41 Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-01-16 23:32:51 +08:00
648540858
06e22d980e 支持推流通道预导入 2022-01-16 10:40:57 +08:00
szy833
c6202b3b27 feat(): 增加拉框放大,缩小。接收下级设备控制信令增加200返回。 2022-01-15 22:29:59 +08:00
648540858
ac1a4a027a 支持国标级联的目录订阅功能 2022-01-14 17:04:26 +08:00
648540858
bfcb4d2335 合并主分支 2022-01-13 16:39:32 +08:00
648540858
f99c9cac6a 优化通道更新 2022-01-13 16:24:37 +08:00
648540858
cea7d51139 去除功能的重复实现 2022-01-05 15:25:19 +08:00
648540858
6e0f7fae6e 为级联平台增加虚拟目录功能 2022-01-05 15:23:14 +08:00
648540858
0c10e8d9d3 优化info消息的cseq计数 2021-12-14 18:41:50 +08:00
648540858
b6fa459bc3 修复推流列表大数据量时批量删除的错误,修复推流列表分页查询错误 2021-12-10 18:38:58 +08:00