aunix/wvp-GB28181-pro
1
0
Fork 0
mirror of https://gitee.com/pan648540858/wvp-GB28181-pro.git synced 2026-05-17 02:57:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,117 Commits 27 Branches 1 Tag 209 MiB
3e162ea358
Commit Graph

2953 Commits

Author SHA1 Message Date
648540858
bf9262283e 优化报警推送 2024-10-28 17:53:27 +08:00
648540858
c25807f65d 优化设备控制命令处理流程 2024-10-28 14:50:42 +08:00
648540858
183d87b9b6 优化GPS内容的REDIS缓存存取 2024-10-28 09:19:49 +08:00
648540858
296cf1e3fe 调整推流鉴权信息的RedisKEY 2024-10-27 23:45:31 +08:00
648540858
fe3f4f029e 优化推流鉴权信息的Redis缓存策略 2024-10-27 21:25:05 +08:00
648540858
03090c7260 提升Catalog数据入库速度 2024-10-27 20:21:55 +08:00
648540858
16b1bf6819 提升Catalog查询回复处理速度 2024-10-26 23:28:41 +08:00
648540858
22fcab375f 提升Catalog查询回复处理速度 2024-10-26 23:28:32 +08:00
648540858
fee8d2f8cd 优化Catalog查询内存占用高的问题 2024-10-26 23:15:18 +08:00
648540858
6fc8db8bd0 优化INVITE事务REDIS缓存存取 2024-10-25 18:03:30 +08:00
648540858
059635c2cc 修复国标点播缓存启动未清理的BUG 2024-10-25 17:41:50 +08:00
648540858
ef66bd8781 移除无用方法和变量 2024-10-25 15:08:05 +08:00
648540858
683381b995 优化点播停止流程 2024-10-25 15:05:10 +08:00
648540858
0e1267ef00 修复状态设置错误 #1658 2024-10-25 14:47:17 +08:00
648540858
34cc8251e2 优化国标设备点播的信息的Redis缓存策略 2024-10-25 14:46:51 +08:00
648540858
193f80963d 优化国标设备的Redis缓存策略 2024-10-24 18:32:37 +08:00
648540858
7abafef230 优化媒体节点的Redis缓存策略 2024-10-24 18:25:55 +08:00
648540858
b3debde31b 暂时移除通道列表子节点数量展示,目前无法正确统计 2024-10-24 18:12:47 +08:00
648540858
e5faad8b8d 暂时移除通道列表子节点数量展示,目前无法正确统计 2024-10-24 18:04:53 +08:00
648540858
af27ae0dfc 优化启动后从redis查询推流设备状态 2024-10-24 16:56:37 +08:00
648540858
bf3e181bdb 修复节点上线和下线时未清理redis流信息的BUG 2024-10-24 16:41:41 +08:00
648540858
0ddc374c34 修复多zlm节点上线时的空指针异常+单端口收流未设置到zlm的BUG 2024-10-24 15:55:38 +08:00
648540858
2cd21a26d4 修复国标级联点播未使用自动自定义SSRC的BUG 2024-10-24 10:04:38 +08:00
648540858
222c9eade5 优化引起误解的日志 2024-10-23 16:44:04 +08:00
648540858
1710a63fc8 修复国标级联语音对讲 2024-10-23 16:38:06 +08:00
648540858
93de123330 修复网页语音对讲 2024-10-23 15:20:34 +08:00
648540858
cb39593a79 优化REDIS消息高并发处理 #1578 2024-10-23 14:46:57 +08:00
648540858
a316a12187 修复推流设备位置信息入库以及页面添加位置信息展示 2024-10-23 14:25:14 +08:00
648540858
9b81f8d70d
Merge pull request #1653 from Klu5ure/master 
修正拼写错误：重命名 `ZLMMediaServerStatusManger` 为 `ZLMMediaServerStatusManager`，`node_manger.md` 为 `node_manager.md`
 2024-10-23 09:59:40 +08:00
648540858
1dde0a0225 Merge remote-tracking branch 'origin/master' 2024-10-23 09:58:14 +08:00
648540858
02ab2ba311 修复通道重新编码后分屏播放失败的BUG 2024-10-23 09:57:44 +08:00
648540858
3f330aeb37 优化查询截图时无截图时默认返回204 2024-10-22 23:10:26 +08:00
648540858
2be43429fb 修复码流类型的设置与重置 2024-10-22 22:54:37 +08:00
648540858
92ccadf4bf 优化收到心跳时地址是否变化的判断 2024-10-22 17:54:10 +08:00
648540858
d2fc2df77b 优化通道刷新的时接收下级消息的效率 2024-10-22 17:41:42 +08:00
648540858
53f2f36f37 修复国标设备/设备列表中业务分组的子节点查看 2024-10-22 17:21:08 +08:00
648540858
4c497ef411 修复国标设备/设备列表中行政区划的子节点查看 2024-10-22 16:27:53 +08:00
Klu5ure
22d6350778 修正拼写错误：重命名 ZLMMediaServerStatusManger 为 ZLMMediaServerStatusManager，node_manger.md 为 node_manager.md 2024-10-21 18:12:16 +08:00
648540858
1671716480 修复多网卡监听点播失败的BUG 2024-10-21 18:05:13 +08:00
648540858
189e56c839 优化部分redis scan查询 2024-10-21 17:42:26 +08:00
648540858
9506bef6cb 移除未使用的方法 2024-10-21 12:36:37 +08:00
648540858
022b16dbbe 通道树支持展示在线离线状态 2024-10-21 12:29:15 +08:00
Klu5ure
fa8374b68f 修复设备通道SQL查询中的字段名错误 2024-10-21 10:47:50 +08:00
648540858
36409eb34c 修复默认新建设备未设置节点策略的BUG 2024-10-21 09:27:36 +08:00
648540858
13b896ce23 修复启动异常 2024-10-21 06:57:53 +08:00
648540858
7d669f74ec 修复行政区划未移除的问题 2024-10-20 14:55:00 +08:00
648540858
d7c1023e9d 修复行政区划未插入的问题 2024-10-20 08:13:01 +08:00
648540858
7430679d57 修复通用通道国标点播重复点播的BUG 2024-10-20 07:16:12 +08:00
648540858
321b1b98fb 去除多余日志 2024-10-19 20:30:18 +08:00
648540858
91e671ec4b 修复消息超时未回复误报 2024-10-19 20:27:42 +08:00
648540858
f62b655602 合并主线 2024-10-19 19:59:14 +08:00
648540858
46fa390387 临时提交 2024-10-19 00:04:32 +08:00
648540858
277f2db137 Merge branch 'master' into 重构/1078 
# Conflicts:
#	pom.xml
#	src/main/java/com/genersoft/iot/vmp/gb28181/bean/CommonGBChannel.java
#	src/main/java/com/genersoft/iot/vmp/jt1078/codec/decode/Jt808Decoder.java
#	src/main/java/com/genersoft/iot/vmp/jt1078/codec/netty/Jt808Handler.java
#	src/main/java/com/genersoft/iot/vmp/jt1078/codec/netty/TcpServer.java
#	src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/Re.java
#	src/main/java/com/genersoft/iot/vmp/media/service/IMediaNodeServerService.java
#	src/main/java/com/genersoft/iot/vmp/media/service/IMediaServerService.java
#	src/main/java/com/genersoft/iot/vmp/media/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaNodeServerService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/utils/CivilCodeUtil.java
#	src/main/resources/application.yml
#	web_src/src/layout/UiHeader.vue
#	web_src/src/router/index.js
 2024-10-18 13:55:23 +08:00
648540858
cbd6a57e15 修复语音对讲接口空指针异常 2024-10-16 17:53:14 +08:00
648540858
2492b0d638 修复 SiP消息超时未未回复无法识别的BUG 2024-10-16 17:17:17 +08:00
648540858
b9738c6bfc 修复 角色查询中的重复调用 #1496 2024-10-15 17:17:10 +08:00
648540858
a87538cb5a 修复SDP package中 o 选项代码不是本地SIP ID而是请求资源的ID #1513 2024-10-15 16:21:00 +08:00
648540858
d9eb0bb08b 修复MobilePosition的更新问题 #1643 2024-10-15 15:34:53 +08:00
648540858
c96119176c Merge remote-tracking branch 'origin/master' 2024-10-15 15:06:35 +08:00
648540858
278df87c07 设备支持根据编号搜索 2024-10-15 15:06:18 +08:00
Kairlec
feb08dfc4a
修复当注销流时没有与之关联的国标通道时会出现的NPE 2024-10-15 14:53:13 +08:00
648540858
a59854e244 更新前端截图 2024-10-12 10:42:30 +08:00
648540858
3078162c58 优化文档, 优化notify-catalog大并发处理 2024-10-11 15:24:46 +08:00
648540858
3f85c66328 补充文档, 修复通道查询错误 2024-10-10 14:48:53 +08:00
648540858
225a444f9b 去除非当前版本使用的字段 2024-10-07 15:19:00 +08:00
648540858
145785e881 去除非当前版本使用的字段 2024-10-07 15:07:29 +08:00
648540858
661e300dcb 复用查询sql 2024-10-06 15:43:12 +08:00
648540858
e44c098cfb 屏蔽地理坐标系字段 2024-10-06 14:17:29 +08:00
648540858
cdea514705 优化重复sql 2024-09-29 14:44:29 +08:00
648540858
c9d14bb23b 减少重复sql 2024-09-28 23:15:02 +08:00
648540858
8ef8773db6 调整国标级联时设备信息的获取 2024-09-28 14:04:43 +08:00
648540858
b4688f53dc Merge remote-tracking branch 'origin/dev/master-通道结构重构' into dev/master-通道结构重构 2024-09-28 12:48:05 +08:00
648540858
55001e42d6 调整国标通道判断逻辑 2024-09-28 12:45:40 +08:00
648540858
726380cec4 修复行政区划树以及业务分组树的自动展开 2024-09-27 11:17:45 +08:00
648540858
c3267403ba 优化分组树，行政区划树的展示 2024-09-26 15:57:55 +08:00
648540858
97b0616039 修复redis mobileposition 消息发送 2024-09-26 14:52:01 +08:00
648540858
249bdf69be 合并271 notify消息优化 2024-09-26 14:46:08 +08:00
648540858
394cf7ee4e 临时提交 2024-09-26 08:55:45 +08:00
648540858
9a9caed0a6 修复多个wvp推流是国标级联的点播 2024-09-25 16:05:04 +08:00
648540858
af7873a62c 临时提交 2024-09-25 15:47:41 +08:00
648540858
76d3a5d8e4 临时提交 2024-09-25 15:42:04 +08:00
648540858
abcaa32cec 调整日志 2024-09-25 14:47:30 +08:00
648540858
92f880163a 临时提交 2024-09-25 14:43:22 +08:00
648540858
29e6bf96a1 临时提交 2024-09-25 14:42:47 +08:00
648540858
59a52705cf 临时提交 2024-09-25 14:32:09 +08:00
648540858
6f587bea5d 修正国标级联设备控制逻辑 2024-09-24 21:57:30 +08:00
648540858
4d1173f70f 修正国标级联设备控制逻辑 2024-09-24 21:55:08 +08:00
648540858
03a7daffad 修正国标级联消息处理中根据通道ID获取通道信息 2024-09-24 21:38:34 +08:00
648540858
4f52333506 临时提交 2024-09-24 16:25:21 +08:00
648540858
3b2a28fd00 移除旧的数据库操作类 2024-09-24 15:59:47 +08:00
648540858
632b1f3e53 修复错别字 2024-09-24 15:44:48 +08:00
648540858
c28dacecf2 修复国标级自定编号后录像查询 2024-09-24 15:24:54 +08:00
648540858
ff2b81b546 修复国标级自定编号后点播 2024-09-24 15:17:50 +08:00
648540858
92b9c3042f 修复国标级联设备控制，包括云台控制，告警控制，强制关键帧，拉框放大，拉框缩小，看守位 2024-09-24 12:30:54 +08:00
648540858
1a890b5e17 修复国标级联录像回放控制 2024-09-24 11:00:42 +08:00
648540858
f7936117f9 修复通道编辑重置 2024-09-20 15:55:40 +08:00
648540858
77f1dfb6d6 修复REDIS更新推流设备状态 2024-09-19 17:21:38 +08:00
648540858
89650c6d89 修复NOTIFY消息更新通道 2024-09-19 17:11:21 +08:00
648540858
f205a86c31 修复未判断UsePushingAsStatus设置导致推流结束时推流通道离线 2024-09-19 16:59:18 +08:00
648540858
f38c86092d 修复NOTIFY消息通道信息的更新 2024-09-19 16:23:11 +08:00
648540858
43a2344ad0 修复NOTIFY消息中通道的状态变化 2024-09-19 16:20:03 +08:00
648540858
dc12bcf8f1 修复通道共享的类型选择 2024-09-19 15:55:44 +08:00
648540858
d925f9003d 修复国标平台保存 2024-09-19 15:39:13 +08:00
648540858
1b33afc0ea 修复通道列表音频开关 2024-09-19 11:09:37 +08:00
648540858
91c4677de4 修复通道列表音频开关 2024-09-19 10:03:32 +08:00
648540858
2f9dc36405 临时提交 2024-09-19 09:09:02 +08:00
648540858
a6b436af29 临时提交 2024-09-18 17:33:29 +08:00
648540858
f89933fb58 修复138类型默认打开音频 2024-09-18 16:14:13 +08:00
648540858
5bc0ff09eb 修复兼容接口数据内容 2024-09-18 16:08:13 +08:00
648540858
c4076ed393 修复旧版本拉流代理的兼容接口 2024-09-18 14:32:40 +08:00
648540858
0c642f3b58 修复postgresql下的行政区划导入 2024-09-18 11:09:40 +08:00
648540858
550b90b157 Merge branch 'master' into dev/master-通道结构重构 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
 2024-09-18 09:10:12 +08:00
648540858
80912d8a2c 临时提交 2024-09-14 17:50:05 +08:00
648540858
800d6c926a 修复数据库语法兼容以及redis接收推流信息导入 2024-09-14 15:19:07 +08:00
hx
f6eeb59371 修复端口初始化wssSslPort获取失败 
修复字符集空指针异常导致心跳的错误
 2024-09-14 15:16:47 +08:00
648540858
a36c427394 sip默认使用nio方式 2024-09-14 09:07:13 +08:00
648540858
614ff4c71e 优化短的录像文件的下载 2024-09-13 15:43:22 +08:00
648540858
875285418b 修复编辑通道编号后无法点播的BUG 2024-09-13 15:06:11 +08:00
648540858
fa063b3fda 修复刷新通道 2024-09-13 10:19:18 +08:00
648540858
76ef652e7c 优化分屏监控 2024-09-12 17:49:16 +08:00
648540858
525f325d2b 临时提交 2024-09-11 22:25:05 +08:00
648540858
36f94593a4 临时提交 2024-09-11 17:55:27 +08:00
648540858
e078360928 修复语音对讲 2024-09-11 16:59:52 +08:00
648540858
91a8dc59a8 临时提交 2024-09-10 23:04:47 +08:00
648540858
09c668f017 修复国标级联点播 2024-09-10 22:33:38 +08:00
648540858
1b34787d3a 临时提交 2024-09-10 17:47:58 +08:00
648540858
3140672e63 修复国标录像下载 2024-09-10 16:50:54 +08:00
648540858
7cc4c9d14a 临时提交 2024-09-09 17:56:46 +08:00
648540858
2e90344c89 临时提交 2024-09-09 11:16:02 +08:00
648540858
489fbe31a5 临时提交 2024-09-09 00:07:00 +08:00
648540858
3fafe83e88 临时提交 2024-09-07 22:37:32 +08:00
648540858
cc302be2f2 临时提交 2024-09-07 22:27:32 +08:00
648540858
b7e96de36a 临时提交 2024-09-07 00:04:36 +08:00
648540858
d472ed4485 临时提交 2024-09-06 18:00:57 +08:00
648540858
da441a67f8 临时提交 2024-09-06 17:56:24 +08:00
648540858
26919170f4 临时提交 2024-09-05 17:59:17 +08:00
648540858
568abbcd9d 临时提交 2024-09-04 23:06:27 +08:00
648540858
ad5b66eb71 临时提交 2024-09-04 18:01:54 +08:00
648540858
9a0f1512c9 临时提交 2024-09-04 10:49:34 +08:00
648540858
4597fb197d 临时提交 2024-09-04 10:30:26 +08:00
648540858
fa47f619ba 临时提交 2024-09-03 18:00:35 +08:00
648540858
de0ad2b32e 修复国标级联点播通道编号重复异常 2024-08-29 18:04:16 +08:00
648540858
0416b76ed0 国标级联支持搜索 2024-08-29 17:18:22 +08:00
648540858
8dc27d1353 国标级联通道共享支持自定义通道编号和名称 2024-08-29 16:47:46 +08:00
648540858
e55cd08b08 国标级联通道共享支持按照设备添加共享和移除共享 2024-08-29 11:08:42 +08:00
648540858
1efb5fca0f 临时提交 2024-08-28 18:00:42 +08:00
648540858
ddf917d127 临时提交 2024-08-28 17:10:53 +08:00
648540858
64e9b6674f 修复通道共享的BUG以及增加通道手动推送的功能 2024-08-28 16:04:48 +08:00
648540858
dd794d4868 临时提交 2024-08-27 17:56:49 +08:00
648540858
c45bf5d6af 国标级联通道共享重构完善 2024-08-26 17:16:04 +08:00
648540858
5216e9723c 临时提交 2024-08-24 21:54:59 +08:00
648540858
5a259aaa63 临时提交 2024-08-24 00:18:54 +08:00
648540858
d2654660cb 临时提交 2024-08-23 17:50:29 +08:00
648540858
5169eb66a3 临时提交 2024-08-23 11:25:45 +08:00
648540858
0722aa3aeb 临时提交 2024-08-22 18:05:57 +08:00
648540858
6fcf05e04b 临时提交 2024-08-21 17:59:58 +08:00
648540858
a18fba8495 临时提交 2024-08-21 17:40:01 +08:00
648540858
88abf36d6f 临时提交 2024-08-18 23:01:02 +08:00
648540858
160a5d84c3 修复目录推送的BUG 2024-08-17 22:49:40 +08:00
648540858
9247c7e805 完善国标级联点播推流，拉流代理，国标 2024-08-17 22:31:13 +08:00
648540858
20f93d52d7 临时提交 2024-08-17 20:49:07 +08:00
panlinlin
4dd656b29b 完善目录推送 2024-08-17 08:02:39 +08:00
panlinlin
635458d19a 临时提交 2024-08-17 07:01:40 +08:00
648540858
aeb3cd6a22 临时提交 2024-08-16 17:59:53 +08:00
648540858
326025ee85 完成通道共享 2024-08-16 16:23:54 +08:00
panlinlin
976c089b7f 临时提交 2024-08-15 23:45:00 +08:00
648540858
abed3ecbec 临时提交 2024-08-15 17:45:24 +08:00
panlinlin
1cbd8d677c 临时提交 2024-08-15 00:03:53 +08:00
648540858
cce1d1de40 重构INVITE消息处理中的上级点播请求 2024-08-14 17:19:19 +08:00
648540858
d5621f9489 临时提交 2024-08-13 18:03:34 +08:00
648540858
ad240ba9a4 优化国标级联点播逻辑 2024-08-13 17:57:25 +08:00
648540858
213b218efa 临时提交 2024-08-12 18:00:06 +08:00
648540858
9a4a81a90e 临时提交 2024-08-12 15:30:01 +08:00
648540858
5ff232150d Merge remote-tracking branch 'origin/dev/master-通道结构重构' into dev/master-通道结构重构 2024-08-12 09:55:10 +08:00
648540858
bfa2c1b2e8 临时提交 2024-08-12 09:54:50 +08:00
panlinlin
0177831e86 临时提交 2024-08-11 23:20:42 +08:00
panlinlin
76a0d248ef 临时提交 2024-08-10 23:27:21 +08:00
648540858
baeffa4311
Merge pull request #1559 from koisi-io/fix 
[bugfix]修复前面几次合并所遗漏的一些问题
 2024-08-10 20:59:52 +08:00
648540858
2464052add
Merge pull request #1565 from mylvlin/master 
修复在ORACLE,达梦等数据库下的用户查询BUG
 2024-08-10 20:59:27 +08:00
648540858
d8d9f76d89 支持多WVP的推流播放 2024-08-09 17:55:39 +08:00
648540858
16708e385b 支持多WVP的推流播放 2024-08-09 16:27:08 +08:00
648540858
7f8a15f017 优化收到目录时的分组信息处理 2024-08-09 11:08:40 +08:00
panlinlin
a1671c3c3e 临时提交 2024-08-08 23:44:03 +08:00
648540858
8ab88c0f02 临时提交 2024-08-08 22:43:37 +08:00
648540858
9aad6ac719 临时提交 2024-08-08 17:47:08 +08:00
panlinlin
3e220a2c1e 临时提交 2024-08-07 23:45:29 +08:00
648540858
5abf5012eb 完善分组通道管理 2024-08-07 17:12:39 +08:00
648540858
a3f7753b84 Merge branch 'refs/heads/master' into dev/master-通道结构重构 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java
#	web_src/src/components/PushVideoList.vue
 2024-08-07 11:17:34 +08:00
648540858
c88681c7ad 合并分支 2024-08-07 10:41:54 +08:00
648540858
d97accee4a 临时提交 2024-08-06 16:55:33 +08:00
linshunhua
402ffa0b1e 修复在ORACLE,达梦等数据库下的用户查询BUG 2024-08-06 16:52:22 +08:00
koisi
5772d3f231
修复 87c071:合并271分支 的参数遗漏 
将推流信息记录至redis，由StreamPushItem变更成OnStreamChangedHookParam时，漏了设置serverId。
 2024-08-05 18:59:02 +08:00
648540858
ce0f0c4ac8 临时提交 2024-08-05 17:59:20 +08:00
koisi
c1a8e62f23
修复6月25日合并271时，变量类型未同步更新的问题 
处理ZLM推拉流事件的参数由StreamPushItem变更成OnStreamChangedHookParam了，然后有个地方没有同步更新。
 2024-08-05 17:04:58 +08:00
panlinlin
96bbd19e81 临时提交 2024-08-05 08:00:16 +08:00
panlinlin
18c51919a3 临时提交 2024-08-02 23:47:44 +08:00
648540858
91b8e7a595 临时提交 2024-08-02 17:48:32 +08:00
648540858
55c534ac90 临时提交 2024-08-02 14:46:20 +08:00
648540858
3f2c9f6451 临时提交 2024-08-01 17:50:34 +08:00
648540858
f7c98301ac 临时提交 2024-08-01 15:29:51 +08:00
Iwan Lebron
c7c94ee73d
修复 ZLMServerFactory 日志不打印 2024-08-01 14:47:43 +08:00
648540858
7ee3cdb801 完善行政区划管理 2024-07-31 15:07:54 +08:00
648540858
3ce973d2ee 临时提交 2024-07-30 17:58:18 +08:00
648540858
112cb2dfd8 临时提交 2024-07-29 17:44:34 +08:00
panlinlin
e285257f24 临时提交 2024-07-28 07:36:20 +08:00
648540858
8169983f21 临时提交 2024-07-28 06:19:18 +08:00
648540858
b246fd6a20 临时提交 2024-07-26 17:53:10 +08:00
648540858
a2b00a4f4e 临时提交 2024-07-25 18:02:22 +08:00
648540858
5a812e7f08 临时提交 2024-07-24 17:54:19 +08:00
648540858
6bd0cdd37b 临时提交 2024-07-23 18:00:47 +08:00
648540858
05fabc87a2 临时提交 2024-07-22 18:00:01 +08:00
648540858
ff5ba1698a Merge branch 'refs/heads/master' into dev/master-通道结构重构 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
 2024-07-22 14:29:54 +08:00
648540858
b7d671e6d9 优化录像下载流程 2024-07-22 14:21:23 +08:00
648540858
c96c29776d 临时提交 2024-07-22 14:20:40 +08:00
648540858
2f4d983f9f 修复拉流看方式回显 2024-07-22 11:07:58 +08:00
panlinlin
0b7d55ed74 修复拉流代理相关问题 2024-07-20 23:31:38 +08:00
panlinlin
80ac701748 临时提交 2024-07-20 06:44:53 +08:00
panlinlin
d201be2f88 修复设备初次注册无通道 2024-07-20 06:35:42 +08:00
panlinlin
1dc0cb0c83 临时提交 2024-07-19 20:29:10 +08:00
648540858
9f4e66a38b 优化拉流代理 2024-07-19 17:54:14 +08:00
648540858
78088ba53f 临时提交 2024-07-18 18:00:45 +08:00
648540858
4e6f7f8385
Merge pull request #1533 from wendy512/bugfix 
解决国标视频回放判断streamMode时空指针异常问题
 2024-07-18 14:09:15 +08:00
648540858
f331b0b0d3
Merge pull request #1524 from ZhaoYandong00/master 
修复在docker中使用，平台信息IP无法显示主机IP的问题
 2024-07-18 14:08:05 +08:00
wendy512
7732a1d180 解决国标视频回放判断streamMode时空指针异常问题 2024-07-18 13:40:47 +08:00
648540858
e46ad4e66a 临时提交 2024-07-17 17:56:26 +08:00
648540858
8c95485504 修复推流信息播放 2024-07-16 17:44:27 +08:00
648540858
d7abe7fb75 适配推流列表信息 2024-07-16 17:33:18 +08:00
648540858
90d298f7a7 临时提交 2024-07-15 17:59:41 +08:00
648540858
1dcb912910 调整推流导入的数据格式 2024-07-15 17:52:27 +08:00
648540858
d9c0d0637c 增加通道编辑以及通道重置功能 2024-07-15 17:39:47 +08:00
648540858
9d37e96f06 修复空指针异常 2024-07-15 16:30:21 +08:00
648540858
cb403689b4 添加通道编号构建页面 2024-07-12 17:52:05 +08:00
panlinlin
0853d7e842 临时提交 2024-07-11 23:52:34 +08:00
648540858
6619c5c53d 临时提交 2024-07-11 18:25:16 +08:00
648540858
a084fac7cd 优化通道数据显示 2024-07-10 17:33:04 +08:00
648540858
6ecf8af6ca 优化通道数据异常时的入库逻辑 2024-07-10 15:58:26 +08:00
648540858
b843958ed7 临时提交 2024-07-10 14:43:22 +08:00
648540858
bb609b7e09 临时提交 2024-07-10 10:51:35 +08:00
panlinlin
e73fb64283 临时提交 2024-07-10 00:12:45 +08:00
panlinlin
aa9397ca21 临时提交 2024-07-10 00:07:01 +08:00
648540858
61b811e701 临时提交 2024-07-09 18:00:44 +08:00
648540858
046e7802f3 临时提交 2024-07-09 17:55:51 +08:00
648540858
2235caca36 临时提交 2024-07-08 18:00:44 +08:00
648540858
4912ce16ec 临时提交 2024-07-08 17:44:35 +08:00
ZhaoYandong00
d1af677fff
修复在docker中使用，平台信息IP无法显示主机IP的问题 
配置sip,showip用来显示主机IP
 2024-07-08 16:34:29 +08:00
648540858
7b7512f84d 临时提交 2024-07-08 15:10:02 +08:00
648540858
fe921b860a Merge branch 'refs/heads/master' into dev/master-通道结构重构 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/resources/application.yml
 2024-07-08 14:09:48 +08:00
648540858
cf5ca3afb9 修复设备断网导致超时的空指针异常 2024-07-08 11:40:37 +08:00
panlinlin
052bbf16c3 临时提交 2024-07-07 07:28:54 +08:00
648540858
52aa4e6e85 实现GbChannelServiceImpl 2024-07-05 17:22:21 +08:00
648540858
1cb1b0bd36 临时提交 2024-07-04 18:00:41 +08:00
648540858
7936194718 调整数据库字段 2024-07-04 16:55:42 +08:00
648540858
b98cfd1fed 使用Slf4j注解打印日志 2024-07-03 17:24:35 +08:00
648540858
adf040ec4b 优化日志以及属性设置代码 2024-07-03 17:09:49 +08:00
648540858
799932f614 优化日志以及属性设置代码 2024-07-03 16:14:18 +08:00
648540858
10c852c00d 优化目录信息内容构建 2024-07-02 16:35:03 +08:00
648540858
324fef2908 临时提交 2024-07-01 17:59:14 +08:00
648540858
2c7dfa03a8 适配拉流代理 2024-07-01 17:13:12 +08:00
648540858
d1df17c007 适配拉流代理 2024-07-01 17:12:43 +08:00
panlinlin
e531e497c8 临时提交 2024-06-29 23:35:26 +08:00
panlinlin
69e7ab5439 临时提交 2024-06-29 12:01:42 +08:00
panlinlin
97bc8766bc 临时提交 2024-06-28 22:15:42 +08:00
648540858
b630190e30 临时提交 2024-06-28 18:06:09 +08:00
panlinlin
019af90f6e 临时提交 2024-06-28 07:36:28 +08:00
panlinlin
9c0e69c6c5 临时提交 2024-06-28 06:48:49 +08:00
panlinlin
7847bd6614 临时提交 2024-06-27 23:38:13 +08:00
panlinlin
03497c55f0 Merge branch 'refs/heads/master' into 1078 
# Conflicts:
#	src/main/resources/application.yml
 2024-06-27 21:52:59 +08:00
648540858
88c021948f 临时提交 2024-06-27 18:41:58 +08:00
648540858
b2aa5c839d 临时提交 2024-06-27 17:51:13 +08:00
648540858
400eef2d2e 临时提交 2024-06-27 16:02:43 +08:00
648540858
1616a2a731 Merge remote-tracking branch 'gitee-c/dev/master-通道结构重构' into dev/master-通道结构重构 2024-06-26 18:41:37 +08:00
648540858
f32eb14125 临时提交 2024-06-26 18:36:32 +08:00
648540858
81049b5a9e 临时提交 2024-06-25 17:46:33 +08:00
648540858
7255e5a887 临时提交 2024-06-25 16:59:22 +08:00
648540858
e4c11bfebe Merge branch 'refs/heads/master' into dev/master-通道结构重构 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestForCatalogProcessor.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
#	src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
 2024-06-25 16:46:47 +08:00
648540858
68fce9177f 临时提交 2024-06-25 16:45:31 +08:00
648540858
87c071fd5e 合并271分支 2024-06-25 10:24:35 +08:00
648540858
57a230afb3 Merge branch 'refs/heads/2.7.1' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
 2024-06-25 09:45:34 +08:00
panlinlin
b22e894e94 1078-通道信息增加数据库ID 2024-06-21 21:46:55 +08:00
panlinlin
282e0db96e 1078-调整通道信息 2024-06-21 21:30:15 +08:00
panlinlin
397ac956de 调整通用通道的位置 2024-06-21 16:05:13 +08:00
648540858
050882d6a6 修复推流时存入推流数据的问题 2024-06-20 22:35:48 +08:00
648540858
306c42b4b7 临时提交 2024-06-20 22:29:50 +08:00
648540858
246c01b1c8 重命名通道信息 2024-06-20 20:49:17 +08:00
648540858
40bf2d6642 添加通道信息 2024-06-20 20:24:15 +08:00
648540858
e0c957a0c5 Merge branch 'refs/heads/master' into dev/master-通道结构重构 2024-06-20 20:06:01 +08:00
648540858
5e82aa5f39 优化拉流代理国标级联点播 2024-06-20 20:04:48 +08:00
648540858
5c40608458 临时提交 2024-06-20 20:04:29 +08:00
648540858
45410d8091 优化拉流代理国标级联点播 2024-06-20 19:46:48 +08:00
648540858
099c65ff40 调整点播默认超时时间为10秒 2024-06-20 19:30:25 +08:00
648540858
6e4268a670 调整推流数据写入redis 2024-06-20 18:12:35 +08:00
panlinlin
5db39a2265 1078-完善接入国标通道页面以及属性 2024-06-20 06:21:20 +08:00
648540858
f5abf8df4c 修改排序 2024-06-19 16:00:26 +08:00
648540858
afe80a7be1 调整获取监听信息的逻辑 2024-06-18 10:00:32 +08:00
panlinlin
358799a391 1078-添加接入国标通道页面以及属性 2024-06-18 05:55:42 +08:00
648540858
1909c7f71f 调整参数名称 2024-06-17 10:08:09 +08:00
648540858
b1d9ea8082
Merge pull request #1492 from iwanlebron/master 
修复参数名称
 2024-06-17 10:06:51 +08:00
panlinlin
4ba04661ab 1078-添加接入国标通道表 2024-06-16 09:14:35 +08:00
panlinlin
36e15c80b0 1078-增加位置信息并发处理能力 2024-06-16 06:41:57 +08:00
648540858
107caf1171 调整前端使用转码后的流 2024-06-14 17:24:57 +08:00
648540858
f3ea07bdcd 调整转码后的流的输出位置 2024-06-14 17:03:55 +08:00
648540858
449b215367 Merge branch 'refs/heads/master' into dev/abl支持 2024-06-14 09:47:27 +08:00
648540858
aa56bb3c26 优化docker内ip变化的情况 2024-06-14 09:47:19 +08:00
panlinlin
b034faad62 Merge branch 'refs/heads/master' into dev/abl支持 2024-06-14 00:04:04 +08:00
panlinlin
07a8ef9e25 SIP只有一个监听时，直接返回 2024-06-14 00:03:57 +08:00
panlinlin
261945ca62 Merge branch 'refs/heads/master' into dev/abl支持 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
 2024-06-13 23:41:29 +08:00
panlinlin
70e6d919e9 设备使用的注册网卡信息变化时，更新设备信息 2024-06-13 23:40:32 +08:00
panlinlin
7b46769a16 修复国标录像下载后负载统计未清除的BUG 2024-06-13 23:15:51 +08:00
648540858
ff975b47ba Merge branch 'refs/heads/master' into dev/abl支持 2024-06-13 18:13:54 +08:00
648540858
da2662ab27 国标28181-支持自动识别网卡监听，可以不再配置SIP.IP 2024-06-13 18:10:01 +08:00
648540858
4ad711f61a 去除调试日志日志 2024-06-13 16:21:34 +08:00
648540858
93532a6b3b Merge remote-tracking branch 'origin/1078' into 1078 2024-06-12 12:49:58 +08:00
648540858
e0adc7306b Merge branch 'refs/heads/master' into 1078 2024-06-12 12:49:47 +08:00
648540858
6c9d213394 Merge remote-tracking branch 'origin/master' 2024-06-12 11:10:22 +08:00
648540858
0ac27b03ff 增加设备上线判断双逻辑，兼容大华注册后不再发送注册的设备 2024-06-12 11:10:10 +08:00
panlinlin
291a87e1f7 1078-支持自动点播 2024-06-12 00:22:16 +08:00
panlinlin
46bf5b7a39 1078-支持无人观看自动停流 2024-06-11 23:49:55 +08:00
panlinlin
b070b57259 拉流代理状态变化时，支持推送到国标平台 2024-06-11 23:10:12 +08:00
648540858
2cf7178cb7 Merge branch 'refs/heads/2.7.1' 2024-06-11 10:14:14 +08:00
648540858
f8ef14bfea 修复移动位置位置订阅上报间隔为0的bug 2024-06-11 10:08:13 +08:00
panlinlin
824690a37f 1078-终端参数回显 2024-06-10 15:20:48 +08:00
Iwan Lebron
f6157cc42c
修复参数名称 2024-06-10 09:18:37 +08:00
panlinlin
3410fae879 1078-添加终端参数的前端UI 2024-06-10 08:30:22 +08:00
panlinlin
f564ff0aba 1078-支持设备录像FTP方式下载 2024-06-10 00:33:55 +08:00
panlinlin
a030c15c8f 1078-支持设备录像播放以及播放控制 2024-06-09 22:09:04 +08:00
panlinlin
4b90298c99 1078-支持设备录像检索播放 2024-06-09 20:50:59 +08:00
panlinlin
b4dddb0b08 1078-支持云台控制 2024-06-08 23:55:06 +08:00
panlinlin
18cfba612b 1078-支持快照的展示 2024-06-08 22:58:23 +08:00
panlinlin
6074638f5b 1078-支持控制是否要音频 2024-06-08 22:47:25 +08:00
panlinlin
dbb2492640 1078-修复断开连接时设备未下线的BUG 2024-06-08 21:54:58 +08:00
648540858
942a41c630 1078-增加流地址标识 2024-06-08 00:56:05 +08:00
648540858
595d9be283 1078-优化点播以及通道表结构 2024-06-08 00:46:08 +08:00
wangxinlong
208e034822 录像下载失败未正常释放ssrc 2024-06-07 18:13:45 +08:00
648540858
0103d5819b 1078-调整页面 2024-06-07 14:03:41 +08:00
648540858
972ef30f8d 1078-部标通道添加音频控制 2024-06-07 07:21:40 +08:00
648540858
913d358a11 1078-部标通道添加音频控制 2024-06-07 00:20:52 +08:00
648540858
5d5d654410 1078-添加部标通道页面 2024-06-07 00:10:36 +08:00
648540858
619a86e0ed 修复循环引用 2024-06-06 19:59:48 +08:00
648540858
f7d811a299 1078-调整业务信息 2024-06-06 07:26:20 +08:00
648540858
2226d34898 修复空指针异常 2024-06-06 00:29:52 +08:00
648540858
5c826ef449 1078-添加通道信息 2024-06-06 00:23:16 +08:00
648540858
2127cbeca3 调整收到移动位置订阅后开启定时任务 2024-06-05 22:45:13 +08:00
648540858
0de2bb54cd 1078-完成录像文件下载 2024-06-04 23:59:08 +08:00
648540858
83875a5905 1078-修复ftp-server对文件上传的通知 2024-06-04 07:15:05 +08:00
648540858
3728219177 1078-添加录像上传 2024-06-02 00:50:45 +08:00
648540858
62ae1ee978 调整录像下载 2024-05-31 22:54:08 +08:00
648540858
e8d832d0a5 1078-添加ftpserver 2024-05-30 23:41:22 +08:00
648540858
89101b2731 1078-增加ftp-server 2024-05-30 18:36:24 +08:00
648540858
56fdbd34f4 1078-优化回放流地址格式 2024-05-30 11:34:18 +08:00
648540858
6efff9daf9 1078-优化回放 2024-05-30 10:29:14 +08:00
648540858
74c98c8636 1078-录像回放控制 2024-05-29 23:53:20 +08:00
648540858
15a551d983 1078-标记待实现 9105 2024-05-29 18:40:31 +08:00
648540858
2b1645729b 1078-切换码流类型 2024-05-29 18:36:19 +08:00
648540858
84ef932964 1078-修复双向对讲 2024-05-29 18:27:10 +08:00
648540858
2aef6ab6f1 1078-支持语音广播 2024-05-29 17:34:38 +08:00
648540858
de6a3ceb76 1078-双向对讲完成 2024-05-29 17:26:28 +08:00
648540858
87ecf68332 1078-双向对讲 2024-05-29 16:55:07 +08:00
648540858
01fbf102c2 Merge branch 'refs/heads/master' into 1078 2024-05-29 15:03:20 +08:00
648540858
764d04b497 调整上级观看消息的发送 2024-05-29 15:02:51 +08:00
648540858
3e9def7aac 支持abl录像下载 2024-05-29 10:52:28 +08:00
648540858
a945078788 1078-语音对讲 2024-05-29 00:02:31 +08:00
648540858
9ece77d54a 1078-点播添加类型 2024-05-28 18:58:16 +08:00
648540858
37b79633f0 Merge branch 'refs/heads/master' into 1078 2024-05-28 18:40:44 +08:00
648540858
98c62b93f7 支持abl录像下载中 2024-05-28 17:39:14 +08:00
648540858
bae9b2571a Merge branch 'refs/heads/master' into dev/abl支持 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
 2024-05-28 16:07:41 +08:00
648540858
bec35ebf94 调整录像进度获取流程 2024-05-28 16:06:08 +08:00
648540858
2c0c576d93 临时提交 2024-05-28 15:55:26 +08:00
648540858
5011a6b74a 去除多余依赖 2024-05-28 11:03:15 +08:00
648540858
271bb19c99 Merge branch 'refs/heads/master' into dev/abl支持 2024-05-28 11:02:05 +08:00
648540858
c69b64c756 修复CSEQ重置错误 #1449 2024-05-28 10:23:17 +08:00
648540858
de390d3982 Merge branch 'refs/heads/2.7.1' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
 2024-05-28 10:16:46 +08:00
648540858
adfce4464d 1078-终端上传乘客流量 2024-05-27 23:55:44 +08:00
648540858
c8ddee905f 1078-补充终端音视频参数设置 + 查询终端音视频属性 2024-05-27 23:29:59 +08:00
648540858
1efabbe4cc 支持把推流的额外参数加入redis缓存 2024-05-24 10:50:29 +08:00
648540858
3a056acbc1 合并271分支 2024-05-24 10:18:29 +08:00
648540858
de6baa157e 合并271分支 2024-05-24 08:51:09 +08:00
648540858
8bdc406903 Merge branch 'refs/heads/2.7.1' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java
 2024-05-24 08:50:14 +08:00
648540858
8be6979911 1078-图像分析报警参数设置 2024-05-24 00:15:52 +08:00
648540858
aeeb61d141 合并271分支 2024-05-23 17:47:43 +08:00
648540858
475b8a49a3 优化录像文件信息入库 2024-05-23 17:44:30 +08:00
648540858
2c89fae49a Merge branch 'refs/heads/2.7.1' 
# Conflicts:
#	pom.xml
#	src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestForMobilePositionProcessor.java
#	src/main/java/com/genersoft/iot/vmp/media/bean/MediaServer.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/ICloudRecordService.java
#	src/main/java/com/genersoft/iot/vmp/service/bean/CloudRecordItem.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java
 2024-05-23 17:32:15 +08:00
648540858
fe9b8154e0 去除调试日志 2024-05-23 17:15:14 +08:00
648540858
2daa59d78c 支持彻底关闭文档页面 + 修复云端录像偶现callId错误问题 2024-05-23 17:10:45 +08:00
648540858
1e9cdfe87f 1078-单独视频通道参数设置+特殊报警录像参数设置+视频相关报警屏蔽字 2024-05-22 21:24:47 +08:00
648540858
9817bf3fb7 1078-音视频参数设置+音视频通道列表设置 2024-05-21 23:58:23 +08:00
648540858
82ab524fc4 1078-音视频参数设置+音视频通道列表设置 2024-05-21 23:56:51 +08:00
648540858
d70bfb53dd 修复兼容zlm-pro转码时无人管看自动移除失败的BUG 2024-05-20 11:37:07 +08:00
648540858
e085258d74 1078-数据下行透传+数据上行透传 + 数据压缩上报 + 平台 RSA公钥 + 终端 RSA公钥 2024-05-20 00:04:04 +08:00
648540858
2f1ebca335 1078-单条存储多媒体数据检索上传命令 2024-05-19 23:50:37 +08:00
648540858
b626a583f4 1078-录音 2024-05-19 17:50:40 +08:00
648540858
dcc20d0d15 1078-存储多媒体数据上传接口优化 2024-05-19 17:08:31 +08:00
648540858
6af9b8da1f 1078-存储多媒体数据上传 2024-05-18 16:52:02 +08:00
648540858
e9562d7d31 1078-存储多媒体数据上传命令 2024-05-18 07:29:15 +08:00
648540858
b0e25ef784 1078-修复分包消息处理 2024-05-18 05:59:23 +08:00
648540858
49101a37e0 兼容zlm-pro转码 2024-05-17 16:32:01 +08:00
648540858
7ddf066878 1078-修复存储多媒体数据检索 2024-05-17 07:43:28 +08:00
bradyx
6e8071d820 fix: 系统启动时，停止已启动国标推流抛出异常被系统捕获，启动服务失败。 2024-05-15 13:52:16 +08:00
648540858
9161a090f6 1078-存储多媒体数据检索接口 2024-05-15 13:15:14 +08:00
648540858
7bf548492a 1078-修复摄像头立即拍摄命令应答 2024-05-14 23:21:57 +08:00
648540858
e02a047eb2 1078-存储多媒体数据检索 + 存储多媒体数据检索应答 2024-05-14 13:13:58 +08:00
648540858
5564cfb384 优化大量notify 移动位置订阅的入库 2024-05-13 17:22:36 +08:00
648540858
588b1da35a Merge branch 'refs/heads/2.7.0' into 271-优化notify存储 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestForMobilePositionProcessor.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMobilePositionMapper.java
 2024-05-13 11:12:20 +08:00
648540858
aaa1d3a46f 1078-摄像头立即拍摄命令 2024-05-12 07:36:29 +08:00
648540858
db4ba4035f Merge branch 'refs/heads/master' into 1078 2024-05-12 06:53:53 +08:00
BradyXu
72b437cc52 修复当上级平台点播时，上级平台和下级平台局域网不通时，导致推流失败。推流目标IP地址改为配置的SDP发流IP，如果SDP发流IP存在的话。否则还是从连接中获取推流目标IP 2024-05-12 02:15:41 +08:00
648540858
e6a850891e 支持移动位置订阅通知的数据存储 2024-05-11 17:48:47 +08:00
648540858
17e9631de4 修复多节点时端口丢失的问题 2024-05-09 23:53:36 +08:00
648540858
632075da9b 优化接收BYE消息后的处理 2024-05-09 23:41:27 +08:00
648540858
cc71b7d9ca 1078-定位数据批量上传+多媒体事件信息上传+多媒体数据上传 2024-05-09 00:03:54 +08:00
648540858
c6e3df685a 1078-上报驾驶员身份信息请求+驾驶员身份信息采集上报 2024-05-08 22:51:29 +08:00
648540858
622d72b3f0 解决刷新通道异常 2024-05-08 12:16:18 +08:00
648540858
186b00e9b3 支持下载多个云端录像的zip压缩包 2024-05-08 11:18:47 +08:00
648540858
ad67155d73 1078-查询区域或线路数据 2024-05-06 23:58:17 +08:00
648540858
2112fffc26 1078-查询区域或线路数据应答... 2024-05-06 18:00:26 +08:00
648540858
364d613ccb 1078-修复删除路线 2024-05-06 16:05:16 +08:00
648540858
c53e4f6fbc 1078-设置路线 2024-05-06 15:55:14 +08:00
648540858
cc91db30c5 1078-查询区域或线路数据 2024-05-05 23:02:49 +08:00
648540858
00749619da 1078-设置路线... 2024-05-05 21:54:56 +08:00
648540858
9280b57974 1078-设置路线... 2024-05-04 23:19:27 +08:00
648540858
a3149139e2 1078-设置多边形区域+删除多边形区域 2024-05-04 21:56:47 +08:00
648540858
58401b1444 1078-设置多边形区域... 2024-05-04 14:57:48 +08:00
648540858
4a5de5a2db 1078-设置矩形区域+删除矩形区域 2024-05-04 14:35:45 +08:00
648540858
faa0a01b9f 1078-设置圆形区域 2024-05-04 00:09:12 +08:00
648540858
5dd49b3d44 1078-设置圆形区域... 2024-05-03 18:58:49 +08:00
648540858
4011e54dd8 1078-设置圆形区域... 2024-05-03 01:02:00 +08:00
648540858
738b3b6a8e 1078-车辆控制应答 2024-05-02 07:35:44 +08:00
648540858
a5bfe5049d 1078-车辆控制 2024-05-02 07:29:00 +08:00
648540858
c946b97514 1078-优化消息汇报消息体的解析 2024-05-02 06:43:59 +08:00
648540858
0fc0cd6e41 1078-优化编码 2024-05-02 06:25:09 +08:00
648540858
734f0c7e04 1078-设置电话本+电话回拨 2024-05-02 05:21:50 +08:00
648540858
16bc3dabd6 1078-修改文本信息下发标记类型注释 2024-05-02 04:46:34 +08:00
648540858
7c833f3d12 1078-文本信息下发 2024-05-01 15:07:38 +08:00
648540858
e5acf7f1e4 1078-人工确认报警消息+链路检测 2024-05-01 10:05:33 +08:00
648540858
eb43ffd98f 1078-临时提交 2024-05-01 00:01:55 +08:00
648540858
e45b2479d3 1078-临时位置跟踪控制+位置信息查询 2024-04-30 23:37:44 +08:00
648540858
2ae4226e89 修复云端录像按年月查询时时间条件错误的BUG 2024-04-30 15:45:39 +08:00
648540858
edfd528dd5 Merge remote-tracking branch 'origin/master' 2024-04-30 15:01:43 +08:00
648540858
d4cdf5510b 优化拉流代理调用流程 2024-04-30 14:39:53 +08:00
648540858
7bdde6907a 1078-添加设备属性查询接口 2024-04-30 12:13:49 +08:00
648540858
5be7c7636e 1078-查询终端属性完成 2024-04-30 00:42:22 +08:00
648540858
76580d8fdc 1078-查询终端属性... 2024-04-30 00:28:40 +08:00
648540858
5b489d7c26 1078-设置终端参数-添加接口 2024-04-29 23:06:15 +08:00
648540858
5a392372cb 1078-添加设备控制 2024-04-29 22:15:21 +08:00
648540858
8aa97ba695 1078-添加设备控制 2024-04-29 22:12:27 +08:00
648540858
516c5ce3d1 1078-添加设备控制 2024-04-29 22:01:26 +08:00
648540858
9facff13b1 1078-添加发送分包支持 2024-04-29 21:24:08 +08:00
648540858
91b81ceb7a 1078-添加发送分包支持 2024-04-29 16:27:01 +08:00
648540858
06b27beedc 1078-设置终端参数... 2024-04-29 07:00:00 +08:00
648540858
bc356849c7 1078-设置终端参数... 2024-04-29 00:05:04 +08:00
WuPeng
424c0b6333 修改on_stream_none_reader返回值 2024-04-28 14:31:38 +08:00
648540858
8ade012a6e 合并分支 2024-04-26 17:49:28 +08:00
648540858
5e359b64d6 合并分支 2024-04-26 17:41:00 +08:00
648540858
6bd3a187a0 合并分支 2024-04-26 15:42:31 +08:00
648540858
3f6ef955f5 修复空指针异常 2024-04-26 15:02:49 +08:00
648540858
39c3274294 合并分支 2024-04-25 17:53:24 +08:00
648540858
225940825b 1078-设置终端参数... 2024-04-24 23:34:21 +08:00
648540858
62122f95f0 1078-完善查询终端参数接口 2024-04-24 23:15:07 +08:00
648540858
67b846fe2f 1078-支持8103 修改注释错误 2024-04-24 22:21:47 +08:00
648540858
b89af9a693 Merge branch 'refs/heads/2.7.0' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
 2024-04-24 20:51:28 +08:00
648540858
2113e8cf27 优化notify消息中目录的处理 2024-04-24 20:33:52 +08:00
648540858
44aa37ad6e 优化notify消息中目录的处理 2024-04-24 16:12:42 +08:00
648540858
c21d973977 修复收到catalog消息是更新导致是否有音频的设置失效的BUG 2024-04-24 14:59:41 +08:00
648540858
1a30992985 合并270 2024-04-24 09:11:53 +08:00
648540858
d41d6b34af Merge branch 'refs/heads/2.7.0' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/bean/SendRtpItem.java
#	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/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZlmHttpHookSubscribe.java
#	src/main/java/com/genersoft/iot/vmp/service/IDeviceChannelService.java
#	src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisGbPlayMsgListener.java
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamCloseResponseListener.java
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisStreamMsgListener.java
#	src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
#	src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
 2024-04-23 20:59:20 +08:00
648540858
66a681d679 优化notify消息中目录和移动位置的处理 2024-04-23 20:45:12 +08:00
648540858
901dee2bf4 修复转发国标notify-update时信息错误的问题 2024-04-23 10:12:00 +08:00
648540858
8cba63642f 优化notify消息处理 2024-04-22 20:29:36 +08:00
648540858
714e1ff62c 1078-支持8103 设置终端参数 2024-04-21 23:54:06 +08:00
648540858
0058f1b0a9 1078-解析104... 2024-04-21 00:24:24 +08:00
648540858
34b6b516ab 1078-解析104... 2024-04-21 00:16:07 +08:00
648540858
f9c22fcb3d 1078-解析104中... 2024-04-20 18:59:23 +08:00
648540858
b57dbeac13 优化通道更新 2024-04-20 18:58:53 +08:00
648540858
c5ac7e218a 1078-解析104中... 2024-04-20 14:23:05 +08:00
648540858
975e94eee1 1078-支持分包消息 2024-04-20 13:03:39 +08:00
648540858
50e2565643 1078-处理分包发送 2024-04-20 00:07:37 +08:00
648540858
1aa197510f 临时提交 2024-04-19 14:39:35 +08:00
648540858
87629b7fc7 临时提交 2024-04-19 10:32:28 +08:00
648540858
0d0b31f715 临时提交 2024-04-19 10:27:24 +08:00
648540858
0dab86f0b8 临时提交 2024-04-19 10:22:34 +08:00
648540858
dd5ab573f2 1078-解析104... 2024-04-19 07:19:40 +08:00
648540858
a6236a2c13 1078-解析104... 2024-04-19 00:01:20 +08:00
648540858
16143a3fff 1078-解析104中 2024-04-18 20:11:13 +08:00
648540858
94436de3e1 临时提交 2024-04-18 18:31:37 +08:00
648540858
73559cc6b3 临时提交 2024-04-18 18:19:27 +08:00
648540858
38ce529dd2 临时提交 2024-04-18 18:14:59 +08:00
648540858
678bb33562 临时提交 2024-04-18 18:07:47 +08:00
648540858
5d36c2a337 临时提交 2024-04-18 17:51:56 +08:00
648540858
9adf12ca6a 临时提交 2024-04-18 17:34:00 +08:00
648540858
3639d2224d 临时提交 2024-04-18 17:22:25 +08:00
648540858
f536123b11 修改toString方法 2024-04-18 17:05:03 +08:00
648540858
2a765a93eb 添加RedisRpcResponse的toString 2024-04-18 17:00:13 +08:00
648540858
6025eb29fd 添加注释 2024-04-18 16:30:21 +08:00
648540858
55a240bb45 临时提交 2024-04-18 15:52:34 +08:00
648540858
407a5edebf 优化多wvp国标级联推流时推流信息的清理 2024-04-17 23:31:48 +08:00
648540858
e85cef4345 优化多wvp国标级联推流时缓存的清理 2024-04-17 23:23:42 +08:00
648540858
313243195e 修复通道位置的展示 2024-04-17 17:56:36 +08:00
648540858
bf6e09d231 修复多wvp国标级联机制 2024-04-17 12:56:22 +08:00
648540858
f357bece62 优化回调设置方式 2024-04-16 22:22:00 +08:00
648540858
9c6765d44e 重构多wvp国标级联机制 2024-04-16 22:10:35 +08:00
648540858
b4168c02cb 优化多wvp国标级联推流 2024-04-16 00:10:38 +08:00
648540858
f9abfca003 临时提交 2024-04-15 21:33:22 +08:00
648540858
cdeb3acf7c 移除多余文件 2024-04-15 16:13:56 +08:00
648540858
bd0fafde81 修复目录订阅发送订阅未携带经纬度的问题 2024-04-15 15:51:10 +08:00
648540858
fce96def9f 1078-添加查询终端参数 2024-04-15 00:40:36 +08:00
648540858
570307669e 1078-添加查询指定终端参数 2024-04-15 00:31:11 +08:00
648540858
205e529660 1078-补充终端设置参数 2024-04-14 23:03:43 +08:00
648540858
21e7ca0e46 1078-临时提交 2024-04-12 23:36:02 +08:00
648540858
6729df4992 合并主线 2024-04-12 22:15:26 +08:00
648540858
c6bd4ac352 添加导包 2024-04-12 11:23:57 +08:00
648540858
9f3cab6486 Merge branch 'master' into 1078 2024-04-12 10:38:45 +08:00
648540858
f34143df6d 修改totalReaderCount类型 2024-04-12 10:36:18 +08:00
648540858
be787d1a14 添加日志 2024-04-12 09:55:42 +08:00
648540858
da54cdf3b8 解决空指针异常 2024-04-12 09:00:39 +08:00
648540858
8716160d96 支持推流鉴权 2024-04-11 23:36:06 +08:00
648540858
9800fd6e7b Merge branch 'refs/heads/master' into dev/abl支持 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
 2024-04-11 22:47:03 +08:00
648540858
4005a12403 Merge remote-tracking branch 'origin/1078' into 1078 2024-04-11 22:46:03 +08:00
648540858
59c91bdaf8 1078-暂时注释位置附加信息读取 2024-04-11 22:45:50 +08:00
648540858
5c0183a422 修复无法下载较长时间时间录像的BUG 2024-04-11 22:25:57 +08:00
648540858
8750f0f3dd 去除多余代码 2024-04-11 16:58:56 +08:00
648540858
ab20f76885 去除多余代码 2024-04-11 16:58:03 +08:00
648540858
e222095636 修复流数据写入缓存 2024-04-11 16:55:34 +08:00
648540858
651d4a1b0e 优化代码调用 2024-04-11 14:28:42 +08:00
648540858
7d08b56267 Merge branch 'master' into 1078 2024-04-11 09:39:12 +08:00
648540858
05c83cf6ef Merge branch 'master' into 1078 2024-04-11 09:39:04 +08:00
648540858
9978d30aa1 Merge branch '2.7.0' 2024-04-11 09:36:48 +08:00
648540858
b45d71ba6d
Merge pull request #1389 from ancienter/develop-add-api-key 
[add]新增ApiKey管理功能
 2024-04-10 22:56:14 +08:00
648540858
f458c9b793 优化代码调用 2024-04-10 22:38:12 +08:00
leesam
ce950dea4a Merge branch 'refs/heads/master' into develop-add-api-key 2024-04-10 22:18:40 +08:00
leesam
53199b32f6 适配postgres数据库 2024-04-10 22:16:56 +08:00
648540858
6c0087db88 优化代码调用 2024-04-10 20:56:45 +08:00
leesam
16b7e4a7ef Merge branch 'refs/heads/master' into develop-add-api-key 2024-04-10 20:49:44 +08:00
leesam
10e2180c72 [bugfix]支持context-path配置 2024-04-10 19:07:37 +08:00
648540858
9bb5ef6522 修复多个wvp执行推流转发失败的BUG 2024-04-10 18:22:42 +08:00
648540858
1d36382986 修改抓拍存储 2024-04-10 16:52:39 +08:00
648540858
bb350e847d 修复抓拍存储 2024-04-10 16:35:47 +08:00
648540858
d410a3ca18 添加抓拍支持 2024-04-10 16:26:46 +08:00
648540858
b08f00104e abl添加getMediaInfo接口实现 2024-04-10 00:03:45 +08:00
648540858
2dc7eecb47 abl添加checkMediaServer实现 2024-04-09 23:41:48 +08:00
648540858
48a0e88b95 Merge branch 'refs/heads/master' into dev/abl支持 2024-04-09 22:52:33 +08:00
648540858
82ca3a778a 优化媒体节点redis数据格式 2024-04-09 22:52:06 +08:00
648540858
54b878d2e1 优化代码，升级版本号为2.7.1 2024-04-09 22:43:45 +08:00
648540858
0077df29d4 临时提交 2024-04-09 21:42:08 +08:00
648540858
cf8320e749
Merge pull request #1400 from Anyuei/master 
处理可能会出现的空指针异常
 2024-04-09 20:57:50 +08:00
648540858
5457407601 恢复abl实现 2024-04-09 20:56:41 +08:00
648540858
a1861038e5 修复录像下载 2024-04-09 19:53:43 +08:00
648540858
7a59acc8e6 合并主线 2024-04-09 17:30:18 +08:00
648540858
de5d025cee 修复单端口收流时音频禁用失败的问题 2024-04-09 16:10:02 +08:00
648540858
ab318fcf70 修复点播错误时关闭rtpserver 2024-04-09 14:53:11 +08:00
648540858
6dd870e74c 修复点播端口为空 2024-04-09 10:59:59 +08:00
648540858
bbf19c7909 合并主线 2024-04-09 10:40:16 +08:00
648540858
b1b6fae22c Merge branch 'master' into dev/zlm 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamCloseResponseListener.java
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisStreamMsgListener.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java
 2024-04-09 10:35:11 +08:00
648540858
0b2f635176 移除非主线内容 2024-04-09 10:30:00 +08:00
ancienter
25ff2fc4ef
Merge branch '648540858:master' into develop-add-api-key 2024-04-09 09:52:23 +08:00
648540858
ae239c8848 Merge branch 'master' into 1078 2024-04-08 18:15:06 +08:00
648540858
9badf1c7fe 1078-添加位置附加信息定义 2024-04-08 18:15:02 +08:00
648540858
a890b62fa1 Merge branch '2.7.0' 2024-04-08 18:13:33 +08:00
648540858
48351c875e 国标级联支持制定200OK中sdp的IP 2024-04-08 18:13:15 +08:00
648540858
d54787f323 1078-添加读取位置信息汇报附加信息读取 2024-04-07 23:50:58 +08:00
648540858
8a2dc6031e 1078-实现云台控制接口 2024-04-07 22:06:41 +08:00
648540858
9255ea802f 1078-添加云台控制接口 2024-04-07 20:59:21 +08:00
648540858
349b0442d6 Merge remote-tracking branch 'origin/1078' into 1078 2024-04-07 20:42:32 +08:00
648540858
403eb4499d Merge branch 'master' into 1078 2024-04-07 20:42:10 +08:00
648540858
7d0aebd311 Merge branch '2.7.0' 2024-04-07 20:26:01 +08:00
648540858
aeb75c0df1 优化推流结束后发送BYE 2024-04-07 20:25:44 +08:00
648540858
7d53009987 优化推流通知 2024-04-07 20:06:48 +08:00
648540858
6757f4b719 1078-云台变倍控制 2024-04-07 07:21:21 +08:00
648540858
8ba30e83ef 1078-修复错别字 2024-04-07 07:19:02 +08:00
648540858
98d9eb5314 1078-添加云台红外补光控制 2024-04-07 07:17:35 +08:00
648540858
a8a4aecc15 1078-添加云台雨刷控制 2024-04-07 07:15:43 +08:00
648540858
b649464753 1078-添加云台光圈控制 2024-04-07 07:12:51 +08:00
648540858
ebdd9ab534 1078-添加云台焦距控制 2024-04-07 07:09:49 +08:00
648540858
a1ab834875 1078-添加云台旋转 2024-04-07 07:07:27 +08:00
648540858
4ec4d618d6 1078-添加文件上传控制 2024-04-07 07:02:06 +08:00
648540858
5fc1000fcc 1078-添加文件上传完成通知 2024-04-07 06:56:39 +08:00
648540858
302eb98d51 1078-添加文件上传指令 2024-04-07 06:44:52 +08:00
648540858
984d8743be 1078-优化录像回放开始和停止 2024-04-06 00:42:54 +08:00
648540858
26bbeac6c7 1078-添加录像回放开始和停止 2024-04-06 00:06:40 +08:00
648540858
81c2b5715c 1078-添加录像回放列表查询 2024-04-04 16:54:08 +08:00
648540858
3e5da98539 1078-支持点播暂停/继续 2024-04-04 07:19:46 +08:00
648540858
a7b7371e74 1078-增加结束点播 2024-04-03 18:00:48 +08:00
648540858
0f420c43ac 1078-优化点播 2024-04-03 16:59:33 +08:00
648540858
abc3766556 1078-优化点播 2024-04-03 16:33:49 +08:00
648540858
603ce18573 1078-添加点播支持 2024-04-02 23:26:40 +08:00
648540858
6acc395ad2 Merge branch 'master' into 1078 2024-04-02 18:33:53 +08:00
648540858
a1c02605c1 abl-实现closeRtpServer 2024-04-02 14:41:02 +08:00
648540858
86a35f3612 合并开源主线 2024-04-02 11:25:19 +08:00
648540858
1bb813758a Merge branch 'master' into dev/abl支持 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
 2024-04-02 11:20:51 +08:00
648540858
67688d4a4b 优化停止国标收流 2024-04-02 11:20:19 +08:00
648540858
969ff86ebe 放行abl hook 接口 2024-04-02 09:53:47 +08:00
648540858
8b90fade9e 支持使用abl接收国标流 2024-04-02 00:05:09 +08:00
648540858
b78769f997 临时提交 2024-04-01 18:35:26 +08:00
648540858
33b75be71a 支持abl hook 2024-04-01 18:21:38 +08:00
648540858
4d6f881460 修复空指针异常 2024-04-01 16:20:30 +08:00
648540858
722f1d0ee7 国标级联-修复拉流代理播放 2024-04-01 16:17:01 +08:00
648540858
426ea72d7f 修复拉流代理播放 2024-04-01 15:46:36 +08:00
648540858
73733ab13f 修复推流播放 2024-04-01 15:40:21 +08:00
648540858
fd2ef6effe 修复国标点播 2024-04-01 15:29:49 +08:00
648540858
ecd1d2a414 临时提交 2024-04-01 15:22:45 +08:00
648540858
2738750c3e 移除失效的服务 2024-04-01 09:11:56 +08:00
648540858
5973dcd975 修复点播与录像回放 2024-03-31 00:34:44 +08:00
648540858
4548695a0b hook优化 2024-03-31 00:28:45 +08:00
648540858
0447b83c3a 临时提交 2024-03-29 23:41:00 +08:00
648540858
0324855190 Merge branch 'master' into dev/abl支持 2024-03-29 22:55:09 +08:00
648540858
486daf4dfe 调整看守位控制接口 2024-03-29 19:18:34 +08:00
pei
728e60ce84 处理可能会出现的空指针异常 2024-03-29 11:55:44 +08:00
648540858
7a3b9c6f69 调整hook订阅通知的位置 2024-03-28 19:10:53 +08:00
648540858
cc793d16f5 调整hook订阅通知的位置 2024-03-28 18:35:28 +08:00
648540858
d6df7c8355 Merge branch 'master' into dev/abl支持 2024-03-28 18:13:36 +08:00
648540858
cf3d98102a Merge branch 'master' into 2.7.0 2024-03-28 18:08:57 +08:00
648540858
1de344674a 使用冒号分隔redis的key 2024-03-28 18:08:33 +08:00
648540858
f3ac974036 临时提交 2024-03-28 17:12:31 +08:00
648540858
dae67453c4 Merge branch 'master' into dev/abl支持 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/event/EventPublisher.java
 2024-03-28 16:50:44 +08:00
648540858
53d4d10e1c Merge branch 'master' into 2.7.0 2024-03-28 16:31:08 +08:00
648540858
f1e902af7f 支持级联移动位置订阅通知转发 2024-03-28 16:28:41 +08:00
648540858
39103e53c7 修复点播请求释放的问题 2024-03-27 18:23:22 +08:00
648540858
7dda1f6a2e Merge branch 'master' into dev/abl支持 2024-03-27 17:18:35 +08:00
648540858
a2b1065fe9 修复redis推流设备推送bug 2024-03-27 16:51:02 +08:00
648540858
0f18d4cbe1 修复redis推流设备推送bug 2024-03-27 16:20:46 +08:00
648540858
e886aa4833 修复PTZType导致声音开关失效的问题 2024-03-27 11:15:35 +08:00
648540858
6de0c329ea 移除多余的节点启动事件分发 2024-03-26 23:38:49 +08:00
648540858
0c2180c07f 支持处理流没找到事件 2024-03-26 23:36:55 +08:00
648540858
f218d7bbd6 支持发送流没找到事件 2024-03-26 23:16:08 +08:00
648540858
1ce30e6656 临时提交 2024-03-26 17:49:56 +08:00
648540858
e2ebe9d6d8 优化流变化逻辑 2024-03-26 11:42:38 +08:00
648540858
cad5f97c2f 优化流变化处理位置 2024-03-26 10:28:08 +08:00
648540858
c6dfb63f8f 优化hook通知 2024-03-25 23:59:50 +08:00
648540858
2b0af3be14 支持hook 2024-03-25 17:59:09 +08:00
648540858
7ce4f44caa 支持设置abl配置中的hook信息 2024-03-25 00:12:32 +08:00
648540858
3e02e496f6 支持设置abl配置信息 2024-03-24 15:51:19 +08:00
648540858
999192fa8a 支持读取abl配置信息 2024-03-23 23:40:32 +08:00
648540858
c1ac16bf62 优化媒体节点服务的代码结构 2024-03-23 15:38:54 +08:00
648540858
23f0aba0ed 修复媒体节点端口初始化失败 2024-03-22 17:48:21 +08:00
648540858
63a35ffaaf 调整节点管理代码结构 2024-03-22 17:44:42 +08:00
648540858
150e7a3199 调整节点管理代码结构 2024-03-22 16:45:18 +08:00
648540858
08696a57d3 Merge branch 'master' into dev/abl支持 2024-03-22 14:28:24 +08:00
648540858
1aa347bd2b zlm hook 优化 2024-03-22 14:28:00 +08:00
648540858
b90dc789b4 优化媒体节点服务的代码结构 2024-03-21 23:39:32 +08:00
648540858
4134c73745 优化Track的构建 2024-03-21 22:38:56 +08:00
648540858
913099291b 临时提交 2024-03-21 18:21:30 +08:00
648540858
f96250ef45 Merge branch 'master' into dev/abl支持 2024-03-21 16:59:14 +08:00
648540858
3291c4b2e6 修复多平台推流无人观看redis通知 2024-03-21 16:54:44 +08:00
648540858
912c83dfd3 添加日志 2024-03-21 11:16:31 +08:00
648540858
c7ca9703c1 优化媒体节点服务的代码结构 2024-03-20 23:50:30 +08:00
648540858
181bf76862 优化节点在线状态 2024-03-20 18:54:39 +08:00
648540858
8ae17764fd 临时提交 2024-03-20 11:07:08 +08:00
leesam
24b4f02a70 [bugfix]读取jwk的Bug修复 2024-03-20 11:05:57 +08:00
648540858
19e10d0d6a 临时提交 2024-03-20 10:33:43 +08:00
648540858
5e3073005d 优化zlm状态管理 2024-03-20 00:26:04 +08:00
648540858
4a0e9945b4 调整节点管理代码结构 2024-03-19 18:47:55 +08:00
648540858
ad32da0dfd 调整节点管理代码结构 2024-03-19 18:29:58 +08:00
648540858
1e0b73b939 调整节点管理代码结构 2024-03-19 17:52:11 +08:00
leesam
76208975bf [add]支持其他平台通过ApiKey调用系统相关接口 2024-03-19 16:53:01 +08:00
648540858
620a4803da 实现部分优化后的接口 2024-03-18 23:56:27 +08:00
648540858
1768565ce0 优化媒体节点服务的代码结构 2024-03-18 23:42:18 +08:00
648540858
97dc926b28 调整ptzType字段名称 2024-03-18 17:41:49 +08:00
648540858
bfafe45b26
Merge pull request #1371 from ancienter/develop 
[bugfix]修复云端录像查询时间转换错误的问题
 2024-03-18 15:39:32 +08:00
648540858
f4e41659d8 修复国标级联注册和心跳重复发送的问题 2024-03-18 10:36:15 +08:00
648540858
c6adfd24d9 修复redis开始推流的通知 2024-03-18 10:13:03 +08:00
648540858
da33471dfd 1078-修改9101编码为GBK 2024-03-17 23:45:08 +08:00
648540858
267085e945 修复插入国标设备时字段错误 2024-03-17 22:21:01 +08:00
648540858
98199ec657 1078-优化BCD码解析 2024-03-16 23:41:29 +08:00
648540858
3e672ca38c 1078-支持位置汇报 2024-03-16 23:22:07 +08:00
648540858
9bc9dbe43b 1078-解析位置汇报 2024-03-16 00:29:30 +08:00
648540858
93946407e8 1078-简化设备注册取值写法 2024-03-15 17:50:03 +08:00
648540858
045f2334d0 修复级联查看国标录像 2024-03-15 15:15:20 +08:00
leesam
00bb8d914a [bugfix]修复云端录像查询时间转换错误的问题 2024-03-15 09:42:25 +08:00
648540858
23a72e94e6 1078-优化列表展示效果 2024-03-14 18:04:28 +08:00
648540858
debfac58b0 时间解析兼容iso861带毫秒 2024-03-14 16:22:24 +08:00
648540858
d4c531dc12 Merge branch 'master' into 1078 2024-03-14 14:55:03 +08:00
648540858
d4f6ec39b7 优化CivilCode缓存 2024-03-14 14:54:20 +08:00
648540858
e1c8183adf 调整语音对讲超时任务位置 2024-03-14 11:03:52 +08:00
648540858
dff7b8e31f 添加设备新增页面 2024-03-13 23:33:03 +08:00
648540858
e400c92f53 添加设备新增接口 2024-03-13 23:21:49 +08:00
648540858
4eb0163e43 添加设备查询和设备更新接口 2024-03-13 23:16:01 +08:00
648540858
d78f76e58b 1078-设备注册支持从数据库校验是否合法 2024-03-13 18:18:23 +08:00
648540858
44f17c723b Merge remote-tracking branch 'origin/1078' into 1078 2024-03-13 16:46:31 +08:00
648540858
18bd959541 Merge branch 'master' into 1078 2024-03-13 16:46:21 +08:00
648540858
d1624e2d06 修复取消移动位置订阅失败的问题 2024-03-13 16:13:05 +08:00
648540858
f7e5fff446 Merge remote-tracking branch 'origin/master' 2024-03-13 15:40:47 +08:00
648540858
dc8869be49 优化收到redis推动的推流设备信息更新内容重复的问题 2024-03-13 15:40:30 +08:00
648540858
e1d476a54a 处理收到redis推动的推流设备信息内容重复的问题 2024-03-13 15:24:09 +08:00
648540858
dc38df6288 支持从数据库查询注册的设备是否合法 2024-03-13 00:04:52 +08:00
648540858
cb5afce55e 优化语音对讲定时任务的删除 2024-03-12 23:55:00 +08:00
648540858
613452b3fc 1078-设备注册兼容1078-2013 2024-03-12 18:21:10 +08:00
648540858
9494b6dc85 优化架构，获取设备注册时的设备相关信息 2024-03-12 17:32:10 +08:00
648540858
79dc7e79d2 Merge branch 'master' into 1078 2024-03-08 16:22:13 +08:00
648540858
1fcdf5a8f3 Merge branch 'wvp-28181-2.0' into main-dev 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
 2024-03-08 09:30:48 +08:00
648540858
d8b24fc795 XmlUtil添加直接获取Double和Integer的方法 2024-03-07 14:49:46 +08:00
648540858
5bf87ca330
Merge pull request #1270 from hexq/playback 
Playback
 2024-03-05 10:41:22 +08:00
648540858
bd4598e676 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2024-03-04 14:33:15 +08:00
648540858
38980826f9 修复平台删除时未移除心跳超时重新注册任务的问题 #1329 2024-03-04 14:32:57 +08:00
648540858
5a6044ef4e
Merge pull request #1336 from wendy512/bugfix 
bugfix：修复紫光华智录像查询返回日期为2024-02-21T11:10:36+08:00解析报错，兼容多种不同日期格式
 2024-03-01 14:51:51 +08:00
648540858
a90098b90b Merge branch 'wvp-28181-2.0' into main-dev 2024-03-01 14:46:33 +08:00
648540858
e932a9b824 Merge branch '2.6.9' into wvp-28181-2.0 2024-03-01 10:55:49 +08:00
wendy512
268869c6a1 bugfix：修复紫光华智录像查询返回StartTime、EndTime为2024-02-21T11:10:36+08:00，兼容多种不同日期格式 2024-02-29 21:10:56 +08:00
648540858
c581974027 使用GetMapping替换RequestMapping 2024-02-29 18:15:55 +08:00
648540858
bb94831177 修复访问assist配置https访问失败的问题 2024-02-29 16:20:46 +08:00
648540858
db6f722d20 优化国标级联语音喊话TCP主动模式 2024-02-27 18:02:12 +08:00
648540858
66210ec51a 支持国标级联语音喊话TCP主动模式 2024-02-27 17:41:14 +08:00
648540858
c8b0e66e0e 合并主线 2024-02-27 10:25:42 +08:00
648540858
509d9b3cbb Merge branch 'wvp-28181-2.0' into main-dev 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java
 2024-02-27 10:22:13 +08:00
648540858
5f09692198 添加统一回调管理 2024-02-23 18:48:01 +08:00
648540858
f6c48588da 支持支持主码流子码流切换 2024-02-22 17:22:28 +08:00
648540858
18898e982f 支持读取warning header作为错误消息的内容 #1030 2024-02-20 15:08:06 +08:00
648540858
a9ab5c28e9 优化订阅机制，需要重新订阅时，取消命令发送后再发送订阅命令 #1273 2024-02-20 11:12:42 +08:00
648540858
e5856a9f91 修复ack超时事件异常执行的bug 2024-02-07 21:18:36 +08:00
648540858
f2f70fce98 修复合并错误 2024-02-07 20:53:13 +08:00
648540858
562dbb0857 Merge remote-tracking branch 'origin/main-dev' into main-dev 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
 2024-02-07 20:37:23 +08:00
648540858
2e7c9a7341 Merge branch 'wvp-28181-2.0' into main-dev 
# Conflicts:
#	pom.xml
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/AssistRESTfulUtils.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeFactory.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java
#	src/main/resources/all-application.yml
#	src/main/resources/application-dev.yml
 2024-02-07 20:30:37 +08:00
648540858
b079039f81 修复国标级联上级主动结束时ssrc未释放的问题 2024-02-02 09:20:13 +08:00
648540858
bf0efc2739 Merge branch '2.6.9' into wvp-28181-2.0 2024-01-31 18:50:15 +08:00
648540858
105ad25580 默认设备状态变化发送通知 2024-01-31 18:48:27 +08:00
648540858
fc74ce9de4 Merge branch '2.6.9' into wvp-28181-2.0 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/resources/application-dev.yml
 2024-01-31 17:25:32 +08:00
648540858
68fbc8fef1 优化跨域配置，默认允许全部跨域 2024-01-31 17:23:47 +08:00
PengOu
1245ae7874 Fix 推流列表-> 添加通道 报错： 错误: 字段 "gbStreamId" 不存在 ,改为：gb_stream_id 自测试通过 2024-01-30 10:59:25 +08:00
648540858
ab34cb37f3 修复空指针异常 2024-01-29 21:20:03 +08:00
648540858
695f9b7f4d 修复来自其他wvp的推流时平台名称未赋值的问题 2024-01-29 19:31:07 +08:00
pedoc
3d68b56bb5
修复未配置sipdomain时出现异常 2024-01-29 18:05:17 +08:00
648540858
241d223b8a 添加日志 2024-01-25 17:46:38 +08:00
648540858
b3d21c7452 Merge branch '2.6.9' into wvp-28181-2.0 2024-01-22 16:35:17 +08:00
648540858
a9264a8bc0 修复assist使用https时无法请求的bug 2024-01-22 16:34:58 +08:00
648540858
e8770eec36 Merge branch '2.6.9' into wvp-28181-2.0 2024-01-22 16:02:28 +08:00
648540858
d68aebd409 指定service使用的数据源 2024-01-22 15:56:24 +08:00
648540858
5a3b1c04d6 补充日志 2024-01-22 12:09:04 +08:00
648540858
97a87542a6 Merge branch '2.6.9' into wvp-28181-2.0 
# Conflicts:
#	pom.xml
 2024-01-22 10:37:13 +08:00
648540858
0e94aeaf5f 优化录像合并下载,支持不过滤zlm节点ID 2024-01-22 10:16:16 +08:00
648540858
07729fbe49 优化录像合并下载 2024-01-22 09:46:03 +08:00
648540858
79c8447298 支持使用多数据源 2024-01-22 00:29:09 +08:00
648540858
46af350868 优化多节点国标级联国标录像查询 2024-01-21 22:38:50 +08:00
648540858
31df0fb3ff 修复级联点播时tcp模式信令回复的错误 2024-01-21 16:56:13 +08:00
hexq
7055c53192 BUGFIX：回放时，优先从SDP中提取channelId，兼容从Subject无法提取到channelId的问题 2024-01-20 10:26:49 +08:00
hexq
dd4e0d0d9c BUGFIX：向下级目录关联通道时，出现“未查询到目录xxx的信息" 2024-01-20 10:22:34 +08:00
648540858
55b15f8ba6 Merge branch '2.6.9' into wvp-28181-2.0 2024-01-19 17:45:11 +08:00
648540858
cf8a1261b5 支持合并录像使用https 2024-01-19 17:44:31 +08:00
648540858
654599b659 修复通道重命名后无法被检索到 2024-01-19 16:07:30 +08:00
648540858
47e5d2b00b Merge branch '2.6.9' into wvp-28181-2.0 2024-01-19 15:58:50 +08:00
648540858
782e8b9800 修复sendRtpItem写入不及时导致的发流失败 2024-01-19 15:43:08 +08:00
648540858
85f20df9de 修复空指针异常 2024-01-19 15:05:24 +08:00
648540858
47526e241e 修复多wvp推流时，收到停止消息数据处理失败问题 2024-01-19 12:12:35 +08:00
648540858
ebc65b40d3 添加收到invite消息后的日志，减少国标级联推送代理流的等待时间 2024-01-18 14:54:03 +08:00
648540858
7f79b92568 修复设备在事务内注销失败的问题 2024-01-18 10:17:03 +08:00
648540858
88721511e7 Merge branch '2.6.9' into wvp-28181-2.0 2024-01-16 14:51:17 +08:00
648540858
6eed486ff1 合并主线 2024-01-16 14:18:17 +08:00
648540858
9a96597e66 Merge branch 'wvp-28181-2.0' into main-dev 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/AssistRESTfulUtils.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeFactory.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java
 2024-01-16 14:10:27 +08:00
648540858
c32ba1dea8 修复语音对讲 2024-01-16 11:33:12 +08:00
648540858
9b62fbe467 优化设备编辑页面 2024-01-15 18:36:31 +08:00
648540858
13e2a96dae 添加删除通道时通知的日志 2024-01-15 15:39:28 +08:00
648540858
0371f5a96e 修复国标级联全部添加与全部删除 2024-01-15 15:31:20 +08:00
648540858
674ab18c02 修复rtp暂停检查调用失败 2024-01-12 15:03:11 +08:00
648540858
e5a9dd24ef Merge branch '2.6.9' into wvp-28181-2.0 2024-01-12 14:17:01 +08:00