From 73bc82f63cecf23b74cbf59ebb8bdfb40fe6e5b0 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 01 Dec 2025 11:25:28 +0800
Subject: [PATCH] 2025-12-01 zwy 多路直播，将外接相机直播地址插入设备列表中。数据库增加字段“cameraWebrtcUrl”，实体增加cameraWebrtcUrl字段。
---
ard-admin/src/main/java/com/ard/web/controller/sample/DeviceController.java | 1 +
ard-sample/src/main/java/com/ard/sample/manage/service/IDeviceService.java | 2 +-
ard-sample/src/main/java/com/ard/sample/manage/model/dto/DeviceDTO.java | 2 ++
ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java | 29 +++++++++++++++++++++++++++++
ard-sample/src/main/java/com/ard/sample/manage/model/entity/DeviceEntity.java | 3 +++
5 files changed, 36 insertions(+), 1 deletions(-)
diff --git a/ard-admin/src/main/java/com/ard/web/controller/sample/DeviceController.java b/ard-admin/src/main/java/com/ard/web/controller/sample/DeviceController.java
index 2f45d7a..0a8a995 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/sample/DeviceController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/sample/DeviceController.java
@@ -252,6 +252,7 @@
.firmwareVersion(dto.getFirmwareVersion())
.workType(dto.getWorkType())
.webrtcUrl(dto.getWebrtcUrl())
+ .cameraWebrtcUrl(dto.getCameraWebrtcUrl())
.compatibleStatus(dto.getFirmwareStatus() == null ? null :
DeviceFirmwareStatusEnum.CONSISTENT_UPGRADE != DeviceFirmwareStatusEnum.find(dto.getFirmwareStatus()))
.build();
diff --git a/ard-sample/src/main/java/com/ard/sample/manage/model/dto/DeviceDTO.java b/ard-sample/src/main/java/com/ard/sample/manage/model/dto/DeviceDTO.java
index 7ce55e1..e12138e 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/model/dto/DeviceDTO.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/model/dto/DeviceDTO.java
@@ -68,4 +68,6 @@
private Long workType;
private String webrtcUrl;
+
+ private String cameraWebrtcUrl;
}
\ No newline at end of file
diff --git a/ard-sample/src/main/java/com/ard/sample/manage/model/entity/DeviceEntity.java b/ard-sample/src/main/java/com/ard/sample/manage/model/entity/DeviceEntity.java
index 88efad7..6bb7b84 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/model/entity/DeviceEntity.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/model/entity/DeviceEntity.java
@@ -97,4 +97,7 @@
@TableField(value = "webrtcUrl")
private String webrtcUrl;
+ @TableField(value = "cameraWebrtcUrl")
+ private String cameraWebrtcUrl;
+
}
\ No newline at end of file
diff --git a/ard-sample/src/main/java/com/ard/sample/manage/service/IDeviceService.java b/ard-sample/src/main/java/com/ard/sample/manage/service/IDeviceService.java
index d8b0ad6..bd73b9d 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/service/IDeviceService.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/service/IDeviceService.java
@@ -165,7 +165,7 @@
Boolean updateWorkType(String sn, Long workType);
/**
- * 修改直播地址
+ * 修改机场及飞行器直播地址
* @param sn 設備sn
* @param webrtcUrl 直播地址
* */
diff --git a/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java b/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java
index a0488e9..d0f48f7 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java
@@ -1,6 +1,9 @@
package com.ard.sample.manage.service.impl;
import com.alibaba.fastjson2.JSONObject;
+import com.ard.device.camera.domain.ArdCamera;
+import com.ard.device.camera.service.IArdCameraService;
+import com.ard.device.channel.domain.ArdChannel;
import com.ard.sample.component.websocket.handler.LiveStreamHandler;
import com.ard.system.authorize.service.AuthorizeService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -69,6 +72,9 @@
@Autowired
private LiveStreamHandler _liveStreamHandler;
+
+ @Autowired
+ private IArdCameraService _cameraService;
@Autowired
private IMessageSenderService messageSender;
@@ -363,6 +369,17 @@
for(DeviceDTO devices : devicesList){
_liveStreamHandler.StartLiveStreaming(devices.getDeviceSn());
_liveStreamHandler.StartLiveStreaming(devices.getChildDeviceSn());
+ ArdCamera ardCamera = new ArdCamera();
+ ardCamera.setDockId(devices.getId());
+ List<ArdCamera> ardCameraList = _cameraService.selectArdCameraList(ardCamera);
+ for(ArdCamera ardCamera1 : ardCameraList){
+ for(ArdChannel ardChannel : ardCamera1.getChannelList()) {
+ if(ardChannel.getChanNo() == 1) {
+ // 修改列表中外接相机地址
+ updateCameraWebrtcUrl(devices.getDeviceSn(), ardChannel.getArdVtdu().getWebrtcUrl());
+ }
+ }
+ }
}
devicesList.stream()
@@ -763,6 +780,7 @@
.deptId(entity.getDeptId())
.workType(entity.getWorkType())
.webrtcUrl(entity.getWebrtcUrl())
+ .cameraWebrtcUrl(entity.getCameraWebrtcUrl())
.workspaceName(entity.getDeptId() != null
? Optional.ofNullable(sysDeptService.selectDeptById(entity.getDeptId()))
.map(SysDept::getDeptName)
@@ -822,6 +840,16 @@
int update = mapper.update(null, lambdaUpdateWrapper);
return update > 0;
}
+
+ public Boolean updateCameraWebrtcUrl(String sn, String CameraWebrtcUrl){
+ LambdaUpdateWrapper<DeviceEntity> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+ lambdaUpdateWrapper.eq(DeviceEntity::getDeviceSn, sn)
+ .set(DeviceEntity::getCameraWebrtcUrl, CameraWebrtcUrl);
+ int update = mapper.update(null, lambdaUpdateWrapper);
+ return update > 0;
+ }
+
+
@Override
public Boolean bindDevice(DeviceDTO device) {
@@ -1213,6 +1241,7 @@
.firmwareVersion(dto.getFirmwareVersion())
.workType(dto.getWorkType())
.webrtcUrl(dto.getWebrtcUrl())
+ .cameraWebrtcUrl(dto.getCameraWebrtcUrl())
.compatibleStatus(dto.getFirmwareStatus() == null ? null :
DeviceFirmwareStatusEnum.CONSISTENT_UPGRADE != DeviceFirmwareStatusEnum.find(dto.getFirmwareStatus()))
.build();
--
Gitblit v1.9.3