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/FwDefenseZoneServiceImpl.java | 65 ++++++++++++++++++++++++--------
1 files changed, 49 insertions(+), 16 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwDefenseZoneServiceImpl.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwDefenseZoneServiceImpl.java
index ee0147b..6a8c3b1 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwDefenseZoneServiceImpl.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwDefenseZoneServiceImpl.java
@@ -21,11 +21,14 @@
import org.sxkj.common.utils.HeaderUtils;
import org.sxkj.fw.area.dto.FwDefenseZoneDTO;
import org.sxkj.fw.area.entity.FwAreaDivideEntity;
+import org.sxkj.fw.area.entity.FwDefenseSceneEntity;
import org.sxkj.fw.area.entity.FwDefenseZoneEntity;
+import org.sxkj.fw.area.vo.FwAreaDivideVO;
import org.sxkj.fw.area.vo.FwDefenseZoneVO;
import org.sxkj.fw.area.excel.FwDefenseZoneExcel;
import org.sxkj.fw.area.mapper.FwDefenseZoneMapper;
import org.sxkj.fw.area.service.IFwAreaDivideService;
+import org.sxkj.fw.area.service.IFwDefenseSceneService;
import org.sxkj.fw.area.service.IFwDefenseZoneService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
@@ -53,6 +56,9 @@
@Resource
private IFwAreaDivideService fwAreaDivideService;
+ @Resource
+ private IFwDefenseSceneService fwDefenseSceneService;
+
@Override
public IPage<FwDefenseZoneVO> selectFwDefenseZonePage(IPage<FwDefenseZoneVO> page, FwDefenseZoneDTO fwDefenseZone) {
IPage<FwDefenseZoneVO> result = page.setRecords(baseMapper.selectFwDefenseZonePage(page, fwDefenseZone));
@@ -69,27 +75,51 @@
return detail;
}
+ @Override
+ public List<FwAreaDivideVO> selectFwAreaDivideListByZoneId(Long zoneId) {
+ if (zoneId == null) {
+ return Collections.emptyList();
+ }
+ // 防区不存在时直接返回空结果
+ Integer exists = baseMapper.selectDefenseZoneExists(zoneId);
+ if (exists == null || exists == 0) {
+ return null;
+ }
+ List<FwAreaDivideVO> areaList = baseMapper.selectFwAreaDivideListByZoneId(zoneId);
+ if (areaList == null) {
+ return Collections.emptyList();
+ }
+ return areaList;
+ }
+
private void fillDefenseZoneStatistics(List<FwDefenseZoneVO> records) {
if (records == null || records.isEmpty()) {
return;
}
+ // 组装防区-场景-区域-设备的统计链路
Set<Long> sceneIdSet = new HashSet<>();
- Set<Long> areaIdSet = new HashSet<>();
Map<Long, List<Long>> zoneSceneMap = new HashMap<>();
- Map<Long, List<Long>> zoneAreaMap = new HashMap<>();
for (FwDefenseZoneVO record : records) {
List<Long> sceneIds = parseIdList(record.getDefenseSceneIds());
if (record.getId() != null) {
zoneSceneMap.put(record.getId(), sceneIds);
}
sceneIdSet.addAll(sceneIds);
- List<Long> areaIds = parseIdList(record.getAreaDivideIds());
- if (record.getId() != null) {
- zoneAreaMap.put(record.getId(), areaIds);
- }
- areaIdSet.addAll(areaIds);
}
- if (sceneIdSet.isEmpty() && areaIdSet.isEmpty()) {
+ Map<Long, List<Long>> sceneAreaMap = new HashMap<>();
+ Set<Long> sceneAreaIdSet = new HashSet<>();
+ if (!sceneIdSet.isEmpty()) {
+ List<FwDefenseSceneEntity> sceneList = fwDefenseSceneService.listByIds(sceneIdSet);
+ for (FwDefenseSceneEntity scene : sceneList) {
+ if (scene == null || scene.getId() == null) {
+ continue;
+ }
+ List<Long> sceneAreaIds = parseIdList(scene.getAreaDivideIds());
+ sceneAreaMap.put(scene.getId(), sceneAreaIds);
+ sceneAreaIdSet.addAll(sceneAreaIds);
+ }
+ }
+ if (sceneIdSet.isEmpty()) {
for (FwDefenseZoneVO record : records) {
record.setSceneCount(0);
record.setDeviceCount(0);
@@ -98,8 +128,9 @@
return;
}
Map<Long, List<Long>> areaDeviceMap = new HashMap<>();
- if (!areaIdSet.isEmpty()) {
- List<FwAreaDivideEntity> areaList = fwAreaDivideService.listByIds(areaIdSet);
+ if (!sceneAreaIdSet.isEmpty()) {
+ // 预加载区域关联的设备ID集合
+ List<FwAreaDivideEntity> areaList = fwAreaDivideService.listByIds(sceneAreaIdSet);
for (FwAreaDivideEntity area : areaList) {
if (area == null || area.getId() == null) {
continue;
@@ -115,19 +146,21 @@
}
Set<Long> uniqueSceneIds = new HashSet<>(sceneIds);
record.setSceneCount(uniqueSceneIds.size());
- List<Long> zoneAreaIds = zoneAreaMap.get(record.getId());
- if (zoneAreaIds == null) {
- zoneAreaIds = Collections.emptyList();
+ Set<Long> sceneAreaIds = new HashSet<>();
+ for (Long sceneId : uniqueSceneIds) {
+ List<Long> areaIds = sceneAreaMap.get(sceneId);
+ if (areaIds != null) {
+ sceneAreaIds.addAll(areaIds);
+ }
}
- Set<Long> areaIds = new HashSet<>(zoneAreaIds);
Set<Long> deviceIds = new HashSet<>();
- for (Long areaId : areaIds) {
+ for (Long areaId : sceneAreaIds) {
List<Long> areaDeviceIds = areaDeviceMap.get(areaId);
if (areaDeviceIds != null) {
deviceIds.addAll(areaDeviceIds);
}
}
- record.setAreaCount(areaIds.size());
+ record.setAreaCount(sceneAreaIds.size());
record.setDeviceCount(deviceIds.size());
}
}
--
Gitblit v1.9.3