From 23e1f1330b144f63780c1a5d438e2b3c53be2d7f Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 21 Jan 2026 12:42:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceController.java | 24 +++++-------------------
1 files changed, 5 insertions(+), 19 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 f6d72d5..d83521d 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,7 +32,6 @@
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.cockpit.vo.DeviceStatisticsVO;
import org.sxkj.fw.common.GenericConverter;
@@ -88,10 +87,11 @@
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
- @ApiOperation(value = "列表", notes = "传入isAreaSelect和区域id")
+ @ApiOperation(value = "列表", notes = "传入isAreaSelect、areaId、status")
public R<List<FwDeviceVO>> list(@RequestParam(value = "isAreaSelect", required = false) Integer isAreaSelect,
- @RequestParam(value = "areaId", required = false) Long areaId) {
- List<FwDeviceEntity> list = fwDeviceService.selectFwDeviceList(isAreaSelect, areaId);
+ @RequestParam(value = "areaId", required = false) Long areaId,
+ @RequestParam(value = "status", required = false) Integer status) {
+ List<FwDeviceEntity> list = fwDeviceService.selectFwDeviceList(isAreaSelect, areaId, status);
FwDeviceWrapper wrapper = FwDeviceWrapper.build();
return R.data(list.stream().map(wrapper::entityVO).collect(Collectors.toList()));
}
@@ -103,21 +103,7 @@
@ApiOperationSupport(order = 3)
@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));
- 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);
+ return R.data(fwDeviceService.selectFwDevicePageVo(fwDevice, query));
}
/**
--
Gitblit v1.9.3