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/service/IFwDeviceService.java | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 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 ab30638..f9a2a69 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 @@ -21,12 +21,14 @@ 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.param.FwDevicePageParam; import org.sxkj.fw.device.vo.CockpitFwDeviceVO; import org.sxkj.fw.device.vo.DeviceTypeStatisticsVO; import org.sxkj.fw.device.vo.FwDeviceVO; import org.sxkj.fw.device.excel.FwDeviceExcel; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; +import org.springblade.core.mp.support.Query; import java.util.List; import java.util.Map; @@ -47,13 +49,23 @@ IPage<FwDeviceEntity> selectFwDevicePage(IPage<FwDeviceEntity> page, FwDeviceDTO fwDevice); /** - * 列表查询 + * 自定义分页返回 * - * @param isAreaSelect - * @param areaId + * @param fwDevice + * @param query * @return */ - List<FwDeviceEntity> selectFwDeviceList(Integer isAreaSelect, Long areaId); + IPage<FwDeviceVO> selectFwDevicePageVo(FwDevicePageParam fwDevice, Query query); + + /** + * 列表查询 + * + * @param isAreaSelect 是否过滤区域 + * @param areaId 设备被关联区域id + * @param status 设备状态 + * @return + */ + List<FwDeviceEntity> selectFwDeviceList(Integer isAreaSelect, Long areaId, Integer status); /** -- Gitblit v1.9.3