lin
|
0c29c90d3b
|
Merge branch 'master' into 重构/1078
|
2025-05-26 15:07:58 +08:00 |
|
lin
|
75b1e8deb2
|
Merge branch '2.7.3'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/event/subscribe/catalog/CatalogEventLister.java
|
2025-05-23 18:18:32 +08:00 |
|
lin
|
55f36f660b
|
修复集群播放BUG
|
2025-05-23 17:26:17 +08:00 |
|
648540858
|
3b7ba3eb46
|
Merge branch 'master' into dev/1078-newUI
# Conflicts:
# src/main/resources/application.yml
|
2025-05-10 08:59:45 +08:00 |
|
lin
|
72a0c1a27e
|
Merge branch 'master' into dev/前端页面修改
|
2025-04-09 16:50:42 +08:00 |
|
lin
|
481609ef72
|
修复录制计划开启录像失败的BUG
|
2025-04-09 16:48:50 +08:00 |
|
lin
|
e284c3857c
|
Merge branch 'master' into 重构/1078
|
2025-04-09 12:17:22 +08:00 |
|
lin
|
693cbf0efb
|
修复通道列表刷新导致页数回退的BUG
|
2025-04-03 09:08:46 +08:00 |
|
lin
|
e76d25816a
|
修复前端的符号错误
|
2025-03-31 18:01:34 +08:00 |
|
lin
|
91c9bc4fe3
|
去除接口多余的分隔符
|
2025-03-27 17:13:31 +08:00 |
|
lin
|
8048693616
|
修复前端调用录像开始结束
|
2025-03-25 16:44:27 +08:00 |
|
lin
|
f0eb101130
|
[1078] 适配新的数据库结构
|
2025-03-24 17:53:43 +08:00 |
|
lin
|
fd5079a652
|
Merge branch 'refs/heads/master' into 重构/1078
|
2025-03-24 17:28:43 +08:00 |
|
lin
|
db7f79194a
|
优化前端设备类型的展示
|
2025-03-24 17:27:06 +08:00 |
|
lin
|
20135726eb
|
Merge branch 'master' into 重构/1078
|
2025-03-24 15:19:07 +08:00 |
|
lin
|
b2072073a9
|
修复国标级联推送位置新
|
2025-03-20 09:56:35 +08:00 |
|
lin
|
0329c8f5d1
|
Merge remote-tracking branch 'origin/master' into 重构/1078
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/dao/CommonGBChannelMapper.java
# src/main/java/com/genersoft/iot/vmp/gb28181/dao/PlatformChannelMapper.java
# src/main/java/com/genersoft/iot/vmp/gb28181/dao/provider/ChannelProvider.java
# src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceChannelServiceImpl.java
# 数据库/2.7.3/初始化-mysql-2.7.3.sql
# 数据库/2.7.3/初始化-postgresql-kingbase-2.7.3.sql
|
2025-03-18 15:30:35 +08:00 |
|
lin
|
867d1bfb9b
|
支持清理异常业务分组节点，使通道可被挂载
|
2025-03-14 15:32:03 +08:00 |
|
lin
|
4dce850aea
|
行政区划支持异常数据补充行政区划节点以及清理异常行政区划节点使通道可被挂载
|
2025-03-14 14:53:47 +08:00 |
|
648540858
|
d5dc0f9afd
|
临时提交
|
2025-03-14 07:38:58 +08:00 |
|
648540858
|
cbcd99da40
|
支持展示行政区划节点异常的通道数据
|
2025-03-13 23:12:39 +08:00 |
|
lin
|
298fb05378
|
优化录像下载。 支持八倍速（设备支持的最高速度）下载
|
2025-03-13 16:48:15 +08:00 |
|
lin
|
108cdf1a13
|
调整分屏页面全屏按钮位置
|
2025-03-13 10:35:25 +08:00 |
|
lin
|
90d2843255
|
播放按钮添加loading， 修复拉流代理播放后再次点播失败
|
2025-03-12 16:43:47 +08:00 |
|
648540858
|
33abdb1db6
|
Merge branch 'master' into dev/数据库统合
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/service/IDeviceChannelService.java
# src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceChannelServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/control/cmd/DeviceControlQueryMessageHandler.java
# src/main/java/com/genersoft/iot/vmp/streamProxy/service/impl/StreamProxyPlayServiceImpl.java
# web_src/src/components/DeviceList.vue
|
2025-03-10 21:36:52 +08:00 |
|
lin
|
85ecc4c201
|
修复国标通道编辑页面
|
2025-03-05 09:57:31 +08:00 |
|
Jerry Yan
|
11170fad7a
|
实现h265web功能
|
2025-02-21 18:25:05 +08:00 |
|
lin
|
924de556b8
|
优化网页表格使用统一高度
|
2025-02-21 15:20:14 +08:00 |
|
lin
|
73560d9e7e
|
优化编码信息刷新， 优化语音对讲选择按钮
|
2025-02-19 10:53:02 +08:00 |
|
lin
|
b68e5423db
|
编码信息增加定时刷新
|
2025-02-19 10:40:13 +08:00 |
|
lin
|
158fbaac9c
|
Merge branch 'master' into dev/数据库统合
|
2025-02-19 09:48:26 +08:00 |
|
程序员小墨
|
310fbe0a01
|
修复 [ h265web.vue] 文件名开头包含空格导致前端启动报错问题
|
2025-02-15 02:12:27 +08:00 |
|
lin
|
b6c3f42a1f
|
Merge branch 'refs/heads/master' into dev/数据库统合2
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
# src/main/java/com/genersoft/iot/vmp/gb28181/controller/DeviceConfig.java
# src/main/java/com/genersoft/iot/vmp/gb28181/controller/GBRecordController.java
# src/main/java/com/genersoft/iot/vmp/gb28181/service/IDeviceService.java
# src/main/java/com/genersoft/iot/vmp/gb28181/service/IGbChannelPlayService.java
# src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelPlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/streamProxy/service/impl/StreamProxyPlayServiceImpl.java
# src/main/resources/配置详情.yml
|
2025-02-11 19:30:20 +08:00 |
|
lin
|
d08248aae9
|
调整心跳间隔的设置机制以及状态的判断
|
2025-02-11 18:16:05 +08:00 |
|
648540858
|
b0b3f32e03
|
[集群] 支持国标级联更新
|
2025-01-02 18:34:22 +08:00 |
|
648540858
|
d4f9d51aee
|
[集群-自动切换过国标级联] 平台列表增加区分本平台标识
|
2025-01-02 16:59:14 +08:00 |
|
648540858
|
4426180eba
|
[集群-自动切换过国标级联] 平台列表增加区分本平台标识
|
2025-01-02 16:49:50 +08:00 |
|
648540858
|
319073ca89
|
临时提交
|
2024-12-31 15:41:26 +08:00 |
|
648540858
|
874733fa2c
|
[RPC 云端录像] 修复服务ID 获取
|
2024-12-31 15:36:48 +08:00 |
|
648540858
|
32e90b2537
|
[RPC 云端录像] 修复时长显示
|
2024-12-31 15:13:56 +08:00 |
|
648540858
|
08a75d38a8
|
[RPC 云端录像] 增加云端录像播放
|
2024-12-31 14:54:11 +08:00 |
|
648540858
|
89651dd894
|
[RPC] 拉流代理页面调整
|
2024-12-31 11:24:29 +08:00 |
|
648540858
|
26ee38aebe
|
Merge branch 'master' into dev/数据库统合
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/streamProxy/bean/StreamProxy.java
# src/main/java/com/genersoft/iot/vmp/streamProxy/bean/StreamProxyParam.java
|
2024-12-31 10:33:12 +08:00 |
|
648540858
|
f078c6f7a0
|
[拉流代理] 修复 #1718
|
2024-12-31 10:31:03 +08:00 |
|
648540858
|
8f7016878d
|
[拉流代理] 增加单独的字段管理每次拉流需要的节点
|
2024-12-31 10:17:49 +08:00 |
|
648540858
|
785da6d5ef
|
调整前端获取服务ID方式
|
2024-12-30 16:32:37 +08:00 |
|
648540858
|
317f771fa2
|
Merge branch 'master' into dev/数据库统合
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/service/IDeviceChannelService.java
# web_src/src/components/DeviceList.vue
|
2024-12-30 16:00:58 +08:00 |
|
648540858
|
0dd2826b9e
|
优化设备订阅的操作方式
|
2024-12-30 15:59:15 +08:00 |
|
648540858
|
e05d988755
|
Merge branch 'master' into dev/数据库统合
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceMapper.java
# src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelPlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlatformChannelServiceImpl.java
|
2024-12-27 10:57:42 +08:00 |
|
648540858
|
081bb6de18
|
完善通道数据类型的保存与展示
|
2024-12-24 23:35:01 +08:00 |
|