Merge remote-tracking branch 'origin/master'

linwei

2026-02-02 1bfbc52da47b22f00a1c1f5f670c30f70d999873

 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, Integer isSetSceneManage, java.time.LocalDateTime flyTime) {
      List<String> areaTypeKeyList = parseAreaTypeKeyList(areaTypeKeys);
      List<FwAreaDivideVO> areaDivideList = baseMapper.selectFwAreaDivideList(filterSelected, sceneId, areaTypeKeyList, isSetSceneManage, flyTime);
      // 获取面数据
      if (areaDivideList != null && !areaDivideList.isEmpty()) {
         enrichWithExtensionData(areaDivideList);
@@ -202,6 +204,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 +266,7 @@
         return false;
      }
      if (fwAreaDivideExtList != null && !fwAreaDivideExtList.isEmpty()) {
         // 由扩展面类型key去重生成主表areaTypeKeys
         String areaTypeKeys = buildAreaTypeKeys(fwAreaDivideExtList);
         if (StringUtil.isNotBlank(areaTypeKeys)) {
            fwAreaDivide.setAreaTypeKeys(areaTypeKeys);
@@ -372,14 +376,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 +404,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<>();