Commit Graph

4057 Commits

Author SHA1 Message Date
lin
d40bc5a034 [1078] 设备列表增加搜索和状态筛选 2025-07-15 18:21:11 +08:00
lin
44ed06bcbe [1078] 支持无人观看自动停流 2025-07-15 18:11:23 +08:00
lin
be04660de8 [1078] 修复分包合并,优化设备列表排序,优化设备上线逻辑 2025-07-15 16:30:34 +08:00
lin
e28141da6e [1078] 临时提交 2025-07-14 18:06:18 +08:00
lin
04bcb6dcb8 [1078] 优化多媒体数据上传处理 2025-07-14 11:03:45 +08:00
lin
9d47fe30f5 [1078] 增加单条存储多媒体数据上传 2025-07-11 22:07:32 +08:00
lin
cefc87ad47 [1078] 完善抓图 2025-07-11 21:41:50 +08:00
lin
8c3e9320fa [1078] 增加抓图 2025-07-11 20:15:45 +08:00
lin
b7a2b6816b [1078] 完善录像下载 2025-07-10 18:48:25 +08:00
648540858
569b361a43 调整打包命名 2025-07-09 22:51:24 +08:00
648540858
16fd1db833 调整打包命名 2025-07-09 22:43:36 +08:00
lin
9c2c727c8c 调整打包时配置文件名称 2025-07-09 20:17:38 +08:00
648540858
42635592c6 Merge pull request #1908 from cuteLittleDevil/feat_github_action
添加github action打包功能
2025-07-09 19:53:38 +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
3d9e718f26 临时提交 2025-07-09 14:58:26 +08:00
CDCDDCDC
67ef8ed8f0 修改github action打包压缩包文件名 2025-07-09 12:46:31 +08:00
lin
48eff320fd [1078] 适配abl的播放1078 2025-07-09 12:32:31 +08:00
CDCDDCDC
8f2b107eab 添加github action打包功能 2025-07-08 19:46:17 +08:00
lin
3c88f86a73 Merge branch 'master' into dev/通用通道云台控制 2025-07-07 18:03:39 +08:00
lin
4765d0efa6 调整国标级联通道发送逻辑 2025-07-07 17:56:06 +08:00
lin
17c967ed4e [1078] 修复标签显示错误 2025-07-07 17:42:08 +08:00
lin
fae839af05 [1078] 兼容2013版本的设备属性查询和注册鉴权 2025-07-07 17:23:12 +08:00
lin
70356c08d2 调整国标级联通道发送逻辑 2025-07-07 16:17:14 +08:00
lin
93c24a74e6 Merge branch 'master' into 重构/1078 2025-07-07 11:46:13 +08:00
lin
51759535fc 临时提交 2025-07-07 09:30:04 +08:00
lin
51cd14e02e 行政区划或者业务分组添加通道后更新右边数据 2025-07-04 14:36:11 +08:00
lin
eddf20e62a 修复业务分组右键添加设备BUG 2025-07-04 14:21:56 +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
c79b7a9743 更新README和文档 2025-07-03 06:45:14 +08:00
lin
8d488b33e9 调整菜单结构,增加通道列表,支持节点搜索 2025-07-02 17:21:20 +08:00
lin
e194c027cb 推流列表新增推流地址生成 2025-07-01 23:36:10 +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
0d6ed0a71e 更新README 2025-06-30 10:24:06 +08:00
lin
54f6ff9f81 修复拉流代理转国标级联点播失败的BUG 2025-06-27 15:32:02 +08:00
648540858
5f4d78fe8f Merge pull request #1900 from xiaoQQya/master
控制台新增国标收流通道列表查看弹窗
2025-06-26 14:09:27 +08:00
xiaoQQya
2b66404a2a fix: 修复国标收流列表播放按钮 loading 不生效问题 2025-06-26 13:24:15 +08:00
xiaoQQya
380c42040f fix: 修复国标收流列表关闭再打开时未刷新数据问题 2025-06-26 12:53:22 +08:00
xiaoQQya
1c25f2f190 feat: 新增国标收流通道列表查看 2025-06-26 11:46:14 +08:00
lin
d9b750dc50 补充丢失的文件 2025-06-26 11:05:39 +08:00
lin
d507d075b1 补充丢失的文件 2025-06-26 11:05:34 +08:00
648540858
592b1799e7 Merge pull request #1897 from xiaoQQya/master
修复登录页背景图加载失败问题
2025-06-26 07:05:05 +08:00
xiaoQQya
8c7b8eaeba perf: 登录状态持久化 2025-06-25 10:20:48 +08:00