lin
|
3da6444baa
|
调整设备控制相关的接口
|
2025-02-13 15:15:36 +08:00 |
|
lin
|
b7d0eb793d
|
去除多余注释
|
2025-02-12 20:58:58 +08:00 |
|
lin
|
9618f23af8
|
修复message和sip消息超时未回复的判断机制
|
2025-02-12 20:54:20 +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 |
|
lin
|
3fe131eed3
|
修复录制计划以来全局录像配置， 目前去除依赖，目前录制计划开启录像
|
2025-02-11 11:08:52 +08:00 |
|
lin
|
c38c4e3979
|
[集群] 增加强制关键帧/看守位控制/拉框放大缩小/设备状态查询
|
2025-02-08 20:52:46 +08:00 |
|
lin
|
71390a7b51
|
[集群] 增加远程重启/录像控制/布防（或撤防）/重置报警， 增加关闭推流接口
|
2025-02-08 17:29:31 +08:00 |
|
lin
|
8ca982485c
|
[集群] 增加设备基本配置和设备配置查询
|
2025-02-08 10:45:47 +08:00 |
|
648540858
|
ba27819874
|
[集群] 增加语音对讲支持
|
2025-01-21 17:35:21 +08:00 |
|
648540858
|
63fbafe687
|
[集群] 支持通道刷新
|
2025-01-03 17:52:38 +08:00 |
|
648540858
|
af04669d49
|
Merge branch 'master' into dev/数据库统合
|
2025-01-02 14:46:16 +08:00 |
|
claire
|
d7ebe93337
|
增加光圈速度范围判断
|
2025-01-02 14:20:04 +08:00 |
|
claire
|
daeb48f62a
|
修复设备云台控制关于速度的错误描述，水平垂直控制速度为00H~FFH(0-255),变倍控制速度为0H~FH(0-15)，聚焦速度为00H~FFH(0-255),光圈速度为00H~FFH(0-255)
|
2025-01-02 14:16:44 +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
|
45862480aa
|
Merge branch 'master' into dev/数据库统合
|
2024-12-27 17:38:07 +08:00 |
|
648540858
|
058909197e
|
[国标PTZ] 调整云台控制调用
|
2024-12-27 17:37:50 +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
|
3b4818c579
|
调整停止录像下载
|
2024-12-13 17:41:02 +08:00 |
|
648540858
|
e16ca179a6
|
新增RPC录像回放暂停和恢复
|
2024-12-13 17:28:38 +08:00 |
|
648540858
|
6c5535ef1e
|
添加遗漏的数据返回
|
2024-12-13 15:21:21 +08:00 |
|
648540858
|
3e78af64de
|
增加RPC录像列表查询
|
2024-12-13 15:02:06 +08:00 |
|
648540858
|
9d96658696
|
支持国标级联点播其他wvp的国标设备
|
2024-12-12 10:15:04 +08:00 |
|
648540858
|
8d6a978978
|
[redis下的多wvp] 优化服务间方法调用
|
2024-12-11 18:26:18 +08:00 |
|
648540858
|
5d26e3776d
|
支持点播同一个redis下的其他wvp
|
2024-12-11 16:59:48 +08:00 |
|
648540858
|
e62d106a1f
|
临时提交
|
2024-12-11 09:56:09 +08:00 |
|
648540858
|
bcb54fa148
|
Merge remote-tracking branch 'origin/dev/录制计划'
|
2024-12-09 15:23:48 +08:00 |
|
648540858
|
5bbd461d88
|
修复WebUi长时间不退出登录的BUG
|
2024-12-05 16:21:50 +08:00 |
|
648540858
|
a739701621
|
Merge branch 'master' into dev/录制计划
|
2024-11-28 14:38:51 +08:00 |
|
648540858
|
f7ed06e5f5
|
调整通用点播代码封装
|
2024-11-28 14:38:20 +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
|
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
|
86879aa58d
|
临时提交
|
2024-11-14 09:59:16 +08:00 |
|
648540858
|
d720275ada
|
优化页面云台逻辑,重新设计预置点/巡航组/自动扫描/雨刷/辅助开关的页面,支持光圈放大缩小,支持焦距放大缩小
|
2024-11-13 17:12:57 +08:00 |
|
648540858
|
efc62ed3f1
|
优化预置位/自动扫描/巡航设置
|
2024-11-11 18:06:58 +08:00 |
|
648540858
|
e2c59eed88
|
Merge branch 'master' into dev/播放页面云台功能页面优化
|
2024-11-11 09:18:36 +08:00 |
|
648540858
|
726413f7df
|
修复多屏播放中 use-source-ip-as-stream-ip配置失效
|
2024-11-10 22:23:23 +08:00 |
|
648540858
|
5c2b4f386b
|
优化播放页面的预置位控制
|
2024-11-08 17:40:05 +08:00 |
|
648540858
|
dbe4c80896
|
修复设备编辑无法清理收流IP的BUG
|
2024-11-07 20:33:02 +08:00 |
|
648540858
|
35e3ec5c54
|
优化通道管理/业务分组页面逻辑
|
2024-11-07 13:28:46 +08:00 |
|
648540858
|
9a29f44c86
|
优化通道管理/行政区划页面逻辑
|
2024-11-05 18:23:58 +08:00 |
|
648540858
|
5304620861
|
重构报警SSE推送
|
2024-10-29 15:57:52 +08:00 |
|
648540858
|
ace7b78498
|
优化报警推送心跳定时任务
|
2024-10-29 14:30:56 +08:00 |
|