Commit Graph

151 Commits

Author SHA1 Message Date
lin
c597567763 修复错误的更新sql 2025-11-13 17:24:24 +08:00
lin
a2e3738509 拉流代理移除无人观看移动数据功能 2025-10-27 17:27:19 +08:00
lin
77594dae3d 支持从第三方同步分组信息 2025-09-27 21:03:20 +08:00
lin
4280a1d08e 移除自定义的是否支持云台属性 2025-09-26 17:31:37 +08:00
lin
bee911fa09 通道增加自定义属性 是否支持云台控制和是否支持语音对讲 2025-09-24 17:47:12 +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
fb9ff67701 支持ABL录像回放 2025-09-17 18:19:33 +08:00
lin
83662f4210 修复数据库索引重复 2025-08-12 11:36:23 +08:00
lin
1702907573 修复全量脚本缺失的字段 2025-08-07 18:13:44 +08:00
lin
1da487f02a [1078] 优化鉴权码位置,支持1078国标级联 2025-08-06 15:17:44 +08:00
lin
4c97022c78 [1078] 支持语音对讲 中心广播模式 2025-07-28 17:50:03 +08:00
lin
48eff320fd [1078] 适配abl的播放1078 2025-07-09 12:32:31 +08:00
Jerry Yan
8848de9d15 支持h2数据库 2025-06-11 12:54:45 +08:00
lin
d15307533a Merge branch 'master' into 重构/1078
# Conflicts:
#	src/main/resources/application.yml
2025-06-03 17:21:21 +08:00
lin
e3f880627e 去除多余数据库脚本 2025-06-03 16:53:36 +08:00
lin
f4bbca78e5 优化通道变化消息发送以及增加设备状态丢失检测 2025-06-03 16:52:42 +08:00
lin
1420fcfcd0 Merge branch 'master' into 重构/1078
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/service/bean/InviteErrorCode.java
#	src/main/resources/application.yml
2025-05-29 17:10:32 +08:00
lin
a7f9cbd8ef 版本号提升 2025-05-26 09:53:58 +08:00
lin
5224f2b5c0 增加数据库脚本 2025-05-19 10:39:49 +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
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