From 5b23a8cb9294506d88330f0750f39b9a2cbabbdc Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Thu, 29 Jan 2026 18:06:19 +0800
Subject: [PATCH] 区域划分调整
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwAreaDivideServiceImpl.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 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..f1c0242 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
@@ -213,7 +213,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 +261,12 @@
// 主表与扩展面数据保持同一事务，扩展面列表为空时仅保存主表
if (fwAreaDivide == null) {
return false;
+ }
+ if (fwAreaDivideExtList != null && !fwAreaDivideExtList.isEmpty()) {
+ String areaTypeKeys = buildAreaTypeKeys(fwAreaDivideExtList);
+ if (StringUtil.isNotBlank(areaTypeKeys)) {
+ fwAreaDivide.setAreaTypeKeys(areaTypeKeys);
+ }
}
boolean isCreate = fwAreaDivide.getId() == null;
boolean mainResult = saveOrUpdate(fwAreaDivide);
@@ -356,6 +368,26 @@
}
}
+ 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.isNotBlank(key)) {
+ keySet.add(key);
+ }
+ }
+ if (keySet.isEmpty()) {
+ return null;
+ }
+ return String.join(",", keySet);
+ }
+
private List<Long> parseIdList(String ids) {
if (StringUtil.isBlank(ids)) {
return new ArrayList<>();
--
Gitblit v1.9.3