Commit Graph

981 Commits

Author SHA1 Message Date
lin
469804b8d3 修改位置分发逻辑 2025-11-17 16:04:47 +08:00
lin
44cdcb8352 重新分组redis同步功能 2025-11-14 19:02:34 +08:00
lin
30aa3192d0 去除多余依赖 2025-11-14 17:12:16 +08:00
lin
fea157436b 优化redis 消息处理 2025-11-14 17:09:55 +08:00
lin
78a506f0b1 Merge branch 'dev/springBoot3' 2025-11-10 08:58:00 +08:00
lin
6de70ccdd5 临时提交 2025-11-08 22:40:27 +08:00
lin
39568777cb 临时提交 2025-11-08 07:02:48 +08:00
lin
01e72407ac 国标通道编辑支持仅保存修改的字段 2025-11-06 15:50:42 +08:00
lin
0607e1c3b2 修复三方接口获取播放地址失败 2025-11-05 23:08:05 +08:00
lin
0ab50eb1c0 临时提交 2025-11-05 17:07:25 +08:00
lin
826b251544 修复上报的坐标未按照坐标系转换的BUG 2025-11-05 11:34:59 +08:00
lin
bf5af5779f 临时提交 2025-11-04 23:17:13 +08:00
lin
0eefabd034 修复相关BUG 2025-11-04 11:22:03 +08:00
lin
fa9aaf3fa2 增加批量修改通道的业务分组以及行政区划,支持筛选业务分组和行政区划,支持抽稀还原,国标通道编辑增加表单校验 2025-10-30 15:05:50 +08:00
lin
d76d0483e3 增加图标信息 2025-10-28 16:26:15 +08:00
lin
08206ca824 优化地图信息窗口逻辑,修复拉流代理播放 2025-10-27 19:02:57 +08:00
lin
2de4932f1e 支持云端录像打包下载 2025-10-23 17:44:49 +08:00
lin
83bba5d380 临时提交 2025-10-15 18:25:42 +08:00
lin
a885b3d0f1 修复组织结构同步 2025-10-10 17:38:22 +08:00
lin
b13207db92 临时提交 2025-10-10 17:08:32 +08:00
lin
61c64589b2 临时提交 2025-09-30 23:17:40 +08:00
lin
77594dae3d 支持从第三方同步分组信息 2025-09-27 21:03:20 +08:00
lin
8d6fe0c9d8 优化地图展示流程,已经默认统一坐标为wgs84 2025-09-25 18:06:58 +08:00
lin
6469aefe22 支持从第三方读取地图配置 2025-09-25 15:27:30 +08:00
lin
842647674a 升级spring boot版本。默认jdk版本升级至21 2025-09-24 10:24:42 +08:00
lin
1156880194 Merge branch 'master' into dev/springBoot3
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/controller/MediaController.java
#	src/main/java/com/genersoft/iot/vmp/jt1078/config/JT1078Controller.java
2025-09-24 08:38:29 +08:00
lin
0ed37d58ec 完善录像回放播放器切换 2025-09-23 18:04:30 +08:00
lin
ff0d54968d zlm适配新的云端录像播放界面 2025-09-19 22:55:44 +08:00
lin
fd306d8ede 云端录像回放使用单文件播放 2025-09-19 18:02:53 +08:00
lin
a064f27bf8 支持ABL风格地址 2025-09-18 18:53:12 +08:00
lin
fb9ff67701 支持ABL录像回放 2025-09-17 18:19:33 +08:00
lin
403e7648f9 优化ABL结果封装完成 2025-09-16 17:57:59 +08:00
lin
27c7969b8f 更新README 2025-09-12 10:35:24 +08:00
lin
6f577268ee 适配新版本zlm限流配置 2025-08-15 09:50:45 +08:00
lin
efbd302260 Merge branch 'master' into 重构/1078 2025-08-01 19:00:13 +08:00
lin
09f1ef20a7 通用通道支持录像回放以及录像控制 2025-08-01 18:59:15 +08:00
lin
e272d25939 [1078] 适配新结构接入通用通道支持云台控制 2025-08-01 14:39:33 +08:00
lin
2ee9a3fa71 [1078] 适配新结构接入通用通道 2025-07-31 21:21:31 +08:00
lin
333965255f Merge branch 'master' into 重构/1078
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/common/enums/ChannelDataType.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/IGbChannelPlayService.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelPlayServiceImpl.java
2025-07-31 21:14:23 +08:00
lin
19b873ba5c 通用通道支持云台控制 2025-07-31 18:49:53 +08:00
lin
4c97022c78 [1078] 支持语音对讲 中心广播模式 2025-07-28 17:50:03 +08:00
lin
44ed06bcbe [1078] 支持无人观看自动停流 2025-07-15 18:11:23 +08:00
lin
48eff320fd [1078] 适配abl的播放1078 2025-07-09 12:32:31 +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
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
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
f8e5e8f057 优化拉流代理播放机制 2025-07-01 17:07:10 +08:00
Jerry Yan
14c85838f4 springboot3 2025-06-11 10:08:03 +08:00
lin
d15307533a Merge branch 'master' into 重构/1078
# Conflicts:
#	src/main/resources/application.yml
2025-06-03 17:21:21 +08:00
lin
f4bbca78e5 优化通道变化消息发送以及增加设备状态丢失检测 2025-06-03 16:52:42 +08:00