From 2ba9230d91a80e81d8fa594b82bf886a4ed902f1 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Tue, 13 Jan 2026 16:55:48 +0800
Subject: [PATCH] 防区优化
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwDefenseZoneServiceImpl.java | 24 ------------------------
1 files changed, 0 insertions(+), 24 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 8927af5..ee0147b 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
@@ -32,8 +32,6 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -96,11 +94,9 @@
record.setSceneCount(0);
record.setDeviceCount(0);
record.setAreaCount(0);
- record.setZoneArea(BigDecimal.ZERO);
}
return;
}
- Map<Long, BigDecimal> areaSizeMap = new HashMap<>();
Map<Long, List<Long>> areaDeviceMap = new HashMap<>();
if (!areaIdSet.isEmpty()) {
List<FwAreaDivideEntity> areaList = fwAreaDivideService.listByIds(areaIdSet);
@@ -108,7 +104,6 @@
if (area == null || area.getId() == null) {
continue;
}
- areaSizeMap.put(area.getId(), area.getAreaSize());
areaDeviceMap.put(area.getId(), parseIdList(area.getDeviceIds()));
}
}
@@ -134,7 +129,6 @@
}
record.setAreaCount(areaIds.size());
record.setDeviceCount(deviceIds.size());
- record.setZoneArea(sumAreaSize(areaIds, areaSizeMap));
}
}
@@ -159,24 +153,6 @@
}
return idList;
}
-
- private BigDecimal sumAreaSize(Set<Long> areaIds, Map<Long, BigDecimal> areaSizeMap) {
- if (areaIds == null || areaIds.isEmpty()) {
- return BigDecimal.ZERO;
- }
- 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 BigDecimal.ZERO;
- }
- return total.setScale(2, RoundingMode.HALF_UP);
- }
-
@Override
public List<FwDefenseZoneExcel> exportFwDefenseZone(Wrapper<FwDefenseZoneEntity> queryWrapper) {
--
Gitblit v1.9.3