WuPeng
|
bbf8ab9310
|
添加on_record_ts事件支持
|
2022-05-13 22:22:10 +08:00 |
648540858
|
9a80e10f6e
|
使用 java.time.Instant代替 java.util.Date
|
2022-05-13 22:15:31 +08:00 |
|
648540858
|
95642d0bb8
|
优化录像结束发送BYE判断
|
2022-05-13 21:10:02 +08:00 |
|
648540858
|
98e6cf5bae
|
优化海康录像下载
|
2022-05-13 21:05:33 +08:00 |
|
648540858
|
d571e44040
|
去除过时注释
|
2022-05-13 15:45:02 +08:00 |
|
648540858
|
4d3f0a8d79
|
优化海康国标录像播放的控制
|
2022-05-13 15:41:50 +08:00 |
|
648540858
|
1757203202
|
支持海康摄像头国标录像查看播放
|
2022-05-13 15:32:30 +08:00 |
mk1990
|
95b1cbba65
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-13 10:58:33 +08:00 |
|
648540858
|
4199650c20
|
#471
|
2022-05-12 18:15:35 +08:00 |
|
648540858
|
0781d9bc28
|
修复缺失的设备时间
|
2022-05-12 17:48:52 +08:00 |
|
mk1990
|
2d7a202096
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-12 16:16:55 +08:00 |
|
648540858
|
a030d00c88
|
修复代码
|
2022-05-12 10:48:50 +08:00 |
|
648540858
|
3cd1378d39
|
修复新设备注册
|
2022-05-12 10:24:08 +08:00 |
|
648540858
|
715ecb1d64
|
修复设备缺失的数据
|
2022-05-11 20:22:15 +08:00 |
|
648540858
|
f6893cf95b
|
优化设备在线状态
|
2022-05-11 18:37:24 +08:00 |
|
mk1990
|
6bab3b6740
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-10 18:02:09 +08:00 |
|
648540858
|
c395cf42d1
|
修复发流接口的调用
|
2022-05-10 11:01:33 +08:00 |
|
648540858
|
a1321c29c5
|
优化级联点播流程
|
2022-05-10 10:58:26 +08:00 |
|
648540858
|
93e6347f18
|
优化推流调用
|
2022-05-10 09:45:09 +08:00 |
|
648540858
|
bd21d0e391
|
优化目录获取并法能力
|
2022-05-10 09:38:05 +08:00 |
hotcoffie
|
ec8ab540f8
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-07 17:42:31 +08:00 |
|
648540858
|
36170df3f4
|
修复打包优化pom
|
2022-05-07 15:13:56 +08:00 |
|
mk1990
|
88db57697a
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-07 11:25:13 +08:00 |
|
648540858
|
523139143f
|
Merge pull request #468 from TristingChen/resetQuery--add
开发----增加预置位查询接口开发
|
2022-05-07 09:00:22 +08:00 |
|
mk1990
|
a2182b5a7b
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-06 17:46:01 +08:00 |
chenjialing
|
cc63a52884
|
开发----增加预置位查询接口开发
|
2022-05-06 17:44:56 +08:00 |
|
648540858
|
e218553685
|
去除多与引用
|
2022-05-06 17:29:24 +08:00 |
|
648540858
|
ee62f17170
|
统一userAgent
|
2022-05-06 15:55:32 +08:00 |
|
hotcoffie
|
bfaa519e49
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-06 10:59:33 +08:00 |
|
648540858
|
5d901b5e3f
|
使用阿里代码规范。规范代码写法
|
2022-05-06 10:12:34 +08:00 |
|
648540858
|
c286ecb455
|
使用阿里代码规范。规范代码写法
|
2022-05-05 17:07:16 +08:00 |
|
648540858
|
7f0ca85850
|
规范代码写法
|
2022-05-05 14:36:27 +08:00 |
|
648540858
|
ff3c30f32e
|
优化收到心跳设置设备上线的逻辑
|
2022-05-05 14:26:42 +08:00 |
|
mk1990
|
05a324a07a
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-05 08:43:10 +08:00 |
xiaoxie
|
260bfd5935
|
替换一个过时的API，解决maven打包警告
|
2022-05-01 21:32:43 +08:00 |
648540858
|
d679a9fcf8
|
添加对点播时设备自定义ssrc的支持
|
2022-04-28 17:28:51 +08:00 |
|
mk1990
|
a0537d74df
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-04-28 16:32:09 +08:00 |
|
648540858
|
a53fe7761f
|
Merge pull request #457 from J1031/bugfix/transaction_is_null
修复ServerTransaction空指针异常
|
2022-04-28 14:02:18 +08:00 |
|
648540858
|
420a87cfd7
|
优化对Parental字段的判断
|
2022-04-28 10:05:56 +08:00 |
|
648540858
|
4e0a463f88
|
优化对Parental字段的判断
|
2022-04-28 09:47:46 +08:00 |
quangz
|
effe71640d
|
修复ServerTransaction空指针异常
|
2022-04-27 18:51:47 +08:00 |
|
648540858
|
102aad1f5d
|
判空
|
2022-04-26 18:46:18 +08:00 |
|
648540858
|
363606d845
|
优化级联目录发送
|
2022-04-26 18:29:47 +08:00 |
|
648540858
|
9ce22eba3c
|
行政区划作为级联数据的处理,修复设备树的显示
|
2022-04-26 17:24:41 +08:00 |
|
mk1990
|
c88b0a8bd6
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-04-26 15:32:23 +08:00 |
|
648540858
|
0b6b72ae44
|
多级虚拟组织处理修复
|
2022-04-25 17:13:22 +08:00 |
|
648540858
|
a012007f36
|
多级虚拟组织处理修复
|
2022-04-25 17:12:29 +08:00 |
|
648540858
|
26c3ca6a21
|
对于虚拟目录中出现多级虚拟组织的情况进行处理
|
2022-04-25 16:55:38 +08:00 |
|
648540858
|
d4b05c11c0
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-04-24 16:34:21 +08:00 |
|
648540858
|
5dc08a45f8
|
增加redis通知方式向设备/平台发送报警消息功能
|
2022-04-24 16:33:59 +08:00 |
|
xiaoxie
|
bea61f909d
|
修复一处日志打印错误
|
2022-04-24 09:51:54 +08:00 |
|
648540858
|
92421b46cc
|
支持关闭地图功能，添加授权声明
|
2022-04-22 16:55:46 +08:00 |
|
648540858
|
1e2d207aea
|
添加优化后的地图页面，完全一处百度地图相关的api
|
2022-04-22 16:21:05 +08:00 |
|
mk1990
|
7d1116c892
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-04-21 13:34:50 +08:00 |
|
648540858
|
d7bfd9bfa7
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into map
|
2022-04-21 10:30:46 +08:00 |
|
648540858
|
f7236c4a90
|
添加公共组件设备树
|
2022-04-20 18:21:18 +08:00 |
|
xiaoxie
|
f635f9c300
|
修复录像列表：实测部分厂家（TP-Link IPC43AW）录像列表接口，返回的xml报文数据中有多余的空格，导致解析String为Integer失败，增加trim修复这个问题
|
2022-04-20 13:56:30 +08:00 |
|
648540858
|
088419b4d8
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into map
|
2022-04-20 09:38:09 +08:00 |
|
648540858
|
4d975c21da
|
优化国标级联目录推送，支持zlm新特性ssrc校验
|
2022-04-19 11:52:03 +08:00 |
|
648540858
|
9466bf5863
|
Merge pull request #437 from hotcoffie/wvp-28181-2.0
优化摄像头注册流程
|
2022-04-19 10:36:21 +08:00 |
|
648540858
|
91515f1b05
|
添加行政区划功能，修复目录发送数量统计的BUG
|
2022-04-18 17:38:49 +08:00 |
|
648540858
|
93d69d5476
|
添加国标级联目录分组分组加快通道传输速度
|
2022-04-18 16:16:49 +08:00 |
|
xiaoxie
|
6bb8f45e27
|
优化摄像头注册流程
|
2022-04-18 15:04:22 +08:00 |
|
648540858
|
20622d20d6
|
修复更新通道状态回复不准的问题
|
2022-04-18 12:55:54 +08:00 |
|
648540858
|
596a633d2e
|
修复更新通道日志显示
|
2022-04-18 12:45:19 +08:00 |
|
648540858
|
b8bb9c1b74
|
修复更新通道结束后释放慢的问题
|
2022-04-18 12:42:58 +08:00 |
|
648540858
|
d36920c699
|
添加自动拉起未推流设备的控制开关
|
2022-04-18 10:52:38 +08:00 |
|
mk1990
|
22e1d92a9d
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-04-18 09:32:20 +08:00 |
|
648540858
|
0dc1807f62
|
优化通道同步添加对SN的判断，精简代码
|
2022-04-17 19:48:05 +08:00 |
|
648540858
|
25102229f6
|
接收所有notify请求，即使没有订阅
|
2022-04-15 18:04:19 +08:00 |
mk1990
|
eef78c7873
|
同步使用临时方案解决更新通道调用百度API问题之前的内容
|
2022-04-15 17:05:26 +08:00 |
|
648540858
|
40a806329c
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into map
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/event/subscribe/SubscribeListenerForPlatform.java
|
2022-04-15 09:37:33 +08:00 |
|
648540858
|
e6ee7fe747
|
优化级联移动位置订阅位置更新
|
2022-04-14 16:52:48 +08:00 |
|
648540858
|
efc4a7bc8e
|
优化级联移动位置订阅位置更新
|
2022-04-13 17:59:21 +08:00 |
|
648540858
|
3955e6ed53
|
异步通道刷新，优化ui效果
|
2022-04-12 21:06:21 +08:00 |
|
648540858
|
c2e2e24551
|
优化通道刷新
|
2022-04-12 11:04:08 +08:00 |
|
648540858
|
40fb794798
|
使用临时方案解决更新通道调用百度API问题
|
2022-04-11 15:30:49 +08:00 |
|
648540858
|
fcf8c40150
|
默认推流通道始终在线
|
2022-04-11 14:59:31 +08:00 |
|
648540858
|
ba8633e99a
|
优化地图-添加地图页面以及设备树
|
2022-04-08 18:09:23 +08:00 |
|
648540858
|
81f1b8ee25
|
修复停止推流的参数组织方式
|
2022-04-08 16:30:39 +08:00 |
|
648540858
|
f10b458fc9
|
优化订阅信息的发送与取消订阅
|
2022-04-08 14:44:49 +08:00 |
|
648540858
|
f1c8ca602d
|
添加日志
|
2022-04-07 15:41:46 +08:00 |
|
648540858
|
8553769e76
|
补充xml缺失的编码信息
|
2022-04-07 14:22:41 +08:00 |
|
648540858
|
7ad28af0e3
|
补充xml缺失的编码信息
|
2022-04-07 14:21:21 +08:00 |
|
648540858
|
f7e39141db
|
修复重启服务后拉流代理回复失败的问题
|
2022-04-06 11:07:42 +08:00 |
|
648540858
|
c9f091d560
|
Merge pull request #419 from nikmu/wvp-28181-2.0
目录订阅推送问题，在线事件发送问题
|
2022-04-02 18:23:50 +08:00 |
|
648540858
|
c3b47fa734
|
修复启动报错
|
2022-04-02 17:09:33 +08:00 |
|
648540858
|
d42329a021
|
Merge pull request #426 from J1031/bugfix/map_modification_exception
修复ConcurrentModificationException
|
2022-04-02 14:34:41 +08:00 |
|
648540858
|
5ed44c3e09
|
支持级联云台控制
|
2022-04-02 14:13:32 +08:00 |
|
quangz
|
d883de7f9a
|
修复ConcurrentModificationException
|
2022-04-02 08:06:30 +08:00 |
|
648540858
|
2659f10551
|
去除无用引用
|
2022-04-01 17:44:43 +08:00 |
|
648540858
|
4ac63a158d
|
使用getHostAddress代替getHostName避免经过DNS时间过久
|
2022-04-01 17:13:11 +08:00 |
|
648540858
|
7e755f405d
|
支持国标移动位置订阅，收到新位置发送redis消息;支持通道redis消息拉起第三方推流;云台控制添加ControlPriority字段;处理sql的bug
|
2022-04-01 16:45:29 +08:00 |
朱俊杰
|
cb80119090
|
订阅查询错误和空指针
|
2022-03-31 09:19:45 +08:00 |
|
朱俊杰
|
b0e494b842
|
2个小bug
1、add update事件调用错误函数
2、在线的还发在线事件，如果别人正在给你推送目录就会不停的update设备表，设备表又没加锁，页面就无法更改设备信息了。。。
|
2022-03-29 17:31:41 +08:00 |
|
648540858
|
0de634cdf7
|
补充缺失的文件
|
2022-03-29 12:17:54 +08:00 |
|
648540858
|
1553b39b45
|
修复级联的国标通道无经纬度问题
|
2022-03-29 10:04:28 +08:00 |
|
648540858
|
60278ee6ad
|
修复国标目录发送缺失的问题
|
2022-03-28 11:03:17 +08:00 |
|
648540858
|
9aee7d42e3
|
兼容海康 媒体通知 消息from字段不是设备ID的问题
|
2022-03-25 18:05:05 +08:00 |
|
648540858
|
daab2586ca
|
优化国标级联上级要求tcp推流时的回复
|
2022-03-25 17:22:17 +08:00 |
|
648540858
|
7d9cc96ef5
|
优化国标录像下载，添加进度条以及自动合并文件下载，需要结合新版assist服务使用。
|
2022-03-25 16:05:14 +08:00 |
|
648540858
|
e9586687f7
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-03-25 10:01:12 +08:00 |
|
648540858
|
a77ba194ad
|
优化目录推送CivilCode值
|
2022-03-24 15:59:38 +08:00 |
|
648540858
|
2142b7ffcd
|
Merge pull request #379 from MeBetterMan/wvp-28181-2.0
级联场景，invite消息中获取channelid。以前从invite的第一行读取，现在从subject header读取。
|
2022-03-22 11:45:11 +08:00 |
|
648540858
|
bc1b8098a2
|
修身颠簸与录像回放redis前缀重复的问题
|
2022-03-21 16:58:42 +08:00 |
brewswang
|
7af3cb03ec
|
执法记录仪在更新目录数据的时候需要更新位置信息
|
2022-03-17 12:39:59 +08:00 |
|
648540858
|
59ef6e67d3
|
统一国标设备与级联平台字符集的使用
|
2022-03-17 10:29:49 +08:00 |
|
648540858
|
c8f9f19c38
|
#393
|
2022-03-16 17:46:24 +08:00 |
|
648540858
|
4a0fd9ead3
|
修复合并pr带来的bug
|
2022-03-16 16:55:04 +08:00 |
|
648540858
|
57e6cdefdf
|
#401
|
2022-03-16 16:46:18 +08:00 |
|
648540858
|
bf10cc1b35
|
Merge pull request #399 from nikmu/wvp-28181-2.0
修复device_channel的Id改变带来的tree查询bug
|
2022-03-16 16:42:50 +08:00 |
|
朱俊杰
|
ba3c38d7d3
|
去掉createinfo中的cseq参数
|
2022-03-16 11:21:39 +08:00 |
|
朱俊杰
|
b1c479b938
|
修复info请求头中的cseq序列
|
2022-03-16 11:18:09 +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 |
|
朱俊杰
|
70ada79c7a
|
修复device_channel的Id改变带来的tree查询bug
|
2022-03-15 16:31:06 +08:00 |
|
648540858
|
0dfce85d2f
|
必须提前在zlm上配置port_range属性，不然自动配置此属性可能不成功
|
2022-03-15 15:40:15 +08:00 |
|
648540858
|
ea08969bfc
|
使用zlm原生的rtp随机端口配置
|
2022-03-15 15:37:22 +08:00 |
|
648540858
|
0e69251281
|
修复多平台同时导入时的bug
|
2022-03-15 11:44:11 +08:00 |
|
648540858
|
11d40d3e22
|
#396
|
2022-03-15 10:47:07 +08:00 |
|
648540858
|
28e5c1ae05
|
修复平台编辑的bug
|
2022-03-15 10:13:19 +08:00 |
|
648540858
|
bde0e13682
|
#394
|
2022-03-14 18:34:25 +08:00 |
|
648540858
|
354a39961a
|
优化点播, 级联点播级联录像。级联列表显示订阅状态
|
2022-03-14 18:24:30 +08:00 |
|
648540858
|
1171cf1ea9
|
使用zlm新特性支持对与国标流关闭音频以加快拉流速度
|
2022-03-14 11:36:01 +08:00 |
|
648540858
|
61e91afd91
|
#390
|
2022-03-11 11:22:55 +08:00 |
|
648540858
|
1c95f1b4aa
|
移除多余字段
|
2022-03-11 11:22:47 +08:00 |
|
648540858
|
5cfaad2d6d
|
#376
|
2022-03-11 09:58:36 +08:00 |
|
648540858
|
4a22611320
|
优化目录订阅时父节点的更新
|
2022-03-11 09:54:35 +08:00 |
|
648540858
|
45e9fc880c
|
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0
|
2022-03-11 09:49:38 +08:00 |
|
648540858
|
c1d7f867c2
|
优化目录订阅以及国标级联目录订阅回复
|
2022-03-10 20:53:56 +08:00 |
dengming
|
f88c70d38c
|
删除重复字段，channelId字段查询了两次
|
2022-03-10 17:27:07 +08:00 |
|
dengming
|
bef7fb2440
|
修复关闭按需拉流无效的问题
|
2022-03-10 15:08:41 +08:00 |
Fang
|
bea63f67e7
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-03-07 14:21:29 +08:00 |
李防
|
335916f1f1
|
InviteRequestProcessor类中，channelid从invite消息的header subject获取，不再从第一行request line获取。原因是和第三方平台对接时，发送的invite消息第一行为国标平台编码而不是设备通道编码，导致报错通道不存在，返回404。
|
2022-03-07 14:20:27 +08:00 |
|
648540858
|
41616f726d
|
修复导入通道时无平台关联时的bug
|
2022-03-07 10:47:06 +08:00 |
|
648540858
|
ca79100b6f
|
优化失败的录像点播的ssrc释放逻辑
|
2022-03-07 01:23:23 +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
|
3dc1e0368e
|
修复合并分支造成的bug
|
2022-03-04 15:59:29 +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
|
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
|
28d7fd3b58
|
参数名错误
|
2022-03-03 16:54:47 +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 |
|
chenjialing
|
b225b53510
|
fixed--多节点管理zlm,wvp重启之后节点中的redis在线状态bug修复
|
2022-03-03 15:30:16 +08:00 |
|
648540858
|
6a4cdc36b1
|
修复正则×号是引起的错误
|
2022-03-02 18:11:43 +08:00 |
|
648540858
|
d73630c49f
|
修复bug
|
2022-03-02 15:04:24 +08:00 |
panll
|
0993bedb46
|
!11 修改内存泄露
Merge pull request !11 from ydpd/wvp-28181-2.0
|
2022-03-02 06:26:54 +00: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 |
|
panll
|
94af90fa14
|
!7 rPort 变更了HostAddres也要变
Merge pull request !7 from ckb_test/N/A
|
2022-03-02 06:23:31 +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 |
|
chenjialing
|
fe0b5c33f9
|
告警信息上报过程中，AlarmType存储失败的解决
|
2022-03-02 09:18:17 +08:00 |
ydpd
|
86f87c4665
|
修改内存泄露
|
2022-03-02 00:24:14 +08:00 |
|
ydpd
|
e66b839659
|
修改内存泄露
|
2022-03-02 00:02:03 +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
|
298d104fec
|
优化配置文件与日志
|
2022-03-01 21:59:31 +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 |
|
648540858
|
97698ee716
|
Merge pull request #346 from TristingChen/log-optimization
Log optimization
|
2022-03-01 17:37:19 +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
|
9c5b1060af
|
支持删除在线设备
|
2022-02-28 17:56:27 +08:00 |
ckb_test
|
6d454423a2
|
rPort 变更了HostAddres也要变
|
2022-02-28 09:07:02 +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 |
|
chenjialing
|
777f2e2121
|
日志优化--修改本地配置文件local的mysql连接方式
|
2022-02-25 09:54:18 +08:00 |
|
chenjialing
|
7852c4fde7
|
research--local文件
|
2022-02-25 09:36:05 +08:00 |
|
chenjialing
|
c8b9e590ef
|
日志优化--优化本地的日志记录方式，增加druid的sql的日志打印和监控面板，修改druid的配置方式
|
2022-02-25 09:23:46 +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
|
f4c03c1808
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-pro-record
|
2022-02-22 11:55:23 +08:00 |
|
648540858
|
e861c9dfab
|
Merge remote-tracking branch 'origin/master' into wvp-pro-record
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
|
2022-02-22 11:55:23 +08:00 |
|
648540858
|
2157bb0270
|
规范数据库，给各个标设置主键ID
|
2022-02-22 11:44:56 +08:00 |
|
648540858
|
0a44eb8965
|
增加配置将国标录像与其他录像分开
|
2022-02-20 17:33:17 +08:00 |
|
648540858
|
0b6587b1ad
|
增加配置将国标录像与其他录像分开
|
2022-02-20 17:29:03 +08:00 |
|
648540858
|
5bcd8495e0
|
兼容海康不规范的xml，大幅度提高通道分页查询速度，优化节点的保活。
|
2022-02-20 16:22:43 +08:00 |
|
648540858
|
b7635ec05d
|
优化级联通道发送速度
|
2022-02-20 16:18:14 +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 |
|
648540858
|
5528517471
|
Merge pull request #325 from nikmu/wvp-28181-2.0
新增实时监控功能
|
2022-02-15 09:13:03 +08:00 |
|
朱俊杰
|
54df5df031
|
mapper改用注释方式
|
2022-02-14 10:18:00 +08:00 |
|
648540858
|
b663a8ab41
|
Merge remote-tracking branch 'github/wvp-28181-2.0' into wvp-28181-2.0
|
2022-02-11 18:01:58 +08:00 |
|
648540858
|
bf66f8f694
|
推流导入支持添加平台信息与目录信息
|
2022-02-11 16:45:06 +08:00 |
|
朱俊杰
|
37a84e6691
|
新增实时监控功能
左边是设备通道树，右边是分屏预览
|
2022-02-10 14:45:33 +08:00 |