区域类型查询

rain

2026-01-29 c39de0df2cb8b9964228fd735bcec9c3332791a1

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

@@ -58,6 +58,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 +71,9 @@
   }

   @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) {
      List<String> areaTypeKeyList = parseAreaTypeKeyList(areaTypeKeys);
      List<FwAreaDivideVO> areaDivideList = baseMapper.selectFwAreaDivideList(filterSelected, sceneId, areaTypeKeyList);
      // 获取面数据
      if (areaDivideList != null && !areaDivideList.isEmpty()) {
         enrichWithExtensionData(areaDivideList);
@@ -401,6 +403,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<>();