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 |
|
648540858
|
0bbac37135
|
修复建表语句不同步
|
2024-10-29 17:35:45 +08:00 |
|
648540858
|
98b4566c6c
|
移除操作日志记录到数据库功能
|
2024-10-29 16:56:14 +08:00 |
|
648540858
|
fee8d2f8cd
|
优化Catalog查询内存占用高的问题
|
2024-10-26 23:15:18 +08:00 |
|
648540858
|
53f2f36f37
|
修复国标设备/设备列表中业务分组的子节点查看
|
2024-10-22 17:21:08 +08:00 |
|
648540858
|
36409eb34c
|
修复默认新建设备未设置节点策略的BUG
|
2024-10-21 09:27:36 +08:00 |
|
648540858
|
277f2db137
|
Merge branch 'master' into 重构/1078
# Conflicts:
# pom.xml
# src/main/java/com/genersoft/iot/vmp/gb28181/bean/CommonGBChannel.java
# src/main/java/com/genersoft/iot/vmp/jt1078/codec/decode/Jt808Decoder.java
# src/main/java/com/genersoft/iot/vmp/jt1078/codec/netty/Jt808Handler.java
# src/main/java/com/genersoft/iot/vmp/jt1078/codec/netty/TcpServer.java
# src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/Re.java
# src/main/java/com/genersoft/iot/vmp/media/service/IMediaNodeServerService.java
# src/main/java/com/genersoft/iot/vmp/media/service/IMediaServerService.java
# src/main/java/com/genersoft/iot/vmp/media/service/impl/MediaServerServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaNodeServerService.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/utils/CivilCodeUtil.java
# src/main/resources/application.yml
# web_src/src/layout/UiHeader.vue
# web_src/src/router/index.js
|
2024-10-18 13:55:23 +08:00 |
|
648540858
|
60b61d7c30
|
修复273版本sql文件名称
|
2024-10-13 20:38:12 +08:00 |
|
648540858
|
37a3f56ffd
|
调整配置以及数据库目录
|
2024-10-12 09:11:21 +08:00 |
|
648540858
|
3e0170b164
|
调整配置以及数据库目录
|
2024-10-11 15:28:19 +08:00 |
|
648540858
|
225a444f9b
|
去除非当前版本使用的字段
|
2024-10-07 15:19:00 +08:00 |
|
648540858
|
145785e881
|
去除非当前版本使用的字段
|
2024-10-07 15:07:29 +08:00 |
|
648540858
|
c2fbfe342e
|
修改错别字
|
2024-10-06 16:01:28 +08:00 |
|
648540858
|
59a52705cf
|
临时提交
|
2024-09-25 14:32:09 +08:00 |
|
648540858
|
550b90b157
|
Merge branch 'master' into dev/master-通道结构重构
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
|
2024-09-18 09:10:12 +08:00 |
|
648540858
|
800d6c926a
|
修复数据库语法兼容以及redis接收推流信息导入
|
2024-09-14 15:19:07 +08:00 |
|
648540858
|
56230b84ec
|
完善数据库脚本
|
2024-09-13 15:49:46 +08:00 |
|
648540858
|
8dc27d1353
|
国标级联通道共享支持自定义通道编号和名称
|
2024-08-29 16:47:46 +08:00 |
|
648540858
|
dd794d4868
|
临时提交
|
2024-08-27 17:56:49 +08:00 |
|
648540858
|
d2654660cb
|
临时提交
|
2024-08-23 17:50:29 +08:00 |
|
648540858
|
ae0235c0f8
|
临时提交
|
2024-08-22 18:07:42 +08:00 |
|
648540858
|
0722aa3aeb
|
临时提交
|
2024-08-22 18:05:57 +08:00 |
|
648540858
|
a18fba8495
|
临时提交
|
2024-08-21 17:40:01 +08:00 |
|