From 2e5e7a94ada4509fa286d8438b6b127aaa906570 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Sat, 29 Nov 2025 16:54:33 +0800
Subject: [PATCH] 2025-11-29 zwy 多路直播，將視頻地址存到列表里；在請求設備列表時調用機場推流。
---
ard-admin/src/main/java/com/ard/web/controller/sample/DeviceController.java | 36 +++++++++++++++++++++---------------
1 files changed, 21 insertions(+), 15 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 0b561b6..2f45d7a 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
@@ -95,9 +95,11 @@
* @return
*/
@ApiOperation("设备列表")
+ @PreAuthorize("@ss.hasPermi('device:dock:list')")
@GetMapping("/list")
public ResponseResult<List<DeviceDTO>> getDevices() {
- List<DeviceDTO> devicesList = deviceService.getDevicesTopoForWeb();
+// List<DeviceDTO> devicesList = deviceService.getDevicesTopoForWeb();
+ List<DeviceDTO> devicesList = deviceService.getDockList();
return ResponseResult.success(devicesList);
}
@@ -140,6 +142,7 @@
*/
@ApiOperation("绑定设备列表")
@GetMapping("/list/bound")
+ @PreAuthorize("@ss.hasPermi('device:dock:list')")
public ResponseResult<PaginationData<DeviceDTO>> getBoundDevicesWithDomain(Integer domain,
@RequestParam(defaultValue = "1") Long page,
@RequestParam(value = "page_size",
@@ -210,23 +213,25 @@
if (propertyEnumOpt.isEmpty()) {
return ResponseResult.error(CommonErrorEnum.ILLEGAL_ARGUMENT);
}
- deviceService.devicePropertySet(dockSn, propertyEnumOpt.get(), param.get(property));
+ deviceService.devicePropertySet(dockSn, propertyEnumOpt.get(), param);
return ResponseResult.success();
}
- /**
- * 查询机场设备列表
- */
- @PreAuthorize("@ss.hasPermi('device:camera:list')")
- @GetMapping("/test/list")
- @ApiOperation("查询机场设备列表")
- public TableDataInfo list(DeviceDTO device) {
- startPage();
- DeviceEntity deviceEntity = deviceDTO2Entity(device);
- QueryWrapper<DeviceEntity> queryWrapper=new QueryWrapper<>(deviceEntity);
- List<DeviceEntity> list = deviceService.selectList(queryWrapper);
- return getDataTable(list);
- }
+ //.get(property)
+
+// /**
+// * 查询机场设备列表
+// */
+// @PreAuthorize("@ss.hasPermi('device:camera:list')")
+// @GetMapping("/test/list")
+// @ApiOperation("查询机场设备列表")
+// public TableDataInfo list(DeviceDTO device) {
+// startPage();
+// DeviceEntity deviceEntity = deviceDTO2Entity(device);
+// QueryWrapper<DeviceEntity> queryWrapper=new QueryWrapper<>(deviceEntity);
+// List<DeviceEntity> list = deviceService.selectList(queryWrapper);
+// return getDataTable(list);
+// }
private DeviceEntity deviceDTO2Entity(DeviceDTO dto) {
DeviceEntity.DeviceEntityBuilder builder = DeviceEntity.builder();
@@ -246,6 +251,7 @@
.domain(dto.getDomain())
.firmwareVersion(dto.getFirmwareVersion())
.workType(dto.getWorkType())
+ .webrtcUrl(dto.getWebrtcUrl())
.compatibleStatus(dto.getFirmwareStatus() == null ? null :
DeviceFirmwareStatusEnum.CONSISTENT_UPGRADE != DeviceFirmwareStatusEnum.find(dto.getFirmwareStatus()))
.build();
--
Gitblit v1.9.3