From 74756c657109a4e48dd6c0b4d8959cdab89b33a9 Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Wed, 28 Jan 2026 20:10:29 +0800
Subject: [PATCH] update-区域划分表结构调整
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwDefenseSceneServiceImpl.java | 41 +++++++++++++++++++++++++++++------------
1 files changed, 29 insertions(+), 12 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 477d5a6..f953b88 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,7 +33,8 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
-import javax.annotation.Resource;
+import org.sxkj.system.cache.SysCache;
+
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
@@ -64,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()) {
@@ -71,20 +74,23 @@
}
Set<Long> areaIdSet = new HashSet<>();
- Set<Long> deviceIdSet = new HashSet<>();
for (FwDefenseSceneVO record : records) {
areaIdSet.addAll(parseIdList(record.getAreaDivideIds()));
- deviceIdSet.addAll(parseIdList(record.getDeviceIds()));
}
Map<Long, BigDecimal> areaSizeMap = new HashMap<>();
+ Map<Long, List<Long>> areaDeviceMap = new HashMap<>();
+ Set<Long> deviceIdSet = new HashSet<>();
if (!areaIdSet.isEmpty()) {
List<FwAreaDivideEntity> areaList = fwAreaDivideService.listByIds(areaIdSet);
for (FwAreaDivideEntity area : areaList) {
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);
}
}
@@ -104,7 +110,13 @@
record.setAreaCount(areaIds.size());
record.setDefenseArea(sumDefenseArea(areaIds, areaSizeMap));
- List<Long> deviceIds = parseIdList(record.getDeviceIds());
+ Set<Long> deviceIds = new HashSet<>();
+ for (Long areaId : areaIds) {
+ List<Long> areaDeviceIds = areaDeviceMap.get(areaId);
+ if (areaDeviceIds != null) {
+ deviceIds.addAll(areaDeviceIds);
+ }
+ }
int detectCount = 0;
int counterCount = 0;
for (Long deviceId : deviceIds) {
@@ -123,6 +135,11 @@
}
return result;
+ }
+
+ @Override
+ public List<FwDefenseSceneVO> selectFwDefenseSceneList(Integer filterSelected, Long zoneId, Long areaId) {
+ return baseMapper.selectFwDefenseSceneList(filterSelected, zoneId, areaId);
}
private List<Long> parseIdList(String ids) {
@@ -208,19 +225,19 @@
deptId = null;
}
}
- String areaCode = HeaderUtils.getAreaCode();
- if (StringUtil.isBlank(areaCode)) {
- areaCode = fwDefenseScene.getAreaCode();
- }
+// String areaCode = HeaderUtils.getAreaCode();
+// if (StringUtil.isBlank(areaCode)) {
+// areaCode = fwDefenseScene.getAreaCode();
+// }
Date now = new Date();
fwDefenseScene.setCreateUser(userId);
fwDefenseScene.setUpdateUser(userId);
if (deptId != null) {
fwDefenseScene.setCreateDept(deptId);
}
- if (StringUtil.isNotBlank(areaCode)) {
- fwDefenseScene.setAreaCode(areaCode);
- }
+// if (StringUtil.isNotBlank(areaCode)) {
+// fwDefenseScene.setAreaCode(areaCode);
+// }
fwDefenseScene.setCreateTime(now);
fwDefenseScene.setUpdateTime(now);
}
--
Gitblit v1.9.3