Merge remote-tracking branch 'origin/master'

rain

2026-02-09 66bfbdb9251c22ffa2b5f05595a76a3547a2f5eb

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

@@ -17,8 +17,12 @@
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.param.FwAreaDivideListParam;
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;
@@ -42,6 +46,55 @@
    * @return
    */
   List<FwAreaDivideVO> selectFwAreaDividePage(IPage page, FwAreaDivideDTO fwAreaDivide);

   /**
    * 列表
    *
    * @param param
    * @return
    */
   List<FwAreaDivideVO> selectFwAreaDivideList(FwAreaDivideListParam param);

   /**
    * 根据设备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);

   /**
    * 详情
@@ -75,4 +128,17 @@
    */
   List<FwAreaDivideExcel> exportFwAreaDivide(@Param("ew") Wrapper<FwAreaDivideEntity> queryWrapper);

   /**
    *
    * @param param
    * @return
    */
   List<FwAreaDivideVO> selectFwAreaDivideListCockpit(FwAreaDivideListParam param);

   /**
    *
    * @param areaId
    * @return
    */
    boolean checkAreaBindScene(Long areaId);
}