反无驾驶舱优化

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;
@@ -58,6 +59,7 @@
   public IPage<FwAreaDivideVO> selectFwAreaDividePage(IPage<FwAreaDivideVO> page, FwAreaDivideDTO fwAreaDivide) {
      List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
      fwAreaDivide.setDeptList(deptList);
      fwAreaDivide.setAreaTypeKeyList(parseAreaTypeKeyList(fwAreaDivide.getAreaTypeKeys()));

      List<FwAreaDivideVO> areaDivideList = baseMapper.selectFwAreaDividePage(page, fwAreaDivide);

@@ -70,8 +72,36 @@
   }

   @Override
   public List<FwAreaDivideVO> selectFwAreaDivideList(Integer filterSelected, Long sceneId) {
      List<FwAreaDivideVO> areaDivideList = baseMapper.selectFwAreaDivideList(filterSelected, sceneId);
   public List<FwAreaDivideVO> selectFwAreaDivideList(Integer filterSelected, Long sceneId, String areaTypeKeys, Integer isSetSceneManage, java.time.LocalDateTime 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);
@@ -202,6 +232,7 @@
                                                         FwAreaDivideStatisticsDTO fwAreaDivideStatistics) {
      List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
      fwAreaDivideStatistics.setDeptList(deptList);
      fwAreaDivideStatistics.setAreaTypeKeyList(parseAreaTypeKeyList(fwAreaDivideStatistics.getAreaTypeKeys()));
      return page.setRecords(baseMapper.selectFwAreaDivideStatisticsPage(page, fwAreaDivideStatistics));
   }

@@ -263,6 +294,7 @@
         return false;
      }
      if (fwAreaDivideExtList != null && !fwAreaDivideExtList.isEmpty()) {
         // 由扩展面类型key去重生成主表areaTypeKeys
         String areaTypeKeys = buildAreaTypeKeys(fwAreaDivideExtList);
         if (StringUtil.isNotBlank(areaTypeKeys)) {
            fwAreaDivide.setAreaTypeKeys(areaTypeKeys);
@@ -372,14 +404,26 @@
      if (fwAreaDivideExtList == null || fwAreaDivideExtList.isEmpty()) {
         return null;
      }
      // 保持输入顺序，去重后拼接
      Set<String> keySet = new LinkedHashSet<>();
      for (FwAreaDivideExtEntity ext : fwAreaDivideExtList) {
         if (ext == null) {
            continue;
         }
         String key = ext.getAreaTypeKey();
         if (StringUtil.isNotBlank(key)) {
            keySet.add(key);
         if (StringUtil.isBlank(key)) {
            continue;
         }
         // 兼容前端传入逗号分隔的类型key
         String[] keyArray = key.split(",");
         for (String item : keyArray) {
            if (item == null) {
               continue;
            }
            String value = item.trim();
            if (StringUtil.isNotBlank(value)) {
               keySet.add(value);
            }
         }
      }
      if (keySet.isEmpty()) {
@@ -388,6 +432,27 @@
      return String.join(",", keySet);
   }

   private List<String> parseAreaTypeKeyList(String areaTypeKeys) {
      if (StringUtil.isBlank(areaTypeKeys)) {
         return null;
      }
      String[] keyArray = areaTypeKeys.split(",");
      Set<String> keySet = new LinkedHashSet<>();
      for (String item : keyArray) {
         if (item == null) {
            continue;
         }
         String value = item.trim();
         if (StringUtil.isNotBlank(value)) {
            keySet.add(value);
         }
      }
      if (keySet.isEmpty()) {
         return null;
      }
      return new ArrayList<>(keySet);
   }

   private List<Long> parseIdList(String ids) {
      if (StringUtil.isBlank(ids)) {
         return new ArrayList<>();