Merge remote-tracking branch 'origin/master'

linwei

2026-01-28 c04afebf9cebfd65bf55c2395e732f36f558d208

 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, Integer isTrack);


   /**
@@ -80,7 +92,7 @@
    * 设备出库去向统计
    * @return 统计数据
    */
   List<DeviceStatisticsVO> getDeviceOutStatistics();
   List<DeviceStatisticsVO> getDeviceOutStatistics(String effectiveRangeKmIsNotNull);

   /**
    * 设备生产厂商统计
@@ -109,4 +121,19 @@
    * @return
    */
   Map<Long, String> selectSceneNameByDeviceIds(List<Long> deviceIds);

   /**
    * 判断设备是否绑定区域
    *
    * @param deviceId
    * @return
    */
   boolean existsAreaBindByDeviceId(Long deviceId);

   /**
    * 新增或修改设备
    * @param fwDeviceEntity
    * @return
    */
   boolean saveOrUpdateDevice(FwDeviceEntity fwDeviceEntity);
}