Merge remote-tracking branch 'origin/master'

linwei

2026-01-14 bc1a6bb5bb2803ed6a5669a976bf2b47f3dacfca

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/IFwDeviceService.java

@@ -27,6 +27,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
import java.util.List;
import java.util.Map;

/**
 * 设备表 服务类
@@ -43,6 +44,15 @@
    * @return
    */
   IPage<FwDeviceEntity> selectFwDevicePage(IPage<FwDeviceEntity> page, FwDeviceDTO fwDevice);

   /**
    * 列表查询
    *
    * @param isAreaSelect
    * @param areaId
    * @return
    */
   List<FwDeviceEntity> selectFwDeviceList(Integer isAreaSelect, Long areaId);


   /**
@@ -72,4 +82,12 @@
    * @return
    */
   IPage<CockpitFwDeviceVO> selectCockpitDevicePage(IPage<CockpitFwDeviceVO> page, FwDeviceDTO fwDevice);

   /**
    * 获取设备关联场景名称
    *
    * @param deviceIds
    * @return
    */
   Map<Long, String> selectSceneNameByDeviceIds(List<Long> deviceIds);
}