From c0964ee738688a9e334179df9c177688271484a0 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Tue, 13 Jan 2026 16:40:01 +0800
Subject: [PATCH] 设备回显关联场景
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceController.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceController.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceController.java
index c7e0baa..4cf1bb1 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceController.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceController.java
@@ -32,6 +32,7 @@
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.StringUtil;
import org.springframework.web.bind.annotation.*;
import org.sxkj.fw.common.GenericConverter;
import org.sxkj.fw.common.IdParam;
@@ -101,7 +102,20 @@
@ApiOperation(value = "分页", notes = "传入fwDevice")
public R<IPage<FwDeviceVO>> page(FwDevicePageParam fwDevice, Query query) {
IPage<FwDeviceEntity> pages = fwDeviceService.selectFwDevicePage(Condition.getPage(query), GenericConverter.convert(fwDevice, FwDeviceDTO.class));
- return R.data(FwDeviceWrapper.build().pageVO(pages));
+ IPage<FwDeviceVO> result = FwDeviceWrapper.build().pageVO(pages);
+ List<FwDeviceVO> records = result.getRecords();
+ if (records != null && !records.isEmpty()) {
+ List<Long> deviceIds = records.stream()
+ .map(FwDeviceVO::getId)
+ .filter(id -> id != null)
+ .collect(Collectors.toList());
+ Map<Long, String> sceneNameMap = fwDeviceService.selectSceneNameByDeviceIds(deviceIds);
+ for (FwDeviceVO record : records) {
+ String sceneName = sceneNameMap.get(record.getId());
+ record.setSceneName(StringUtil.isBlank(sceneName) ? "/" : sceneName);
+ }
+ }
+ return R.data(result);
}
/**
--
Gitblit v1.9.3