Merge remote-tracking branch 'origin/master'

rain

2026-02-02 4fa212add5bb7689331e9e070c802bfcb5dcafa2

 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/IFwAreaDivideService.java

@@ -20,6 +20,7 @@
import org.sxkj.fw.area.dto.FwAreaDivideDTO;
import org.sxkj.fw.area.dto.FwAreaDivideStatisticsDTO;
import org.sxkj.fw.area.entity.FwAreaDivideEntity;
import org.sxkj.fw.area.entity.FwAreaDivideExtEntity;
import org.sxkj.fw.area.vo.FwAreaDivideVO;
import org.sxkj.fw.area.vo.FwAreaDivideStatisticsVO;
import org.sxkj.fw.area.excel.FwAreaDivideExcel;
@@ -51,7 +52,7 @@
    * @param sceneId
    * @return
    */
   List<FwAreaDivideVO> selectFwAreaDivideList(Integer filterSelected, Long sceneId);
   List<FwAreaDivideVO> selectFwAreaDivideList(Integer filterSelected, Long sceneId, String areaTypeKeys, Integer isSetSceneManage, java.time.LocalDateTime flyTime);

   /**
    * 根据设备ID获取关联场景名称
@@ -102,4 +103,13 @@
    */
   List<FwAreaDivideExcel> exportFwAreaDivide(Wrapper<FwAreaDivideEntity> queryWrapper);

   /**
    * 新增或修改（主表 + 扩展表批量）
    *
    * @param fwAreaDivide
    * @param fwAreaDivideExtList
    * @return
    */
   boolean saveOrUpdateWithExt(FwAreaDivideEntity fwAreaDivide, List<FwAreaDivideExtEntity> fwAreaDivideExtList);

}