Merge remote-tracking branch 'origin/master'

linwei

2026-01-21 23e1f1330b144f63780c1a5d438e2b3c53be2d7f

 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,6 +49,15 @@
   IPage<FwDeviceEntity> selectFwDevicePage(IPage<FwDeviceEntity> page, FwDeviceDTO fwDevice);

   /**
    * 自定义分页返回
    *
    * @param fwDevice
    * @param query
    * @return
    */
   IPage<FwDeviceVO> selectFwDevicePageVo(FwDevicePageParam fwDevice, Query query);

   /**
    * 列表查询
    *
    * @param isAreaSelect 是否过滤区域