Commit Graph

214 Commits

Author SHA1 Message Date
648540858
3955e6ed53 异步通道刷新,优化ui效果 2022-04-12 21:06:21 +08:00
648540858
c2e2e24551 优化通道刷新 2022-04-12 11:04:08 +08:00
648540858
f1c8ca602d 添加日志 2022-04-07 15:41:46 +08:00
648540858
f7e39141db 修复重启服务后拉流代理回复失败的问题 2022-04-06 11:07:42 +08:00
648540858
7e755f405d 支持国标移动位置订阅,收到新位置发送redis消息;支持通道redis消息拉起第三方推流;云台控制添加ControlPriority字段;处理sql的bug 2022-04-01 16:45:29 +08:00
648540858
1553b39b45 修复级联的国标通道无经纬度问题 2022-03-29 10:04:28 +08:00
648540858
60278ee6ad 修复国标目录发送缺失的问题 2022-03-28 11:03:17 +08:00
648540858
7d9cc96ef5 优化国标录像下载,添加进度条以及自动合并文件下载,需要结合新版assist服务使用。 2022-03-25 16:05:14 +08:00
648540858
a77ba194ad 优化目录推送CivilCode值 2022-03-24 15:59:38 +08:00
648540858
59ef6e67d3 统一国标设备与级联平台字符集的使用 2022-03-17 10:29:49 +08:00
648540858
c8f9f19c38 #393 2022-03-16 17:46:24 +08:00
648540858
e752dbd1a7 修复推流关联平台的bug again 2022-03-16 10:12:31 +08:00
648540858
66aac4526b 修复推流关联平台的bug 2022-03-15 17:45:55 +08:00
648540858
d21a00418e 修复推流关联平台的bug 2022-03-15 16:58:50 +08:00
648540858
28e5c1ae05 修复平台编辑的bug 2022-03-15 10:13:19 +08:00
648540858
354a39961a 优化点播, 级联点播级联录像。级联列表显示订阅状态 2022-03-14 18:24:30 +08:00
648540858
1c95f1b4aa 移除多余字段 2022-03-11 11:22:47 +08:00
648540858
4a22611320 优化目录订阅时父节点的更新 2022-03-11 09:54:35 +08:00
dengming
f88c70d38c 删除重复字段,channelId字段查询了两次 2022-03-10 17:27:07 +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
ee746e53cd Merge remote-tracking branch 'gitee.com/wvp-pro-record' into wvp-28181-2.0
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
2022-03-04 15:39:30 +08:00
648540858
50c2a5a728 Revert "修复回放失败出现脏数据的问题以及添加拉流代理判断错误的问题"
This reverts commit 16e8aa323f.
2022-03-04 15:36:16 +08:00
648540858
cadd0ee038 Merge remote-tracking branch 'origin/wvp-pro-record' into wvp-28181-2.0
# Conflicts:
#	web_src/src/components/control.vue
2022-03-04 15:29:56 +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
16e8aa323f 修复回放失败出现脏数据的问题以及添加拉流代理判断错误的问题 2022-03-04 11:26:53 +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
2eb1ca2d94 国标录像支持多端同时播放 2022-03-03 15:57:28 +08:00
panll
ae83bd6d06
!8 update src/main/java/com/genersoft/iot/vmp/storager/dao/StreamProxyMapper.java.
Merge pull request !8 from 随波/N/A
2022-03-02 06:24:26 +00: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
1ea95d2b87 Merge branch 'wvp-28181-2.0' of https://github.com/648540858/wvp-GB28181-pro into wvp-28181-2.0 2022-03-01 17:48:21 +08:00
648540858
4c53b10737 解决对接中遇到的问题 2022-03-01 17:42:22 +08:00
SaltFish
bb1fada32c
Update StreamPushMapper.java 2022-03-01 14:33:04 +08:00
随波
e4e0cde16c
update src/main/java/com/genersoft/iot/vmp/storager/dao/StreamProxyMapper.java.
修改新建拉流代理时不保存“名称”字段问题
2022-02-28 15:31:50 +00:00
648540858
0cd86a79c2 修复设备删除 2022-02-28 10:39:51 +08:00
648540858
e94b99d11c 实现国标录像级联播放,优化点播流程,加快点播速度 2022-02-27 20:01:31 +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
c9bfdf2525 实现国标的级联录像查询 2022-02-24 21:10:34 +08:00
648540858
00afecac47 Merge branch 'wvp-28181-2.0' into wvp-pro-record 2022-02-24 17:18:36 +08:00
648540858
a42dda2bd3 规范数据库,添加必要约束,优化通道批量导入功能 2022-02-24 16:55:06 +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
0327d16021 优化级联平台删除 2022-02-17 15:33:25 +08:00
648540858
59c79c08e1 修复级联通道回复错误 2022-02-16 15:13:16 +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