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 | 6 +++++-
1 files changed, 5 insertions(+), 1 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 d54f4ac..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,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()) {
@@ -83,7 +87,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);
--
Gitblit v1.9.3