From 1bfbc52da47b22f00a1c1f5f670c30f70d999873 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 02 Feb 2026 18:18:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwAreaDivideServiceImpl.java | 146 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 120 insertions(+), 26 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwAreaDivideServiceImpl.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwAreaDivideServiceImpl.java
index 4a8cd6e..5ced5b7 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwAreaDivideServiceImpl.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwAreaDivideServiceImpl.java
@@ -16,36 +16,30 @@
*/
package org.sxkj.fw.area.service.impl;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.AllArgsConstructor;
+import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.StringUtil;
-import org.sxkj.common.utils.HeaderUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
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.entity.FwAreaDivideExtEntity;
-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 org.sxkj.fw.area.mapper.FwAreaDivideMapper;
-import org.sxkj.fw.area.service.IFwAreaDivideService;
import org.sxkj.fw.area.service.IFwAreaDivideExtService;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import lombok.AllArgsConstructor;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.core.mp.base.BaseServiceImpl;
+import org.sxkj.fw.area.service.IFwAreaDivideService;
+import org.sxkj.fw.area.vo.FwAreaDivideExtVO;
+import org.sxkj.fw.area.vo.FwAreaDivideStatisticsVO;
+import org.sxkj.fw.area.vo.FwAreaDivideVO;
+import org.sxkj.fw.area.vo.FwDefenseSceneVO;
import org.sxkj.system.cache.SysCache;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Date;
+import java.util.*;
/**
* 区域划分表 服务实现类
@@ -56,7 +50,7 @@
@Service
@AllArgsConstructor
public class FwAreaDivideServiceImpl extends BaseServiceImpl<FwAreaDivideMapper, FwAreaDivideEntity>
- implements IFwAreaDivideService {
+ implements IFwAreaDivideService {
private final IFwAreaDivideExtService fwAreaDivideExtService;
@@ -64,12 +58,45 @@
public IPage<FwAreaDivideVO> selectFwAreaDividePage(IPage<FwAreaDivideVO> page, FwAreaDivideDTO fwAreaDivide) {
List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
fwAreaDivide.setDeptList(deptList);
- return page.setRecords(baseMapper.selectFwAreaDividePage(page, fwAreaDivide));
+ fwAreaDivide.setAreaTypeKeyList(parseAreaTypeKeyList(fwAreaDivide.getAreaTypeKeys()));
+
+ List<FwAreaDivideVO> areaDivideList = baseMapper.selectFwAreaDividePage(page, fwAreaDivide);
+
+ // 获取面数据
+ if (areaDivideList != null && !areaDivideList.isEmpty()) {
+ enrichWithExtensionData(areaDivideList);
+ }
+
+ return page.setRecords(areaDivideList);
}
@Override
- public List<FwAreaDivideVO> selectFwAreaDivideList(Integer filterSelected, Long sceneId) {
- return 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);
+ }
+ return areaDivideList;
+ }
+
+ /**
+ * 为区域划分列表填充扩展表数据
+ *
+ * @param areaDivideList 区域划分列表
+ */
+ private void enrichWithExtensionData(List<FwAreaDivideVO> areaDivideList) {
+ if (areaDivideList == null || areaDivideList.isEmpty()) {
+ return;
+ }
+
+ areaDivideList.stream()
+ .filter(area -> area.getId() != null) // 过滤掉id为空的对象
+ .forEach(area -> {
+ List<FwAreaDivideExtVO> extList = fwAreaDivideExtService.getByAreaDivideId(area.getId());
+ area.setFwAreaDivideExtList(extList);
+ });
}
@Override
@@ -174,21 +201,28 @@
@Override
public IPage<FwAreaDivideStatisticsVO> selectFwAreaDivideStatisticsPage(IPage<FwAreaDivideStatisticsVO> page,
- FwAreaDivideStatisticsDTO fwAreaDivideStatistics) {
+ 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));
}
@Override
public FwAreaDivideStatisticsVO selectFwAreaDivideStatisticsDetail(
- FwAreaDivideStatisticsDTO fwAreaDivideStatistics) {
+ FwAreaDivideStatisticsDTO fwAreaDivideStatistics) {
return baseMapper.selectFwAreaDivideStatisticsDetail(fwAreaDivideStatistics);
}
@Override
public FwAreaDivideVO selectFwAreaDivideDetail(Long id) {
- return baseMapper.selectFwAreaDivideDetail(id);
+ FwAreaDivideVO detail = baseMapper.selectFwAreaDivideDetail(id);
+ if (detail == null || detail.getId() == null) {
+ return detail;
+ }
+ List<FwAreaDivideExtVO> extList = fwAreaDivideExtService.getByAreaDivideId(detail.getId());
+ detail.setFwAreaDivideExtList(extList);
+ return detail;
}
@Override
@@ -230,6 +264,13 @@
// 主表与扩展面数据保持同一事务，扩展面列表为空时仅保存主表
if (fwAreaDivide == null) {
return false;
+ }
+ if (fwAreaDivideExtList != null && !fwAreaDivideExtList.isEmpty()) {
+ // 由扩展面类型key去重生成主表areaTypeKeys
+ String areaTypeKeys = buildAreaTypeKeys(fwAreaDivideExtList);
+ if (StringUtil.isNotBlank(areaTypeKeys)) {
+ fwAreaDivide.setAreaTypeKeys(areaTypeKeys);
+ }
}
boolean isCreate = fwAreaDivide.getId() == null;
boolean mainResult = saveOrUpdate(fwAreaDivide);
@@ -331,6 +372,59 @@
}
}
+ private String buildAreaTypeKeys(List<FwAreaDivideExtEntity> fwAreaDivideExtList) {
+ 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.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()) {
+ return null;
+ }
+ 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<>();
--
Gitblit v1.9.3