lin
|
8c3e9320fa
|
[1078] 增加抓图
|
2025-07-11 20:15:45 +08:00 |
|
lin
|
b7a2b6816b
|
[1078] 完善录像下载
|
2025-07-10 18:48:25 +08:00 |
|
lin
|
1655e5903b
|
[1078] 完善录像回放
|
2025-07-09 16:44:54 +08:00 |
|
lin
|
055bbc2dca
|
[1078] 修复回放结束发送失败
|
2025-07-09 16:37:33 +08:00 |
|
lin
|
3c6b715ce1
|
[1078] 临时提交
|
2025-07-09 16:16:04 +08:00 |
|
lin
|
48eff320fd
|
[1078] 适配abl的播放1078
|
2025-07-09 12:32:31 +08:00 |
|
lin
|
fae839af05
|
[1078] 兼容2013版本的设备属性查询和注册鉴权
|
2025-07-07 17:23:12 +08:00 |
|
lin
|
a424f270e8
|
[1078] 兼容abl流媒体
|
2025-07-03 17:30:59 +08:00 |
|
lin
|
1bfb51c90e
|
Merge branch 'dev/abl支持' into 重构/1078
# Conflicts:
# src/main/resources/application.yml
|
2025-07-03 15:29:13 +08:00 |
|
lin
|
5bcdf5dfb6
|
[abl] 合并主线
|
2025-07-03 15:28:47 +08:00 |
|
lin
|
bab5534134
|
Merge branch 'master' into dev/abl支持
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/MediaStatusNotifyMessageHandler.java
# src/main/java/com/genersoft/iot/vmp/media/bean/MediaInfo.java
# src/main/java/com/genersoft/iot/vmp/media/bean/MediaServer.java
# src/main/java/com/genersoft/iot/vmp/media/bean/RecordInfo.java
# src/main/java/com/genersoft/iot/vmp/service/bean/CloudRecordItem.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java
# src/main/resources/application.yml
|
2025-07-03 14:58:24 +08:00 |
|
lin
|
537d86ca89
|
[1078] 合并主线
|
2025-07-03 14:54:29 +08:00 |
|
lin
|
465e03d15d
|
Merge branch 'master' into 重构/1078
# Conflicts:
# web/src/router/index.js
# web/src/views/common/channelPlayer/chooseChannelForJt.vue
# web/src/views/common/channelPlayer/jtDeviceEdit.vue
# web/src/views/common/channelPlayer/jtDevicePlayer.vue
# web_src/src/layout/UiHeader.vue
# web_src/src/main.js
# web_src/src/router/index.js
|
2025-07-03 09:41:55 +08:00 |
|
lin
|
8d488b33e9
|
调整菜单结构，增加通道列表，支持节点搜索
|
2025-07-02 17:21:20 +08:00 |
|
lin
|
f8e5e8f057
|
优化拉流代理播放机制
|
2025-07-01 17:07:10 +08:00 |
|
lin
|
9e8fbea73b
|
支持zlm pro截图方式
|
2025-06-30 17:16:25 +08:00 |
|
lin
|
54f6ff9f81
|
修复拉流代理转国标级联点播失败的BUG
|
2025-06-27 15:32:02 +08:00 |
|
xiaoQQya
|
1c25f2f190
|
feat: 新增国标收流通道列表查看
|
2025-06-26 11:46:14 +08:00 |
|
lin
|
1c55bc3fd1
|
预置位查询支持多段返回
|
2025-06-19 15:12:47 +08:00 |
|
Jerry Yan
|
1b35fbd0e0
|
支持关闭返回Date Header，进而实现关闭对摄像头的校时功能
Fixes #1700
|
2025-06-12 16:05:06 +08:00 |
|
648540858
|
ebcbc486b3
|
Merge pull request #1885 from q792602257/795
支持查询时根据channelId查询报警
|
2025-06-12 09:22:42 +08:00 |
|
648540858
|
a1cb616b0b
|
Merge pull request #1883 from q792602257/bugfix
knife4j文档中描述使用相对地址，可以直接点击打开对应页面
|
2025-06-12 09:22:15 +08:00 |
|
lin
|
b1da948513
|
修复录制计划查询方法名
|
2025-06-11 17:25:03 +08:00 |
|
Jerry Yan
|
68806b4202
|
支持查询时根据channelId查询报警
Fixes #795
|
2025-06-11 13:00:27 +08:00 |
|
Jerry Yan
|
e6228df7a1
|
knife4j文档，描述使用相对地址，可以直接点击打开对应页面
|
2025-06-11 11:49:53 +08:00 |
|
lin
|
98ea5846fe
|
心跳入库 支持批量入库
|
2025-06-10 09:45:02 +08:00 |
|
lin
|
8acd3fa521
|
修复设备列表查询丢失字段，导致编辑后都是心跳参数
|
2025-06-06 15:24:58 +08:00 |
|
lin
|
8d97ee613e
|
修复移动位置订阅无法关闭的BUG
|
2025-06-06 09:26:36 +08:00 |
|
lin
|
bc545f12a5
|
优化延时任务到期时间更新
|
2025-06-05 11:19:07 +08:00 |
|
lin
|
6a6071973c
|
Merge remote-tracking branch 'origin/master'
|
2025-06-05 09:41:17 +08:00 |
|
lin
|
60e9fb3daa
|
修复推流列表和拉流代理的云端录像跳转错误
|
2025-06-05 09:40:43 +08:00 |
|
panlinlin
|
916553c559
|
订阅消息检查是否缺失Expires， 修复因华为的信令错误导致的空指针
|
2025-06-03 22:27:05 +08:00 |
|
lin
|
d15307533a
|
Merge branch 'master' into 重构/1078
# Conflicts:
# src/main/resources/application.yml
|
2025-06-03 17:21:21 +08:00 |
|
lin
|
227239f7f7
|
去除调试日志
|
2025-06-03 17:17:04 +08:00 |
|
lin
|
f4bbca78e5
|
优化通道变化消息发送以及增加设备状态丢失检测
|
2025-06-03 16:52:42 +08:00 |
|
lin
|
cc0c73a64d
|
Merge branch 'master' into dev/设备和平台使用不同的优化策略
|
2025-06-03 11:31:38 +08:00 |
|
lin
|
111274c08a
|
修复通道共享状态过滤， 优化发流端口获取， 避免递归过多异常
|
2025-06-03 10:36:29 +08:00 |
|
648540858
|
dccd27e9c2
|
修复空指针异常
|
2025-05-29 21:36:02 +08:00 |
|
648540858
|
08fe740481
|
Merge pull request #1866 from xiaoQQya/fix/sql
fix: 修复 sql 语法错误
|
2025-05-29 17:29:55 +08:00 |
|
lin
|
1420fcfcd0
|
Merge branch 'master' into 重构/1078
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/service/bean/InviteErrorCode.java
# src/main/resources/application.yml
|
2025-05-29 17:10:32 +08:00 |
|
lin
|
ec9a0bcc76
|
修复talk模式Bye消息发送失败的BUG
|
2025-05-29 17:02:37 +08:00 |
|
lin
|
46d30a8fe2
|
Merge branch 'master' into dev/设备和平台使用不同的优化策略
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java
# 数据库/2.7.4/初始化-mysql-2.7.4.sql
# 数据库/2.7.4/初始化-postgresql-kingbase-2.7.4.sql
|
2025-05-29 15:31:52 +08:00 |
|
lin
|
578b54ed09
|
完善设备有效期到期机制
|
2025-05-29 15:29:00 +08:00 |
|
xiaoQQya
|
3845c03250
|
fix: 修复 sql 语法错误
|
2025-05-29 14:37:22 +08:00 |
|
648540858
|
58e82ec185
|
临时提交
|
2025-05-28 22:32:14 +08:00 |
|
648540858
|
a40446e42b
|
临时提交
|
2025-05-27 23:19:10 +08:00 |
|
lin
|
3ad5d43368
|
临时提交
|
2025-05-27 18:24:07 +08:00 |
|
lin
|
dd9c64d7a8
|
增加设备状态保持任务
|
2025-05-26 18:04:02 +08:00 |
|
lin
|
0c29c90d3b
|
Merge branch 'master' into 重构/1078
|
2025-05-26 15:07:58 +08:00 |
|
lin
|
4b7467e8e0
|
Merge branch '2.7.3'
|
2025-05-26 10:17:46 +08:00 |
|