From 5e73881ef728238e7f7a3bd5d74cf41f3f6b0923 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Thu, 29 Jan 2026 18:27:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwDefenseSceneServiceImpl.java | 23 -----------------------
1 files changed, 0 insertions(+), 23 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwDefenseSceneServiceImpl.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwDefenseSceneServiceImpl.java
index 26c4667..f248f0f 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwDefenseSceneServiceImpl.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwDefenseSceneServiceImpl.java
@@ -78,7 +78,6 @@
areaIdSet.addAll(parseIdList(record.getAreaDivideIds()));
}
- // 汇总场景关联的区域与设备，便于统计设备数量
Map<Long, BigDecimal> areaSizeMap = new HashMap<>();
Map<Long, List<Long>> areaDeviceMap = new HashMap<>();
Set<Long> deviceIdSet = new HashSet<>();
@@ -97,7 +96,6 @@
Map<Long, String> deviceTypeMap = new HashMap<>();
if (!deviceIdSet.isEmpty()) {
- // 批量拉取设备类型，降低循环查询成本
List<FwDeviceEntity> deviceList = fwDeviceService.listByIds(deviceIdSet);
for (FwDeviceEntity device : deviceList) {
if (device == null || device.getId() == null) {
@@ -110,7 +108,6 @@
for (FwDefenseSceneVO record : records) {
List<Long> areaIds = parseIdList(record.getAreaDivideIds());
record.setAreaCount(areaIds.size());
- record.setDefenseArea(sumDefenseArea(areaIds, areaSizeMap));
Set<Long> deviceIds = new HashSet<>();
for (Long areaId : areaIds) {
@@ -165,26 +162,6 @@
}
return idList;
}
-
- private Integer sumDefenseArea(List<Long> areaIds, Map<Long, BigDecimal> areaSizeMap) {
- if (areaIds == null || areaIds.isEmpty()) {
- return 0;
- }
- // 面积按平方米整数返回
- BigDecimal total = BigDecimal.ZERO;
- for (Long areaId : areaIds) {
- BigDecimal areaSize = areaSizeMap.get(areaId);
- if (areaSize != null) {
- total = total.add(areaSize);
- }
- }
- if (BigDecimal.ZERO.compareTo(total) == 0) {
- return 0;
- }
- BigDecimal totalArea = total.multiply(AREA_SIZE_FACTOR);
- return totalArea.setScale(0, RoundingMode.HALF_UP).intValue();
- }
-
@Override
public List<FwDefenseSceneExcel> exportFwDefenseScene(Wrapper<FwDefenseSceneEntity> queryWrapper) {
--
Gitblit v1.9.3