From 953dd58984ed62fe71373cfcb48c0fb18cb5df05 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Thu, 29 Jan 2026 13:58:33 +0800
Subject: [PATCH] 区域划分优化
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwAreaDivideServiceImpl.java | 243 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 230 insertions(+), 13 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 f8b71c5..4a8cd6e 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
@@ -22,16 +22,29 @@
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.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;
/**
@@ -41,10 +54,16 @@
* @since 2026-01-07
*/
@Service
-public class FwAreaDivideServiceImpl extends BaseServiceImpl<FwAreaDivideMapper, FwAreaDivideEntity> implements IFwAreaDivideService {
+@AllArgsConstructor
+public class FwAreaDivideServiceImpl extends BaseServiceImpl<FwAreaDivideMapper, FwAreaDivideEntity>
+ implements IFwAreaDivideService {
+
+ private final IFwAreaDivideExtService fwAreaDivideExtService;
@Override
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));
}
@@ -54,12 +73,116 @@
}
@Override
- public IPage<FwAreaDivideStatisticsVO> selectFwAreaDivideStatisticsPage(IPage<FwAreaDivideStatisticsVO> page, FwAreaDivideStatisticsDTO fwAreaDivideStatistics) {
+ public Map<Long, String> selectSceneNameByDeviceIds(List<Long> deviceIds) {
+ Map<Long, String> result = new HashMap<>();
+ if (deviceIds == null || deviceIds.isEmpty()) {
+ return result;
+ }
+ Set<Long> deviceIdSet = new HashSet<>();
+ for (Long deviceId : deviceIds) {
+ if (deviceId != null) {
+ deviceIdSet.add(deviceId);
+ }
+ }
+ if (deviceIdSet.isEmpty()) {
+ return result;
+ }
+ List<FwAreaDivideVO> areaList = baseMapper.selectFwAreaDivideListByDeviceIds(new ArrayList<>(deviceIdSet));
+ if (areaList == null || areaList.isEmpty()) {
+ for (Long deviceId : deviceIdSet) {
+ result.put(deviceId, "/");
+ }
+ return result;
+ }
+
+ Map<Long, Set<Long>> deviceAreaMap = new HashMap<>();
+ Set<Long> areaIdSet = new HashSet<>();
+ for (FwAreaDivideVO area : areaList) {
+ if (area == null || area.getId() == null) {
+ continue;
+ }
+ List<Long> areaDeviceIds = parseIdList(area.getDeviceIds());
+ if (areaDeviceIds.isEmpty()) {
+ continue;
+ }
+ for (Long deviceId : areaDeviceIds) {
+ if (!deviceIdSet.contains(deviceId)) {
+ continue;
+ }
+ deviceAreaMap.computeIfAbsent(deviceId, key -> new HashSet<>()).add(area.getId());
+ }
+ areaIdSet.add(area.getId());
+ }
+ if (areaIdSet.isEmpty()) {
+ for (Long deviceId : deviceIdSet) {
+ result.put(deviceId, "/");
+ }
+ return result;
+ }
+
+ List<FwDefenseSceneVO> sceneList = baseMapper.selectFwDefenseSceneListByAreaIds(new ArrayList<>(areaIdSet));
+ Map<Long, Set<String>> areaSceneNameMap = new HashMap<>();
+ if (sceneList != null && !sceneList.isEmpty()) {
+ for (FwDefenseSceneVO scene : sceneList) {
+ if (scene == null) {
+ continue;
+ }
+ String sceneName = scene.getSceneName();
+ if (StringUtil.isBlank(sceneName)) {
+ continue;
+ }
+ List<Long> areaIds = parseIdList(scene.getAreaDivideIds());
+ for (Long areaId : areaIds) {
+ if (!areaIdSet.contains(areaId)) {
+ continue;
+ }
+ areaSceneNameMap.computeIfAbsent(areaId, key -> new HashSet<>()).add(sceneName);
+ }
+ }
+ }
+
+ for (Long deviceId : deviceIdSet) {
+ Set<Long> areaIds = deviceAreaMap.get(deviceId);
+ if (areaIds == null || areaIds.isEmpty()) {
+ result.put(deviceId, "/");
+ continue;
+ }
+ Set<String> sceneNames = new HashSet<>();
+ for (Long areaId : areaIds) {
+ Set<String> names = areaSceneNameMap.get(areaId);
+ if (names != null) {
+ sceneNames.addAll(names);
+ }
+ }
+ if (sceneNames.isEmpty()) {
+ result.put(deviceId, "/");
+ } else {
+ result.put(deviceId, String.join(",", sceneNames));
+ }
+ }
+ return result;
+ }
+
+ @Override
+ public boolean existsAreaByDeviceId(Long deviceId) {
+ if (deviceId == null) {
+ return false;
+ }
+ Integer count = baseMapper.selectAreaCountByDeviceId(deviceId);
+ return count != null && count > 0;
+ }
+
+ @Override
+ public IPage<FwAreaDivideStatisticsVO> selectFwAreaDivideStatisticsPage(IPage<FwAreaDivideStatisticsVO> page,
+ FwAreaDivideStatisticsDTO fwAreaDivideStatistics) {
+ List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
+ fwAreaDivideStatistics.setDeptList(deptList);
return page.setRecords(baseMapper.selectFwAreaDivideStatisticsPage(page, fwAreaDivideStatistics));
}
@Override
- public FwAreaDivideStatisticsVO selectFwAreaDivideStatisticsDetail(FwAreaDivideStatisticsDTO fwAreaDivideStatistics) {
+ public FwAreaDivideStatisticsVO selectFwAreaDivideStatisticsDetail(
+ FwAreaDivideStatisticsDTO fwAreaDivideStatistics) {
return baseMapper.selectFwAreaDivideStatisticsDetail(fwAreaDivideStatistics);
}
@@ -71,9 +194,10 @@
@Override
public List<FwAreaDivideExcel> exportFwAreaDivide(Wrapper<FwAreaDivideEntity> queryWrapper) {
List<FwAreaDivideExcel> fwAreaDivideList = baseMapper.exportFwAreaDivide(queryWrapper);
- //fwAreaDivideList.forEach(fwAreaDivide -> {
- // fwAreaDivide.setTypeName(DictCache.getValue(DictEnum.YES_NO, FwAreaDivide.getType()));
- //});
+ // fwAreaDivideList.forEach(fwAreaDivide -> {
+ // fwAreaDivide.setTypeName(DictCache.getValue(DictEnum.YES_NO,
+ // FwAreaDivide.getType()));
+ // });
return fwAreaDivideList;
}
@@ -100,6 +224,48 @@
}
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean saveOrUpdateWithExt(FwAreaDivideEntity fwAreaDivide, List<FwAreaDivideExtEntity> fwAreaDivideExtList) {
+ // 主表与扩展面数据保持同一事务，扩展面列表为空时仅保存主表
+ if (fwAreaDivide == null) {
+ return false;
+ }
+ boolean isCreate = fwAreaDivide.getId() == null;
+ boolean mainResult = saveOrUpdate(fwAreaDivide);
+ if (!mainResult) {
+ return false;
+ }
+ if (fwAreaDivideExtList == null || fwAreaDivideExtList.isEmpty()) {
+ return true;
+ }
+ List<FwAreaDivideExtEntity> extList = new ArrayList<>();
+ for (FwAreaDivideExtEntity ext : fwAreaDivideExtList) {
+ if (ext == null) {
+ continue;
+ }
+ ext.setAreaDivideId(fwAreaDivide.getId());
+ if (StringUtil.isBlank(ext.getAreaCode()) && StringUtil.isNotBlank(fwAreaDivide.getAreaCode())) {
+ ext.setAreaCode(fwAreaDivide.getAreaCode());
+ }
+ fillCreateFieldsExt(ext);
+ extList.add(ext);
+ }
+ if (extList.isEmpty()) {
+ return true;
+ }
+ if (!isCreate) {
+ // 更新时先清理该主表下历史扩展面数据，再整体写入
+ QueryWrapper<FwAreaDivideExtEntity> wrapper = new QueryWrapper<>();
+ wrapper.lambda().eq(FwAreaDivideExtEntity::getAreaDivideId, fwAreaDivide.getId());
+ fwAreaDivideExtService.remove(wrapper);
+ }
+ if (!fwAreaDivideExtService.saveBatchWithGeom(extList)) {
+ throw new RuntimeException("保存区域扩展面数据失败");
+ }
+ return true;
+ }
+
private void fillCreateFields(FwAreaDivideEntity fwAreaDivide) {
Long userId = AuthUtil.getUserId();
String deptIdStr = AuthUtil.getDeptId();
@@ -111,19 +277,19 @@
deptId = null;
}
}
-// String areaCode = fwAreaDivide.getAreaCode();
-// if (StringUtil.isBlank(areaCode)) {
-// areaCode = HeaderUtils.getAreaCode();
-// }
+ // String areaCode = fwAreaDivide.getAreaCode();
+ // if (StringUtil.isBlank(areaCode)) {
+ // areaCode = HeaderUtils.getAreaCode();
+ // }
Date now = new Date();
fwAreaDivide.setCreateUser(userId);
fwAreaDivide.setUpdateUser(userId);
if (deptId != null) {
fwAreaDivide.setCreateDept(deptId);
}
-// if (StringUtil.isNotBlank(areaCode)) {
-// fwAreaDivide.setAreaCode(areaCode);
-// }
+ // if (StringUtil.isNotBlank(areaCode)) {
+ // fwAreaDivide.setAreaCode(areaCode);
+ // }
fwAreaDivide.setCreateTime(now);
fwAreaDivide.setUpdateTime(now);
}
@@ -136,4 +302,55 @@
fwAreaDivide.setUpdateTime(new Date());
}
+ private void fillCreateFieldsExt(FwAreaDivideExtEntity fwAreaDivideExt) {
+ Long userId = AuthUtil.getUserId();
+ String deptIdStr = AuthUtil.getDeptId();
+ Long deptId = null;
+ if (StringUtil.isNotBlank(deptIdStr)) {
+ try {
+ deptId = Long.valueOf(deptIdStr);
+ } catch (NumberFormatException ignored) {
+ deptId = null;
+ }
+ }
+ Date now = new Date();
+ if (fwAreaDivideExt.getCreateUser() == null) {
+ fwAreaDivideExt.setCreateUser(userId);
+ }
+ if (fwAreaDivideExt.getUpdateUser() == null) {
+ fwAreaDivideExt.setUpdateUser(userId);
+ }
+ if (fwAreaDivideExt.getCreateDept() == null && deptId != null) {
+ fwAreaDivideExt.setCreateDept(deptId);
+ }
+ if (fwAreaDivideExt.getCreateTime() == null) {
+ fwAreaDivideExt.setCreateTime(now);
+ }
+ if (fwAreaDivideExt.getUpdateTime() == null) {
+ fwAreaDivideExt.setUpdateTime(now);
+ }
+ }
+
+ private List<Long> parseIdList(String ids) {
+ if (StringUtil.isBlank(ids)) {
+ return new ArrayList<>();
+ }
+ String[] idArray = ids.split(",");
+ List<Long> idList = new ArrayList<>(idArray.length);
+ for (String item : idArray) {
+ if (item == null) {
+ continue;
+ }
+ String value = item.trim();
+ if (StringUtil.isBlank(value)) {
+ continue;
+ }
+ try {
+ idList.add(Long.valueOf(value));
+ } catch (NumberFormatException ignored) {
+ }
+ }
+ return idList;
+ }
+
}
--
Gitblit v1.9.3