009f1cb0f3
更新readme， 增加数据库更新脚本
2025-03-12 14:28:50 +08:00
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
cb5a09214a
移除多余代码
2025-03-11 15:11:45 +08:00
1f6a2f3fdb
Merge remote-tracking branch 'origin/master'
2025-03-11 09:46:43 +08:00
171702e4ce
[接口文档] 补充缺少的登录信息描述
2025-03-11 09:46:33 +08:00
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
b6a6144bf2
Merge remote-tracking branch 'origin/master'
2025-03-09 06:28:22 +08:00
38378ef3a8
更新readme
2025-03-09 06:28:08 +08:00
bc249b6786
[国标级联] 完善通用通道前端控制处理接口
2025-03-06 16:30:42 +08:00
60d2ed10ec
[SIP事务] 修复无法根据流信息移除的事务
2025-03-06 16:03:28 +08:00
8a71208035
[国标级联] 增加通用通道云台控制和预置位处理接口
2025-03-06 16:01:05 +08:00
c0d043ecd9
[国标级联] 增加前端控制指令解析
2025-03-06 15:27:25 +08:00
c0aec7562b
[国标级联] 调整云台控制调用逻辑
2025-03-05 17:20:55 +08:00
e080534b15
[国标级联] 修复点播未开始的拉流代理通道时推流失败的BUG
2025-03-05 16:04:05 +08:00
85ecc4c201
修复国标通道编辑页面
2025-03-05 09:57:31 +08:00
e21cf8a03f
补充缺少的字段
2025-03-05 09:46:53 +08:00
2cc1ca611d
Merge pull request #1783 from QianNangong/patch-5
...
修复 PostgreSQL 初始化脚本
2025-03-05 09:44:53 +08:00
df3b581f61
修复 PostgreSQL 初始化脚本
2025-03-03 11:55:29 +08:00
4162a731cb
Merge pull request #1773 from QianNangong/patch-4
...
修复一个可能触发 NPE 的问题
2025-02-24 14:09:43 +08:00
483323cf3b
Merge pull request #1777 from q792602257/master
...
[Feature] 实现h265web功能
2025-02-24 14:08:06 +08:00
11170fad7a
实现h265web功能
2025-02-21 18:25:05 +08:00
924de556b8
优化网页表格使用统一高度
2025-02-21 15:20:14 +08:00
9f9141704e
修复一个可能触发 NPE 的问题
2025-02-19 17:03:49 +08:00
4a41de6039
修复国标级联播放拉流代理空指针异常
2025-02-19 14:09:51 +08:00
3b714f8e2c
修复国标级联播放拉流代理
2025-02-19 11:26:35 +08:00
1bed3dc5e0
增加日志
2025-02-19 11:07:09 +08:00
73560d9e7e
优化编码信息刷新， 优化语音对讲选择按钮
2025-02-19 10:53:02 +08:00
b68e5423db
编码信息增加定时刷新
2025-02-19 10:40:13 +08:00
158fbaac9c
Merge branch 'master' into dev/数据库统合
2025-02-19 09:48:26 +08:00
0de1ee8c19
Merge pull request #1772 from guobi777/master
...
fix: 新增更新分组时校验节点编码唯一性
2025-02-19 09:47:54 +08:00
1ead85f05b
Merge pull request #1771 from q792602257/patch-1
...
[BUG] 修复执行录像计划定时任务时，没有录像任务导致的java.util.ConcurrentModificationException
2025-02-19 09:45:38 +08:00
6b7672aa96
Merge pull request #1769 from coder-xiaomo/patch-1
...
修复 [ h265web.vue] 文件名开头包含空格导致前端启动报错问题
2025-02-19 09:31:43 +08:00
e8c65bed62
fix: 新增更新分组时校验节点编码唯一性
2025-02-19 09:19:14 +08:00
676e2d7ea9
message消息适配新的回调模式
2025-02-18 17:04:13 +08:00
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
310fbe0a01
修复 [ h265web.vue] 文件名开头包含空格导致前端启动报错问题
2025-02-15 02:12:27 +08:00
3da6444baa
调整设备控制相关的接口
2025-02-13 15:15:36 +08:00
c5eca3ca0e
修复sip消息订阅事件移除失败的BUG
2025-02-12 22:55:51 +08:00
b7d0eb793d
去除多余注释
2025-02-12 20:58:58 +08:00
9618f23af8
修复message和sip消息超时未回复的判断机制
2025-02-12 20:54:20 +08:00
5808c7aff5
[集群] 重构message消息接受返回值的方式
2025-02-12 17:20:12 +08:00
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
d08248aae9
调整心跳间隔的设置机制以及状态的判断
2025-02-11 18:16:05 +08:00
ea12e3465f
修复语音对讲后停止点播失败的BUG
2025-02-11 16:06:18 +08:00
3fe131eed3
修复录制计划以来全局录像配置， 目前去除依赖，目前录制计划开启录像
2025-02-11 11:08:52 +08:00
c38c4e3979
[集群] 增加强制关键帧/看守位控制/拉框放大缩小/设备状态查询
2025-02-08 20:52:46 +08:00
71390a7b51
[集群] 增加远程重启/录像控制/布防（或撤防）/重置报警， 增加关闭推流接口
2025-02-08 17:29:31 +08:00
8ca982485c
[集群] 增加设备基本配置和设备配置查询
2025-02-08 10:45:47 +08:00
547432e194
优化jwk.json读取
2025-02-07 17:48:06 +08:00
39de934f89
Merge pull request #1762 from BeatTime/bugfix/读取jwk.json异常
...
fix: 修复jwk.json无法读取的问题，同时增加jwkFile配置项
2025-02-05 16:46:08 +08:00
lin
南宫茜
Jerry Yan
guo
JerryYan
程序员小墨