From 51a551a7f8eae7654f973d45cd2fa2952774673d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 07 Aug 2026 10:56:55 +0800
Subject: [PATCH] perf(task): 优化巡查任务审核性能并添加详细日志记录
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwDefenseZoneServiceImpl.java | 120 +++++++++++++++++++++++++++++-------------------------------
1 files changed, 58 insertions(+), 62 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..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
@@ -23,6 +23,7 @@
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;
@@ -34,8 +35,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;
@@ -55,10 +54,10 @@
public class FwDefenseZoneServiceImpl extends BaseServiceImpl<FwDefenseZoneMapper, FwDefenseZoneEntity> implements IFwDefenseZoneService {
@Resource
- private IFwDefenseSceneService fwDefenseSceneService;
+ private IFwAreaDivideService fwAreaDivideService;
@Resource
- private IFwAreaDivideService fwAreaDivideService;
+ private IFwDefenseSceneService fwDefenseSceneService;
@Override
public IPage<FwDefenseZoneVO> selectFwDefenseZonePage(IPage<FwDefenseZoneVO> page, FwDefenseZoneDTO fwDefenseZone) {
@@ -76,53 +75,67 @@
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()) {
- for (FwDefenseZoneVO record : records) {
- record.setSceneCount(0);
- record.setDeviceCount(0);
- record.setAreaCount(0);
- record.setZoneArea(BigDecimal.ZERO);
- }
- return;
- }
- Map<Long, List<Long>> sceneDeviceMap = new HashMap<>();
+ 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;
}
- sceneDeviceMap.put(scene.getId(), parseIdList(scene.getDeviceIds()));
+ List<Long> sceneAreaIds = parseIdList(scene.getAreaDivideIds());
+ sceneAreaMap.put(scene.getId(), sceneAreaIds);
+ sceneAreaIdSet.addAll(sceneAreaIds);
}
}
- Map<Long, BigDecimal> areaSizeMap = new HashMap<>();
- if (!areaIdSet.isEmpty()) {
- List<FwAreaDivideEntity> areaList = fwAreaDivideService.listByIds(areaIdSet);
+ if (sceneIdSet.isEmpty()) {
+ for (FwDefenseZoneVO record : records) {
+ record.setSceneCount(0);
+ record.setDeviceCount(0);
+ record.setAreaCount(0);
+ }
+ return;
+ }
+ Map<Long, List<Long>> areaDeviceMap = new HashMap<>();
+ if (!sceneAreaIdSet.isEmpty()) {
+ // 预加载区域关联的设备ID集合
+ List<FwAreaDivideEntity> areaList = fwAreaDivideService.listByIds(sceneAreaIdSet);
for (FwAreaDivideEntity area : areaList) {
if (area == null || area.getId() == null) {
continue;
}
- areaSizeMap.put(area.getId(), area.getAreaSize());
+ areaDeviceMap.put(area.getId(), parseIdList(area.getDeviceIds()));
}
}
@@ -133,21 +146,22 @@
}
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> areaIds = new HashSet<>(zoneAreaIds);
- Set<Long> deviceIds = new HashSet<>();
+ Set<Long> sceneAreaIds = new HashSet<>();
for (Long sceneId : uniqueSceneIds) {
- List<Long> sceneDeviceIds = sceneDeviceMap.get(sceneId);
- if (sceneDeviceIds != null) {
- deviceIds.addAll(sceneDeviceIds);
+ List<Long> areaIds = sceneAreaMap.get(sceneId);
+ if (areaIds != null) {
+ sceneAreaIds.addAll(areaIds);
}
}
- record.setAreaCount(areaIds.size());
+ Set<Long> deviceIds = new HashSet<>();
+ for (Long areaId : sceneAreaIds) {
+ List<Long> areaDeviceIds = areaDeviceMap.get(areaId);
+ if (areaDeviceIds != null) {
+ deviceIds.addAll(areaDeviceIds);
+ }
+ }
+ record.setAreaCount(sceneAreaIds.size());
record.setDeviceCount(deviceIds.size());
- record.setZoneArea(sumAreaSize(areaIds, areaSizeMap));
}
}
@@ -172,24 +186,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) {
@@ -234,19 +230,19 @@
deptId = null;
}
}
- String areaCode = HeaderUtils.getAreaCode();
- if (StringUtil.isBlank(areaCode)) {
- areaCode = fwDefenseZone.getAreaCode();
- }
+// String areaCode = HeaderUtils.getAreaCode();
+// if (StringUtil.isBlank(areaCode)) {
+// areaCode = fwDefenseZone.getAreaCode();
+// }
Date now = new Date();
fwDefenseZone.setCreateUser(userId);
fwDefenseZone.setUpdateUser(userId);
if (deptId != null) {
fwDefenseZone.setCreateDept(deptId);
}
- if (StringUtil.isNotBlank(areaCode)) {
- fwDefenseZone.setAreaCode(areaCode);
- }
+// if (StringUtil.isNotBlank(areaCode)) {
+// fwDefenseZone.setAreaCode(areaCode);
+// }
fwDefenseZone.setCreateTime(now);
fwDefenseZone.setUpdateTime(now);
}
--
Gitblit v1.9.3