反无驾驶舱优化

linwei

2026-02-04 fbe41ac0c9758ade6dc690f5d9e3d5985b5e3f7c

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

@@ -31,6 +31,7 @@
import org.sxkj.fw.area.entity.FwAreaDivideExtEntity;
import org.sxkj.fw.area.excel.FwAreaDivideExcel;
import org.sxkj.fw.area.mapper.FwAreaDivideMapper;
import org.sxkj.fw.area.param.FwAreaDivideListParam;
import org.sxkj.fw.area.service.IFwAreaDivideExtService;
import org.sxkj.fw.area.service.IFwAreaDivideService;
import org.sxkj.fw.area.vo.FwAreaDivideExtVO;
@@ -72,8 +73,35 @@

   @Override
   public List<FwAreaDivideVO> selectFwAreaDivideList(Integer filterSelected, Long sceneId, String areaTypeKeys, Integer isSetSceneManage, java.time.LocalDateTime flyTime) {
      List<String> areaTypeKeyList = parseAreaTypeKeyList(areaTypeKeys);
      List<FwAreaDivideVO> areaDivideList = baseMapper.selectFwAreaDivideList(filterSelected, sceneId, areaTypeKeyList, isSetSceneManage, flyTime);
      // 创建参数对象
      FwAreaDivideListParam param = new FwAreaDivideListParam();
      param.setFilterSelected(filterSelected);
      param.setSceneId(sceneId);
      param.setAreaTypeKeys(areaTypeKeys);
      param.setIsSetSceneManage(isSetSceneManage);
      param.setFlyTime(flyTime);
      // 解析区域类型键值列表
      param.setAreaTypeKeyList(parseAreaTypeKeyList(areaTypeKeys));

      // 调用Mapper方法，传入参数对象
      List<FwAreaDivideVO> areaDivideList = baseMapper.selectFwAreaDivideList(param);
      // 获取面数据
      if (areaDivideList != null && !areaDivideList.isEmpty()) {
         enrichWithExtensionData(areaDivideList);
      }
      return areaDivideList;
   }

   /**
    * 区域划分列表查询（对象参数版本）
    *
    * @param param 区域划分列表查询参数
    * @return 区域划分列表
    */
   @Override
   public List<FwAreaDivideVO> selectFwAreaDivideList(FwAreaDivideListParam param) {
      // 调用Mapper方法，传入参数对象
      List<FwAreaDivideVO> areaDivideList = baseMapper.selectFwAreaDivideListCockpit(param);
      // 获取面数据
      if (areaDivideList != null && !areaDivideList.isEmpty()) {
         enrichWithExtensionData(areaDivideList);