From 5b23a8cb9294506d88330f0750f39b9a2cbabbdc Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Thu, 29 Jan 2026 18:06:19 +0800
Subject: [PATCH] 区域划分调整

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwPoliceStationServiceImpl.java |   24 +++++++++++++++++-------
 1 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwPoliceStationServiceImpl.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwPoliceStationServiceImpl.java
index 5e2f51a..ffbfa9c 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwPoliceStationServiceImpl.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwPoliceStationServiceImpl.java
@@ -45,6 +45,11 @@
 		return page.setRecords(baseMapper.selectFwPoliceStationPage(page, fwPoliceStation));
 	}
 
+	@Override
+	public List<FwPoliceStationVO> selectFwPoliceStationList() {
+		return baseMapper.selectFwPoliceStationList();
+	}
+
 
 	@Override
 	public List<FwPoliceStationExcel> exportFwPoliceStation(Wrapper<FwPoliceStationEntity> queryWrapper) {
@@ -53,6 +58,11 @@
 		//	fwPoliceStation.setTypeName(DictCache.getValue(DictEnum.YES_NO, FwPoliceStation.getType()));
 		//});
 		return fwPoliceStationList;
+	}
+
+	@Override
+	public List<FwPoliceStationVO> selectByPolygons(List<String> polygons) {
+		return baseMapper.selectByPolygons(polygons);
 	}
 
 	@Override
@@ -88,19 +98,19 @@
 				deptId = null;
 			}
 		}
-		String areaCode = HeaderUtils.getAreaCode();
-		if (StringUtil.isBlank(areaCode)) {
-			areaCode = fwPoliceStation.getAreaCode();
-		}
+//		String areaCode = HeaderUtils.getAreaCode();
+//		if (StringUtil.isBlank(areaCode)) {
+//			areaCode = fwPoliceStation.getAreaCode();
+//		}
 		Date now = new Date();
 		fwPoliceStation.setCreateUser(userId);
 		fwPoliceStation.setUpdateUser(userId);
 		if (deptId != null) {
 			fwPoliceStation.setCreateDept(deptId);
 		}
-		if (StringUtil.isNotBlank(areaCode)) {
-			fwPoliceStation.setAreaCode(areaCode);
-		}
+//		if (StringUtil.isNotBlank(areaCode)) {
+//			fwPoliceStation.setAreaCode(areaCode);
+//		}
 		fwPoliceStation.setCreateTime(now);
 		fwPoliceStation.setUpdateTime(now);
 	}

--
Gitblit v1.9.3