From bf45f88ff9ea1ea1d4976f97dbe2a12eae9a52f9 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 05 Feb 2026 10:12:37 +0800
Subject: [PATCH] 反无优化

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwAreaDivideServiceImpl.java |   71 ++++++++++++++++++++++++++++++++---
 1 files changed, 65 insertions(+), 6 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwAreaDivideServiceImpl.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwAreaDivideServiceImpl.java
index 38604f6..48c4f1c 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwAreaDivideServiceImpl.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwAreaDivideServiceImpl.java
@@ -31,6 +31,7 @@
 import org.sxkj.fw.area.entity.FwAreaDivideExtEntity;
 import org.sxkj.fw.area.excel.FwAreaDivideExcel;
 import org.sxkj.fw.area.mapper.FwAreaDivideMapper;
+import org.sxkj.fw.area.param.FwAreaDivideListParam;
 import org.sxkj.fw.area.service.IFwAreaDivideExtService;
 import org.sxkj.fw.area.service.IFwAreaDivideService;
 import org.sxkj.fw.area.vo.FwAreaDivideExtVO;
@@ -56,8 +57,11 @@
 
 	@Override
 	public IPage<FwAreaDivideVO> selectFwAreaDividePage(IPage<FwAreaDivideVO> page, FwAreaDivideDTO fwAreaDivide) {
-		List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
-		fwAreaDivide.setDeptList(deptList);
+		if (!AuthUtil.isAdministrator()) {
+			List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
+			fwAreaDivide.setDeptList(deptList);
+		}
+		fwAreaDivide.setAreaTypeKeyList(parseAreaTypeKeyList(fwAreaDivide.getAreaTypeKeys()));
 
 		List<FwAreaDivideVO> areaDivideList = baseMapper.selectFwAreaDividePage(page, fwAreaDivide);
 
@@ -70,8 +74,39 @@
 	}
 
 	@Override
-	public List<FwAreaDivideVO> selectFwAreaDivideList(Integer filterSelected, Long sceneId) {
-		List<FwAreaDivideVO> areaDivideList = baseMapper.selectFwAreaDivideList(filterSelected, sceneId);
+	public List<FwAreaDivideVO> selectFwAreaDivideList(Integer filterSelected, Long sceneId, String areaTypeKeys, Integer isSetSceneManage, java.time.LocalDateTime flyTime) {
+		// 创建参数对象
+		FwAreaDivideListParam param = new FwAreaDivideListParam();
+		param.setFilterSelected(filterSelected);
+		param.setSceneId(sceneId);
+		param.setAreaTypeKeys(areaTypeKeys);
+		param.setIsSetSceneManage(isSetSceneManage);
+		param.setFlyTime(flyTime);
+		// 解析区域类型键值列表
+		param.setAreaTypeKeyList(parseAreaTypeKeyList(areaTypeKeys));
+		if (!AuthUtil.isAdministrator()) {
+			List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
+			param.setDeptList(deptList);
+		}
+		// 调用Mapper方法，传入参数对象
+		List<FwAreaDivideVO> areaDivideList = baseMapper.selectFwAreaDivideList(param);
+		// 获取面数据
+		if (areaDivideList != null && !areaDivideList.isEmpty()) {
+			enrichWithExtensionData(areaDivideList);
+		}
+		return areaDivideList;
+	}
+
+	/**
+	 * 区域划分列表查询（对象参数版本）
+	 *
+	 * @param param 区域划分列表查询参数
+	 * @return 区域划分列表
+	 */
+	@Override
+	public List<FwAreaDivideVO> selectFwAreaDivideList(FwAreaDivideListParam param) {
+		// 调用Mapper方法，传入参数对象
+		List<FwAreaDivideVO> areaDivideList = baseMapper.selectFwAreaDivideListCockpit(param);
 		// 获取面数据
 		if (areaDivideList != null && !areaDivideList.isEmpty()) {
 			enrichWithExtensionData(areaDivideList);
@@ -200,8 +235,11 @@
 	@Override
 	public IPage<FwAreaDivideStatisticsVO> selectFwAreaDivideStatisticsPage(IPage<FwAreaDivideStatisticsVO> page,
 																			FwAreaDivideStatisticsDTO fwAreaDivideStatistics) {
-		List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
-		fwAreaDivideStatistics.setDeptList(deptList);
+		if (!AuthUtil.isAdministrator()) {
+			List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
+			fwAreaDivideStatistics.setDeptList(deptList);
+		}
+		fwAreaDivideStatistics.setAreaTypeKeyList(parseAreaTypeKeyList(fwAreaDivideStatistics.getAreaTypeKeys()));
 		return page.setRecords(baseMapper.selectFwAreaDivideStatisticsPage(page, fwAreaDivideStatistics));
 	}
 
@@ -401,6 +439,27 @@
 		return String.join(",", keySet);
 	}
 
+	private List<String> parseAreaTypeKeyList(String areaTypeKeys) {
+		if (StringUtil.isBlank(areaTypeKeys)) {
+			return null;
+		}
+		String[] keyArray = areaTypeKeys.split(",");
+		Set<String> keySet = new LinkedHashSet<>();
+		for (String item : keyArray) {
+			if (item == null) {
+				continue;
+			}
+			String value = item.trim();
+			if (StringUtil.isNotBlank(value)) {
+				keySet.add(value);
+			}
+		}
+		if (keySet.isEmpty()) {
+			return null;
+		}
+		return new ArrayList<>(keySet);
+	}
+
 	private List<Long> parseIdList(String ids) {
 		if (StringUtil.isBlank(ids)) {
 			return new ArrayList<>();

--
Gitblit v1.9.3