648540858
|
26ee38aebe
|
Merge branch 'master' into dev/数据库统合
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/streamProxy/bean/StreamProxy.java
# src/main/java/com/genersoft/iot/vmp/streamProxy/bean/StreamProxyParam.java
|
2024-12-31 10:33:12 +08:00 |
|
648540858
|
f078c6f7a0
|
[拉流代理] 修复 #1718
|
2024-12-31 10:31:03 +08:00 |
|
648540858
|
8f7016878d
|
[拉流代理] 增加单独的字段管理每次拉流需要的节点
|
2024-12-31 10:17:49 +08:00 |
|
648540858
|
7e89b5f97f
|
临时提交
|
2024-12-31 09:31:58 +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
|
3d2a87f61d
|
修复推流流注册时写入节点ID
|
2024-12-30 16:47:03 +08:00 |
|
648540858
|
c2fb892f2a
|
修复推流流注册时写入服务ID
|
2024-12-30 16:39:48 +08:00 |
|
648540858
|
785da6d5ef
|
调整前端获取服务ID方式
|
2024-12-30 16:32:37 +08:00 |
|
648540858
|
0cebbee0a9
|
[RPC] 增加订阅支持
|
2024-12-30 16:19:14 +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
|
45337311ec
|
[国标PTZ] 添加调用其他wvp的云台控制
|
2024-12-30 10:27:49 +08:00 |
|
648540858
|
115b41e001
|
[国标PTZ] 添加调用其他wvp的云台控制
|
2024-12-27 17:53:25 +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
|
a4af7eb9a1
|
Merge branch 'master' into dev/数据库统合
|
2024-12-27 17:14:48 +08:00 |
|
648540858
|
f2c7a06516
|
[推流列表] 播放时根据实际状态更新状态
|
2024-12-27 17:14:26 +08:00 |
|
648540858
|
c231faeff6
|
[推流列表] 直接使用节点服务接口校验推流状态
|
2024-12-27 17:05:49 +08:00 |
|
648540858
|
14813a2c28
|
Merge pull request #1735 from QianNangong/patch-2
修复数据库内容
|
2024-12-27 16:47:21 +08:00 |
南宫茜
|
73be39127b
|
修复数据库内容
|
2024-12-27 16:30:44 +08:00 |
|
648540858
|
f5443abb33
|
Merge pull request #1734 from QianNangong/fix_comparator
修复比较符
|
2024-12-27 15:55:35 +08:00 |
|
南宫茜
|
8d662769d7
|
修复比较符
|
2024-12-27 15:54:06 +08:00 |
|
648540858
|
7751eae913
|
Merge branch 'master' into dev/数据库统合
|
2024-12-27 15:31:27 +08:00 |
|
648540858
|
dea05b46d3
|
Merge pull request #1733 from QianNangong/fix_gb_status
修复级联状态推成 0 和 1 而不是 ON 和 OFF 的问题
|
2024-12-27 15:30:44 +08:00 |
|
Li Keqing
|
dade2854b1
|
修复级联状态推成 0 和 1 而不是 ON 和 OFF 的问题
|
2024-12-27 15:18:56 +08:00 |
|
648540858
|
a5f1422466
|
[WVP集群] 合并主线
|
2024-12-27 11:18:29 +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
|
460f73555e
|
[推流设备] 修复推流中重启服务导致无法继续播放
|
2024-12-27 10:42:40 +08:00 |
|
648540858
|
3ea236efdd
|
优化更新sql
|
2024-12-27 10:07:22 +08:00 |
|
648540858
|
ce73b6feb1
|
修复清理通道错误
|
2024-12-27 09:53:27 +08:00 |
|
648540858
|
081bb6de18
|
完善通道数据类型的保存与展示
|
2024-12-24 23:35:01 +08:00 |
|
648540858
|
e82213b466
|
临时提交
|
2024-12-24 08:00:56 +08:00 |
|
648540858
|
28961f51f7
|
完善数据库结构调用
|
2024-12-23 23:49:54 +08:00 |
|
648540858
|
f5ae9718d4
|
临时提交
|
2024-12-23 18:39:54 +08:00 |
|
648540858
|
59e3175f00
|
调整代码对通道类型的调用
|
2024-12-23 18:37:24 +08:00 |
|
648540858
|
19453f7ca9
|
临时提交
|
2024-12-23 07:20:48 +08:00 |
|
648540858
|
825daad355
|
调整数据库结构
|
2024-12-22 08:35:36 +08:00 |
|
648540858
|
1b9799eb1f
|
Merge branch 'master' into dev/数据库统合
|
2024-12-20 10:24:53 +08:00 |
|
648540858
|
4757cbd34e
|
调整MediaStatus内容
|
2024-12-19 23:14:45 +08:00 |
|
648540858
|
e64f65c2f7
|
Merge pull request #1719 from QianNangong/master
回复正确的 MediaStatus 内容
|
2024-12-19 23:01:42 +08:00 |
|
648540858
|
9db3eb7909
|
Merge pull request #1721 from QianNangong/fix_web
修复设备历史录像页面文本提示
|
2024-12-19 23:01:31 +08:00 |
|
Li Keqing
|
f265bc9d59
|
修复设备历史录像页面文本提示
|
2024-12-19 15:18:28 +08:00 |
|
Li Keqing
|
a43a98e185
|
回复正确的 MediaStatus 内容
|
2024-12-19 09:24:09 +08:00 |
|
648540858
|
0ff4d04698
|
Merge branch 'master' into dev/数据库统合2
|
2024-12-18 15:05:23 +08:00 |
|
648540858
|
03033e6ac9
|
添加异常处理
|
2024-12-18 11:30:07 +08:00 |
|
648540858
|
b78e6dfd70
|
Merge branch 'master' into dev/数据库统合
|
2024-12-16 17:55:46 +08:00 |
|
648540858
|
90e5c35975
|
修复创建SIP回复时使用了错误的状态码
|
2024-12-16 17:00:44 +08:00 |
|
648540858
|
b37b9f3b03
|
支持配置管理页面登录超时时间
|
2024-12-16 16:14:28 +08:00 |
|
648540858
|
696d182f6a
|
兼容科达国标级联语音对讲
|
2024-12-16 15:49:38 +08:00 |