Commit Graph

882 Commits

Author SHA1 Message Date
lin
f2e3016a48 修复云端录像seek不准确的问题 2025-04-14 12:43:05 +08:00
648540858
c8822e2b86 优化云端录像播放逻辑 2025-04-13 20:14:48 +08:00
lin
eea367d6d7 增加录像seek和倍速播放接口 2025-04-12 21:24:02 +08:00
lin
9d0c8f91b9 临时提交 2025-04-10 18:00:12 +08:00
lin
aa1e497d76 临时提交 2025-04-10 17:11:31 +08:00
648540858
69f1056836 录制计划时间精确到分钟 2025-04-04 23:30:18 +08:00
lin
ec74488b4a 修复国标级联注册失败 2025-03-20 09:21:01 +08:00
lin
ccafa0ea01 解决推流设备状态更新异常 2025-03-19 16:22:38 +08:00
lin
298fb05378 优化录像下载。 支持八倍速(设备支持的最高速度)下载 2025-03-13 16:48:15 +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
南宫茜
9f9141704e 修复一个可能触发 NPE 的问题 2025-02-19 17:03:49 +08:00
lin
158fbaac9c Merge branch 'master' into dev/数据库统合 2025-02-19 09:48:26 +08:00
lin
676e2d7ea9 message消息适配新的回调模式 2025-02-18 17:04:13 +08:00
JerryYan
d0d0776d4a [BUG] 修复执行录像计划定时任务时,没有录像任务导致的java.util.ConcurrentModificationException
报错内容:
```
java.util.ConcurrentModificationException: null
        at java.util.HashMap$HashIterator.nextNode(HashMap.java:1469)
        at java.util.HashMap$KeyIterator.next(HashMap.java:1493)
        at com.genersoft.iot.vmp.service.impl.RecordPlanServiceImpl.stopStreams(RecordPlanServiceImpl.java:143)
        at com.genersoft.iot.vmp.service.impl.RecordPlanServiceImpl.execution(RecordPlanServiceImpl.java:92)
```

做出的修改:
按照下面的逻辑搬上来了
2025-02-18 09:36:15 +08:00
lin
3da6444baa 调整设备控制相关的接口 2025-02-13 15:15:36 +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
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
5f07db7ed4 [集群] 修复语音对讲支持 2025-01-21 17:43:14 +08:00
648540858
2297a2ffa7 [集群] 修复语音对讲支持 2025-01-21 17:37:57 +08:00
648540858
ba27819874 [集群] 增加语音对讲支持 2025-01-21 17:35:21 +08:00
648540858
4e66e2bc6d [集群] 增加通道刷新状态消息 2025-01-21 17:04:51 +08:00
648540858
63fbafe687 [集群] 支持通道刷新 2025-01-03 17:52:38 +08:00
648540858
5f4c943f26 [集群] 修复BUG 2025-01-03 17:37:01 +08:00
648540858
81c05e4b8b [集群] 修复BUG 2025-01-03 16:56:54 +08:00
648540858
000b797f48 [集群] 修复BUG 2025-01-03 16:53:59 +08:00
648540858
a9a4c7a4e5 [集群] 修复BUG 2025-01-03 16:34:11 +08:00
648540858
30ab315a15 [集群] 修复BUG 2025-01-03 16:29:35 +08:00
648540858
bfc77a1d11 [集群] 修复BUG 2025-01-03 16:25:33 +08:00
648540858
42322c75cc [集群] 优化国标级联目录更新 2025-01-03 16:21:20 +08:00
648540858
b650d5821d [集群] 修复BUG 2025-01-03 15:43:07 +08:00
648540858
232fa760e2 [集群] 支持国标级联目录更新 2025-01-03 15:34:53 +08:00
648540858
b0b3f32e03 [集群] 支持国标级联更新 2025-01-02 18:34:22 +08:00
648540858
91b0ba4d5e [集群-自动切换过国标级联] 启动时自动注册上级只注册本平台的上级 2025-01-02 16:30:02 +08:00
648540858
11599b2f05 临时提交 2024-12-31 16:10:00 +08:00
648540858
874733fa2c [RPC 云端录像] 修复服务ID 获取 2024-12-31 15:36:48 +08:00
648540858
32e90b2537 [RPC 云端录像] 修复时长显示 2024-12-31 15:13:56 +08:00
648540858
08a75d38a8 [RPC 云端录像] 增加云端录像播放 2024-12-31 14:54:11 +08:00
648540858
a324e4c95a [RPC] 添加拉流代理支持 2024-12-31 11:19:01 +08:00
648540858
6dc64c05ee [RPC] 修复推流播放 2024-12-30 17:05:31 +08:00
648540858
f70aabc2b2 [RPC] 推流播放 2024-12-30 16:59:08 +08:00
648540858
0cebbee0a9 [RPC] 增加订阅支持 2024-12-30 16:19:14 +08:00
648540858
45337311ec [国标PTZ] 添加调用其他wvp的云台控制 2024-12-30 10:27:49 +08:00
648540858
a4af7eb9a1 Merge branch 'master' into dev/数据库统合 2024-12-27 17:14:48 +08:00