From 0a03503976b73180749a4953a100240078f5d3e4 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 12 Jan 2026 14:58:11 +0800
Subject: [PATCH] 设备关联从场景转到区域
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwDefenseZoneServiceImpl.java | 25 ++++++-------------------
1 files changed, 6 insertions(+), 19 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 27d1da6..8a62dcc 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,13 +21,11 @@
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.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,9 +51,6 @@
*/
@Service
public class FwDefenseZoneServiceImpl extends BaseServiceImpl<FwDefenseZoneMapper, FwDefenseZoneEntity> implements IFwDefenseZoneService {
-
- @Resource
- private IFwDefenseSceneService fwDefenseSceneService;
@Resource
private IFwAreaDivideService fwAreaDivideService;
@@ -105,17 +100,8 @@
}
return;
}
- Map<Long, List<Long>> sceneDeviceMap = new HashMap<>();
- if (!sceneIdSet.isEmpty()) {
- List<FwDefenseSceneEntity> sceneList = fwDefenseSceneService.listByIds(sceneIdSet);
- for (FwDefenseSceneEntity scene : sceneList) {
- if (scene == null || scene.getId() == null) {
- continue;
- }
- sceneDeviceMap.put(scene.getId(), parseIdList(scene.getDeviceIds()));
- }
- }
Map<Long, BigDecimal> areaSizeMap = new HashMap<>();
+ Map<Long, List<Long>> areaDeviceMap = new HashMap<>();
if (!areaIdSet.isEmpty()) {
List<FwAreaDivideEntity> areaList = fwAreaDivideService.listByIds(areaIdSet);
for (FwAreaDivideEntity area : areaList) {
@@ -123,6 +109,7 @@
continue;
}
areaSizeMap.put(area.getId(), area.getAreaSize());
+ areaDeviceMap.put(area.getId(), parseIdList(area.getDeviceIds()));
}
}
@@ -139,10 +126,10 @@
}
Set<Long> areaIds = new HashSet<>(zoneAreaIds);
Set<Long> deviceIds = new HashSet<>();
- for (Long sceneId : uniqueSceneIds) {
- List<Long> sceneDeviceIds = sceneDeviceMap.get(sceneId);
- if (sceneDeviceIds != null) {
- deviceIds.addAll(sceneDeviceIds);
+ for (Long areaId : areaIds) {
+ List<Long> areaDeviceIds = areaDeviceMap.get(areaId);
+ if (areaDeviceIds != null) {
+ deviceIds.addAll(areaDeviceIds);
}
}
record.setAreaCount(areaIds.size());
--
Gitblit v1.9.3