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
|
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
|
38f476c86b
|
调整配置文件详情名称便于新手理解
|
2024-10-13 20:54:33 +08:00 |
648540858
|
a59854e244
|
更新前端截图
|
2024-10-12 10:42:30 +08:00 |
648540858
|
183183568b
|
恢复application配置
|
2024-10-12 09:11:46 +08:00 |
648540858
|
37a3f56ffd
|
调整配置以及数据库目录
|
2024-10-12 09:11:21 +08:00 |
648540858
|
3e0170b164
|
调整配置以及数据库目录
|
2024-10-11 15:28:19 +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 |