Commit Graph

320 Commits

Author SHA1 Message Date
lin
481609ef72 修复录制计划开启录像失败的BUG 2025-04-09 16:48:50 +08:00
lin
a4e810da12 调整代码位置 2025-03-20 14:18:41 +08:00
lin
b2072073a9 修复国标级联推送位置新 2025-03-20 09:56:35 +08:00
lin
ec74488b4a 修复国标级联注册失败 2025-03-20 09:21:01 +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
c0d043ecd9 [国标级联] 增加前端控制指令解析 2025-03-06 15:27:25 +08:00
lin
3da6444baa 调整设备控制相关的接口 2025-02-13 15:15:36 +08:00
lin
5808c7aff5 [集群] 重构message消息接受返回值的方式 2025-02-12 17:20:12 +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
lin
ea12e3465f 修复语音对讲后停止点播失败的BUG 2025-02-11 16:06:18 +08:00
648540858
01f491c026 [集群] 修复同步通道时的通道上下线消息发送 2025-01-21 17:00:37 +08:00
648540858
884fcb827f [集群-自动切换过国标级联] 添加数据库脚本 2025-01-02 14:29:13 +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
28961f51f7 完善数据库结构调用 2024-12-23 23:49:54 +08:00
648540858
19453f7ca9 临时提交 2024-12-23 07:20:48 +08:00
648540858
93afd46d0f 增加RPC录像回放和录像下载 2024-12-12 17:46:51 +08:00
648540858
e62d106a1f 临时提交 2024-12-11 09:56:09 +08:00
648540858
24c3c45565 [录制计划] 修复关联通道 2024-11-27 17:59:54 +08:00
648540858
d3f53db160 Merge branch 'master' into dev/录制计划 2024-11-27 14:20:59 +08:00
648540858
e9a53b766e 调整目录查询的结果展示逻辑 2024-11-27 11:04:26 +08:00
648540858
f625fb6aed 修复大华对讲talk模式 2024-11-27 10:11:49 +08:00
648540858
57e1934f02 Merge branch 'master' into dev/录制计划 2024-11-26 20:59:27 +08:00
648540858
4e165fe243 优化目录查询的WebUI逻辑 2024-11-26 11:20:12 +08:00
648540858
ea2751e29b 添加录制计划的页面与通道查询接口 2024-11-19 16:42:11 +08:00
648540858
5c2b4f386b 优化播放页面的预置位控制 2024-11-08 17:40:05 +08:00
648540858
5304620861 重构报警SSE推送 2024-10-29 15:57:52 +08:00
648540858
bf9262283e 优化报警推送 2024-10-28 17:53:27 +08:00
648540858
fee8d2f8cd 优化Catalog查询内存占用高的问题 2024-10-26 23:15:18 +08:00
648540858
022b16dbbe 通道树支持展示在线离线状态 2024-10-21 12:29:15 +08:00
648540858
3078162c58 优化文档, 优化notify-catalog大并发处理 2024-10-11 15:24:46 +08:00
648540858
225a444f9b 去除非当前版本使用的字段 2024-10-07 15:19:00 +08:00
648540858
145785e881 去除非当前版本使用的字段 2024-10-07 15:07:29 +08:00
648540858
e44c098cfb 屏蔽地理坐标系字段 2024-10-06 14:17:29 +08:00
648540858
c3267403ba 优化分组树,行政区划树的展示 2024-09-26 15:57:55 +08:00
648540858
59a52705cf 临时提交 2024-09-25 14:32:09 +08:00
648540858
f7936117f9 修复通道编辑重置 2024-09-20 15:55:40 +08:00
648540858
1b33afc0ea 修复通道列表音频开关 2024-09-19 11:09:37 +08:00
648540858
91c4677de4 修复通道列表音频开关 2024-09-19 10:03:32 +08:00
648540858
a6b436af29 临时提交 2024-09-18 17:33:29 +08:00
648540858
f89933fb58 修复138类型默认打开音频 2024-09-18 16:14:13 +08:00
648540858
800d6c926a 修复数据库语法兼容以及redis接收推流信息导入 2024-09-14 15:19:07 +08:00
648540858
e078360928 修复语音对讲 2024-09-11 16:59:52 +08:00
648540858
3140672e63 修复国标录像下载 2024-09-10 16:50:54 +08:00
648540858
2e90344c89 临时提交 2024-09-09 11:16:02 +08:00
648540858
489fbe31a5 临时提交 2024-09-09 00:07:00 +08:00
648540858
b7e96de36a 临时提交 2024-09-07 00:04:36 +08:00
648540858
da441a67f8 临时提交 2024-09-06 17:56:24 +08:00
648540858
ad5b66eb71 临时提交 2024-09-04 18:01:54 +08:00
648540858
fa47f619ba 临时提交 2024-09-03 18:00:35 +08:00