From 335552671e353fff124298a1cf819e9354b1b304 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Thu, 29 Jan 2026 18:23:34 +0800
Subject: [PATCH] 增加部分注释
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwDefenseSceneServiceImpl.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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 3545a1b..26c4667 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
@@ -33,6 +33,8 @@
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.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
@@ -63,6 +65,8 @@
@Override
public IPage<FwDefenseSceneVO> selectFwDefenseScenePage(IPage<FwDefenseSceneVO> page, FwDefenseSceneVO fwDefenseScene) {
+ List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
+ fwDefenseScene.setDeptList(deptList);
IPage<FwDefenseSceneVO> result = page.setRecords(baseMapper.selectFwDefenseScenePage(page, fwDefenseScene));
List<FwDefenseSceneVO> records = result.getRecords();
if (records == null || records.isEmpty()) {
@@ -74,6 +78,7 @@
areaIdSet.addAll(parseIdList(record.getAreaDivideIds()));
}
+ // 汇总场景关联的区域与设备，便于统计设备数量
Map<Long, BigDecimal> areaSizeMap = new HashMap<>();
Map<Long, List<Long>> areaDeviceMap = new HashMap<>();
Set<Long> deviceIdSet = new HashSet<>();
@@ -83,7 +88,7 @@
if (area == null || area.getId() == null) {
continue;
}
- areaSizeMap.put(area.getId(), area.getAreaSize());
+// areaSizeMap.put(area.getId(), area.getAreaSize());
List<Long> areaDeviceIds = parseIdList(area.getDeviceIds());
areaDeviceMap.put(area.getId(), areaDeviceIds);
deviceIdSet.addAll(areaDeviceIds);
@@ -92,6 +97,7 @@
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) {
@@ -134,8 +140,8 @@
}
@Override
- public List<FwDefenseSceneVO> selectFwDefenseSceneList(Integer filterSelected, Long areaId) {
- return baseMapper.selectFwDefenseSceneList(filterSelected, areaId);
+ public List<FwDefenseSceneVO> selectFwDefenseSceneList(Integer filterSelected, Long zoneId, Long areaId) {
+ return baseMapper.selectFwDefenseSceneList(filterSelected, zoneId, areaId);
}
private List<Long> parseIdList(String ids) {
@@ -164,6 +170,7 @@
if (areaIds == null || areaIds.isEmpty()) {
return 0;
}
+ // 面积按平方米整数返回
BigDecimal total = BigDecimal.ZERO;
for (Long areaId : areaIds) {
BigDecimal areaSize = areaSizeMap.get(areaId);
--
Gitblit v1.9.3