648540858
|
3b7ba3eb46
|
Merge branch 'master' into dev/1078-newUI
# Conflicts:
# src/main/resources/application.yml
|
2025-05-10 08:59:45 +08:00 |
|
lin
|
f2e3016a48
|
修复云端录像seek不准确的问题
|
2025-04-14 12:43:05 +08:00 |
|
lin
|
59c6243338
|
Merge branch 'master' into dev/前端页面修改
|
2025-04-14 12:12:05 +08:00 |
|
lin
|
c3b66fc475
|
合并PR修改中的数据库脚本
|
2025-04-14 11:30:45 +08:00 |
|
xiaoQQya
|
a5c455ca10
|
fix: 修复 postgres 数据库脚本 sql 错误
|
2025-04-11 14:37:28 +08:00 |
|
lin
|
cf15174ea2
|
Merge remote-tracking branch 'origin/dev/前端页面修改' into dev/前端页面修改
# Conflicts:
# 数据库/2.7.3/更新-mysql-2.7.3.sql
# 数据库/2.7.3/更新-postgresql-kingbase-2.7.3.sql
|
2025-04-09 16:51:16 +08:00 |
|
lin
|
e284c3857c
|
Merge branch 'master' into 重构/1078
|
2025-04-09 12:17:22 +08:00 |
|
648540858
|
69f1056836
|
录制计划时间精确到分钟
|
2025-04-04 23:30:18 +08:00 |
|
lin
|
b348b2d3a9
|
通道表增加索引
|
2025-04-03 09:06:16 +08:00 |
|
lin
|
f0eb101130
|
[1078] 适配新的数据库结构
|
2025-03-24 17:53:43 +08:00 |
|
lin
|
20135726eb
|
Merge branch 'master' into 重构/1078
|
2025-03-24 15:19:07 +08:00 |
|
lin
|
8df00a8db5
|
修复sql错误
|
2025-03-20 10:51:47 +08:00 |
|
lin
|
ec74488b4a
|
修复国标级联注册失败
|
2025-03-20 09:21:01 +08:00 |
|
lin
|
c770b0c217
|
优化数据库脚本
|
2025-03-19 14:05:19 +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
|
a05c2f8640
|
修复脚本字段重复
|
2025-03-13 17:07:51 +08:00 |
|
lin
|
e20d5d9178
|
去除多余注释
|
2025-03-12 17:48:22 +08:00 |
|
lin
|
009f1cb0f3
|
更新readme， 增加数据库更新脚本
|
2025-03-12 14:28:50 +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
|
e21cf8a03f
|
补充缺少的字段
|
2025-03-05 09:46:53 +08:00 |
|
南宫茜
|
df3b581f61
|
修复 PostgreSQL 初始化脚本
|
2025-03-03 11:55:29 +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
|
3bae4ce63e
|
Merge branch 'master' into dev/数据库统合
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/streamProxy/service/impl/StreamProxyPlayServiceImpl.java
|
2025-01-17 10:53:08 +08:00 |
|
648540858
|
e139676151
|
修复因数据库路径定义长度短导致记录无法添加的BUG
|
2025-01-11 22:32:57 +08:00 |
|
648540858
|
884fcb827f
|
[集群-自动切换过国标级联] 添加数据库脚本
|
2025-01-02 14:29:13 +08:00 |
|
648540858
|
adfd28d9d7
|
[RPC] 云端录像数据库调整
|
2024-12-31 15:56:55 +08:00 |
|
648540858
|
c629685cd1
|
[RPC 拉流代理] 修复停止是误报信息
|
2024-12-31 11:39:09 +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
|
8f7016878d
|
[拉流代理] 增加单独的字段管理每次拉流需要的节点
|
2024-12-31 10:17:49 +08:00 |
|
648540858
|
7e89b5f97f
|
临时提交
|
2024-12-31 09:31:58 +08:00 |
|
648540858
|
a4af7eb9a1
|
Merge branch 'master' into dev/数据库统合
|
2024-12-27 17:14:48 +08:00 |
|
南宫茜
|
73be39127b
|
修复数据库内容
|
2024-12-27 16:30:44 +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
|
3ea236efdd
|
优化更新sql
|
2024-12-27 10:07:22 +08:00 |
|
648540858
|
19453f7ca9
|
临时提交
|
2024-12-23 07:20:48 +08:00 |
|
648540858
|
825daad355
|
调整数据库结构
|
2024-12-22 08:35:36 +08:00 |
|
648540858
|
51f126e571
|
Merge branch 'master' into 重构/1078
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
# 数据库/2.7.3/初始化-mysql-2.7.3.sql
# 数据库/2.7.3/初始化-postgresql-kingbase-2.7.3.sql
|
2024-12-19 23:19:09 +08:00 |
|
648540858
|
541726a43c
|
调整通用点播RPC调用
|
2024-12-12 09:37:12 +08:00 |
|
648540858
|
ca9b5c2054
|
修改媒体节点表数据结构
|
2024-12-12 09:29:49 +08:00 |
|
648540858
|
8d6a978978
|
[redis下的多wvp] 优化服务间方法调用
|
2024-12-11 18:26:18 +08:00 |
|
648540858
|
f528735119
|
Merge branch 'master' into 重构/1078
|
2024-12-05 11:05:44 +08:00 |
|
648540858
|
cc56ed3355
|
临时提交
|
2024-11-27 22:44:22 +08:00 |
|
648540858
|
57e1934f02
|
Merge branch 'master' into dev/录制计划
|
2024-11-26 20:59:27 +08:00 |
|
648540858
|
6136603b3f
|
移除过时的数据库脚本
|
2024-11-26 11:30:38 +08:00 |
|
648540858
|
0cacdb5928
|
增加数据库结构以及接口
|
2024-11-20 22:33:21 +08:00 |
|
648540858
|
2dcbee74b0
|
新增添加录制计划接口
|
2024-11-20 18:37:39 +08:00 |
|
648540858
|
ea2751e29b
|
添加录制计划的页面与通道查询接口
|
2024-11-19 16:42:11 +08:00 |
|
648540858
|
a4ca333abb
|
合并主线
|
2024-11-10 22:09:13 +08:00 |
|
648540858
|
e5fd66ef96
|
Merge branch 'master' into 重构/1078
# Conflicts:
# pom.xml
# src/main/java/com/genersoft/iot/vmp/conf/SpringDocConfig.java
# src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceChannelServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
|
2024-11-10 15:29:53 +08:00 |
|