Commit Graph

127 Commits

Author SHA1 Message Date
lin
9614584219 通用通道支持预置位调用,删除, 增加 2025-07-31 19:05:07 +08:00
lin
19b873ba5c 通用通道支持云台控制 2025-07-31 18:49:53 +08:00
lin
867b26b9a8 Merge branch 'master' into dev/通用通道云台控制 2025-07-30 10:34:58 +08:00
lin
24417203f0 修复前端布防撤防调用失败 2025-07-30 10:22:51 +08:00
lin
51759535fc 临时提交 2025-07-07 09:30:04 +08:00
lin
8d488b33e9 调整菜单结构,增加通道列表,支持节点搜索 2025-07-02 17:21:20 +08:00
lin
f8e5e8f057 优化拉流代理播放机制 2025-07-01 17:07:10 +08:00
xiaoQQya
1c25f2f190 feat: 新增国标收流通道列表查看 2025-06-26 11:46:14 +08:00
Jerry Yan
68806b4202 支持查询时根据channelId查询报警
Fixes #795
2025-06-11 13:00:27 +08:00
lin
f4bbca78e5 优化通道变化消息发送以及增加设备状态丢失检测 2025-06-03 16:52:42 +08:00
648540858
58e82ec185 临时提交 2025-05-28 22:32:14 +08:00
648540858
7c7ef34045 Merge branch '2.7.3'
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeHolder.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPSender.java
2025-05-22 21:09:22 +08:00
lin
dd17462b68 重构设备订阅保活和更新机制 2025-05-21 14:57:10 +08:00
lin
113743a065 增加新版本web页面 2025-04-28 15:04:06 +08:00
lin
5bbc15d023 去除录像倍速限制 2025-04-18 23:14:57 +08:00
lin
e76d25816a 修复前端的符号错误 2025-03-31 18:01:34 +08:00
lin
91c9bc4fe3 去除接口多余的分隔符 2025-03-27 17:13:31 +08:00
lin
867d1bfb9b 支持清理异常业务分组节点,使通道可被挂载 2025-03-14 15:32:03 +08:00
lin
4dce850aea 行政区划支持异常数据补充行政区划节点以及清理异常行政区划节点使通道可被挂载 2025-03-14 14:53:47 +08:00
648540858
d5dc0f9afd 临时提交 2025-03-14 07:38:58 +08:00
648540858
cbcd99da40 支持展示行政区划节点异常的通道数据 2025-03-13 23:12:39 +08:00
lin
298fb05378 优化录像下载。 支持八倍速(设备支持的最高速度)下载 2025-03-13 16:48:15 +08:00
lin
e0f9c93b0f 修复方法名错别字 2025-03-12 15:02:32 +08:00
lin
b904e594a1 Merge branch 'dev/数据库统合'
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/controller/DeviceQuery.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/event/EventPublisher.java
2025-03-12 14:20:28 +08:00
lin
cb5a09214a 移除多余代码 2025-03-11 15:11:45 +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
676e2d7ea9 message消息适配新的回调模式 2025-02-18 17:04:13 +08:00
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