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/IFwDeviceService.java | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/IFwDeviceService.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/IFwDeviceService.java index 328119e..deaabae 100644 --- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/IFwDeviceService.java +++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/IFwDeviceService.java @@ -17,8 +17,11 @@ package org.sxkj.fw.device.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import org.sxkj.fw.cockpit.vo.AlarmStatisticsVO; +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 com.baomidou.mybatisplus.core.metadata.IPage; @@ -41,6 +44,15 @@ */ IPage<FwDeviceEntity> selectFwDevicePage(IPage<FwDeviceEntity> page, FwDeviceDTO fwDevice); + /** + * 列表查询 + * + * @param isAreaSelect + * @param areaId + * @return + */ + List<FwDeviceEntity> selectFwDeviceList(Integer isAreaSelect, Long areaId); + /** * 导出数据 @@ -50,4 +62,23 @@ */ List<FwDeviceExcel> exportFwDevice(Wrapper<FwDeviceEntity> queryWrapper); + /** + * 设备类型统计 + * @return + */ + List<DeviceStatisticsVO> statisticalDeviceType(); + + /** + * 设备报警统计 + * @return + */ + AlarmStatisticsVO statisticalDeviceAtt(); + + /** + * 驾驶舱获取设备列表 + * @param page + * @param fwDevice + * @return + */ + IPage<CockpitFwDeviceVO> selectCockpitDevicePage(IPage<CockpitFwDeviceVO> page, FwDeviceDTO fwDevice); } -- Gitblit v1.9.3