From 67397f33249a996c124e2e561e53c1f19974e1cb Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 04 Feb 2026 11:35:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwAreaDivideServiceImpl.java | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 100 insertions(+), 3 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 fb447a4..d6f6e5d 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
@@ -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));
}
@@ -213,7 +244,13 @@
@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
@@ -255,6 +292,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);
@@ -356,6 +400,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