From 894d18bb13dae351028e584f9b73a8d6964a0a50 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 19 Nov 2025 13:51:17 +0800
Subject: [PATCH] 2025-11-15 zwy 航线信息被删掉后，航线任务列表在读取航线时会报错；处理错误，航线不存在时航线文件名称显示空。正常逻辑应该是航线文件有任务在用，就不能随意删除；
---
ard-admin/src/main/java/com/ard/web/controller/sample/DeviceController.java | 35 ++++++++++++++++++++---------------
1 files changed, 20 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..18420ce 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();
--
Gitblit v1.9.3