From 631b1895a9a12ceace45fcd877d3f4e6fbf0885f Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Tue, 13 Jan 2026 11:18:27 +0800
Subject: [PATCH] 取消areaCode相关插入
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwAreaDivideServiceImpl.java | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 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 abd25df..f8b71c5 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
@@ -20,8 +20,10 @@
import org.springblade.core.tool.utils.StringUtil;
import org.sxkj.common.utils.HeaderUtils;
import org.sxkj.fw.area.dto.FwAreaDivideDTO;
+import org.sxkj.fw.area.dto.FwAreaDivideStatisticsDTO;
import org.sxkj.fw.area.entity.FwAreaDivideEntity;
import org.sxkj.fw.area.vo.FwAreaDivideVO;
+import org.sxkj.fw.area.vo.FwAreaDivideStatisticsVO;
import org.sxkj.fw.area.excel.FwAreaDivideExcel;
import org.sxkj.fw.area.mapper.FwAreaDivideMapper;
import org.sxkj.fw.area.service.IFwAreaDivideService;
@@ -44,6 +46,21 @@
@Override
public IPage<FwAreaDivideVO> selectFwAreaDividePage(IPage<FwAreaDivideVO> page, FwAreaDivideDTO fwAreaDivide) {
return page.setRecords(baseMapper.selectFwAreaDividePage(page, fwAreaDivide));
+ }
+
+ @Override
+ public List<FwAreaDivideVO> selectFwAreaDivideList(Integer filterSelected, Long sceneId) {
+ return baseMapper.selectFwAreaDivideList(filterSelected, sceneId);
+ }
+
+ @Override
+ public IPage<FwAreaDivideStatisticsVO> selectFwAreaDivideStatisticsPage(IPage<FwAreaDivideStatisticsVO> page, FwAreaDivideStatisticsDTO fwAreaDivideStatistics) {
+ return page.setRecords(baseMapper.selectFwAreaDivideStatisticsPage(page, fwAreaDivideStatistics));
+ }
+
+ @Override
+ public FwAreaDivideStatisticsVO selectFwAreaDivideStatisticsDetail(FwAreaDivideStatisticsDTO fwAreaDivideStatistics) {
+ return baseMapper.selectFwAreaDivideStatisticsDetail(fwAreaDivideStatistics);
}
@Override
@@ -94,19 +111,19 @@
deptId = null;
}
}
- String areaCode = fwAreaDivide.getAreaCode();
- if (StringUtil.isBlank(areaCode)) {
- areaCode = HeaderUtils.getAreaCode();
- }
+// String areaCode = fwAreaDivide.getAreaCode();
+// if (StringUtil.isBlank(areaCode)) {
+// areaCode = HeaderUtils.getAreaCode();
+// }
Date now = new Date();
fwAreaDivide.setCreateUser(userId);
fwAreaDivide.setUpdateUser(userId);
if (deptId != null) {
fwAreaDivide.setCreateDept(deptId);
}
- if (StringUtil.isNotBlank(areaCode)) {
- fwAreaDivide.setAreaCode(areaCode);
- }
+// if (StringUtil.isNotBlank(areaCode)) {
+// fwAreaDivide.setAreaCode(areaCode);
+// }
fwAreaDivide.setCreateTime(now);
fwAreaDivide.setUpdateTime(now);
}
--
Gitblit v1.9.3