Merge remote-tracking branch 'origin/master'

linwei

2026-02-02 1bfbc52da47b22f00a1c1f5f670c30f70d999873

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

@@ -17,8 +17,11 @@
package org.sxkj.fw.area.mapper;

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.vo.FwAreaDivideVO;
import org.sxkj.fw.area.vo.FwAreaDivideStatisticsVO;
import org.sxkj.fw.area.vo.FwDefenseSceneVO;
import org.sxkj.fw.area.excel.FwAreaDivideExcel;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
@@ -43,6 +46,83 @@
    */
   List<FwAreaDivideVO> selectFwAreaDividePage(IPage page, FwAreaDivideDTO fwAreaDivide);

   /**
    * 列表
    *
    * @param filterSelected
    * @param sceneId
    * @return
    */
   List<FwAreaDivideVO> selectFwAreaDivideList(@Param("filterSelected") Integer filterSelected,
      @Param("sceneId") Long sceneId,
      @Param("areaTypeKeyList") List<String> areaTypeKeyList,
      @Param("isSetSceneManage") Integer isSetSceneManage,
      @Param("flyTime") java.time.LocalDateTime flyTime);

   /**
    * 根据设备ID获取区域
    *
    * @param deviceIds
    * @return
    */
   List<FwAreaDivideVO> selectFwAreaDivideListByDeviceIds(@Param("deviceIds") List<Long> deviceIds);

   /**
    * 根据区域ID获取场景
    *
    * @param areaIds
    * @return
    */
   List<FwDefenseSceneVO> selectFwDefenseSceneListByAreaIds(@Param("areaIds") List<Long> areaIds);

   /**
    * 根据设备ID统计关联区域数量
    *
    * @param deviceId
    * @return
    */
   Integer selectAreaCountByDeviceId(@Param("deviceId") Long deviceId);

   /**
    * 统计分页
    *
    * @param page
    * @param fwAreaDivideStatistics
    * @return
    */
   List<FwAreaDivideStatisticsVO> selectFwAreaDivideStatisticsPage(IPage page, FwAreaDivideStatisticsDTO fwAreaDivideStatistics);

   /**
    * 统计详情
    *
    * @param fwAreaDivideStatistics
    * @return
    */
   FwAreaDivideStatisticsVO selectFwAreaDivideStatisticsDetail(FwAreaDivideStatisticsDTO fwAreaDivideStatistics);

   /**
    * 详情
    *
    * @param id
    * @return
    */
   FwAreaDivideVO selectFwAreaDivideDetail(@Param("id") Long id);

   /**
    * 新增（几何字段使用文本入库）
    *
    * @param fwAreaDivide
    * @return
    */
   int insertWithGeom(FwAreaDivideEntity fwAreaDivide);

   /**
    * 修改（几何字段使用文本入库）
    *
    * @param fwAreaDivide
    * @return
    */
   int updateWithGeomById(FwAreaDivideEntity fwAreaDivide);

   /**
    * 获取导出数据