From f0ad850a7a962dcf53c6c88e31de4bc2b1e20457 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Tue, 13 Jan 2026 15:18:16 +0800
Subject: [PATCH] 设备和区域场景list 过滤时增加id返回已绑定的子数据
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java
index 38f7350..bd5174c 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java
@@ -20,6 +20,7 @@
import org.sxkj.fw.cockpit.vo.DeviceStatisticsVO;
import org.sxkj.fw.device.dto.FwDeviceDTO;
import org.sxkj.fw.device.entity.FwDeviceEntity;
+import org.sxkj.fw.device.vo.CockpitFwDeviceVO;
import org.sxkj.fw.device.vo.FwDeviceVO;
import org.sxkj.fw.device.excel.FwDeviceExcel;
import org.sxkj.fw.device.mapper.FwDeviceMapper;
@@ -44,6 +45,11 @@
return page.setRecords(baseMapper.selectFwDevicePage(page, fwDevice));
}
+ @Override
+ public List<FwDeviceEntity> selectFwDeviceList(Integer isAreaSelect, Long areaId) {
+ return baseMapper.selectFwDeviceList(isAreaSelect, areaId);
+ }
+
@Override
public List<FwDeviceExcel> exportFwDevice(Wrapper<FwDeviceEntity> queryWrapper) {
@@ -55,7 +61,18 @@
}
/**
- *
+ * 获取设备列表
+ * @param page
+ * @param fwDevice
+ * @return
+ */
+ @Override
+ public IPage<CockpitFwDeviceVO> selectCockpitDevicePage(IPage<CockpitFwDeviceVO> page, FwDeviceDTO fwDevice) {
+ return page.setRecords(baseMapper.selectCockpitDevicePage(page, fwDevice));
+ }
+
+ /**
+ * 设备类型统计
* @return
*/
@Override
@@ -63,6 +80,10 @@
return baseMapper.statisticalDeviceType();
}
+ /**
+ * 设备属性统计
+ * @return
+ */
@Override
public AlarmStatisticsVO statisticalDeviceAtt() {
return baseMapper.statisticalDeviceAtt();
--
Gitblit v1.9.3