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/FwDefenseZoneServiceImpl.java | 207 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 204 insertions(+), 3 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwDefenseZoneServiceImpl.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwDefenseZoneServiceImpl.java
index 12703f6..c060b75 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwDefenseZoneServiceImpl.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwDefenseZoneServiceImpl.java
@@ -16,31 +16,173 @@
*/
package org.sxkj.fw.area.service.impl;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.utils.StringUtil;
+import org.sxkj.common.utils.HeaderUtils;
+import org.sxkj.fw.area.dto.FwDefenseZoneDTO;
+import org.sxkj.fw.area.entity.FwAreaDivideEntity;
+import org.sxkj.fw.area.entity.FwDefenseSceneEntity;
import org.sxkj.fw.area.entity.FwDefenseZoneEntity;
+import org.sxkj.fw.area.vo.FwAreaDivideVO;
import org.sxkj.fw.area.vo.FwDefenseZoneVO;
import org.sxkj.fw.area.excel.FwDefenseZoneExcel;
import org.sxkj.fw.area.mapper.FwDefenseZoneMapper;
+import org.sxkj.fw.area.service.IFwAreaDivideService;
+import org.sxkj.fw.area.service.IFwDefenseSceneService;
import org.sxkj.fw.area.service.IFwDefenseZoneService;
import org.springframework.stereotype.Service;
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 java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.Date;
/**
* 防区管理表 服务实现类
*
* @author lw
- * @since 2026-01-07
+ * @since 2026-01-08
*/
@Service
public class FwDefenseZoneServiceImpl extends BaseServiceImpl<FwDefenseZoneMapper, FwDefenseZoneEntity> implements IFwDefenseZoneService {
+ @Resource
+ private IFwAreaDivideService fwAreaDivideService;
+
+ @Resource
+ private IFwDefenseSceneService fwDefenseSceneService;
+
@Override
- public IPage<FwDefenseZoneVO> selectFwDefenseZonePage(IPage<FwDefenseZoneVO> page, FwDefenseZoneVO fwDefenseZone) {
- return page.setRecords(baseMapper.selectFwDefenseZonePage(page, fwDefenseZone));
+ public IPage<FwDefenseZoneVO> selectFwDefenseZonePage(IPage<FwDefenseZoneVO> page, FwDefenseZoneDTO fwDefenseZone) {
+ IPage<FwDefenseZoneVO> result = page.setRecords(baseMapper.selectFwDefenseZonePage(page, fwDefenseZone));
+ fillDefenseZoneStatistics(result.getRecords());
+ return result;
}
+ @Override
+ public FwDefenseZoneVO selectFwDefenseZoneDetail(Long id) {
+ FwDefenseZoneVO detail = baseMapper.selectFwDefenseZoneDetail(id);
+ if (detail != null) {
+ fillDefenseZoneStatistics(Collections.singletonList(detail));
+ }
+ return detail;
+ }
+
+ @Override
+ public List<FwAreaDivideVO> selectFwAreaDivideListByZoneId(Long zoneId) {
+ if (zoneId == null) {
+ return Collections.emptyList();
+ }
+ Integer exists = baseMapper.selectDefenseZoneExists(zoneId);
+ if (exists == null || exists == 0) {
+ return null;
+ }
+ List<FwAreaDivideVO> areaList = baseMapper.selectFwAreaDivideListByZoneId(zoneId);
+ if (areaList == null) {
+ return Collections.emptyList();
+ }
+ return areaList;
+ }
+
+ private void fillDefenseZoneStatistics(List<FwDefenseZoneVO> records) {
+ if (records == null || records.isEmpty()) {
+ return;
+ }
+ Set<Long> sceneIdSet = new HashSet<>();
+ Map<Long, List<Long>> zoneSceneMap = new HashMap<>();
+ for (FwDefenseZoneVO record : records) {
+ List<Long> sceneIds = parseIdList(record.getDefenseSceneIds());
+ if (record.getId() != null) {
+ zoneSceneMap.put(record.getId(), sceneIds);
+ }
+ sceneIdSet.addAll(sceneIds);
+ }
+ Map<Long, List<Long>> sceneAreaMap = new HashMap<>();
+ Set<Long> sceneAreaIdSet = new HashSet<>();
+ if (!sceneIdSet.isEmpty()) {
+ List<FwDefenseSceneEntity> sceneList = fwDefenseSceneService.listByIds(sceneIdSet);
+ for (FwDefenseSceneEntity scene : sceneList) {
+ if (scene == null || scene.getId() == null) {
+ continue;
+ }
+ List<Long> sceneAreaIds = parseIdList(scene.getAreaDivideIds());
+ sceneAreaMap.put(scene.getId(), sceneAreaIds);
+ sceneAreaIdSet.addAll(sceneAreaIds);
+ }
+ }
+ if (sceneIdSet.isEmpty()) {
+ for (FwDefenseZoneVO record : records) {
+ record.setSceneCount(0);
+ record.setDeviceCount(0);
+ record.setAreaCount(0);
+ }
+ return;
+ }
+ Map<Long, List<Long>> areaDeviceMap = new HashMap<>();
+ if (!sceneAreaIdSet.isEmpty()) {
+ List<FwAreaDivideEntity> areaList = fwAreaDivideService.listByIds(sceneAreaIdSet);
+ for (FwAreaDivideEntity area : areaList) {
+ if (area == null || area.getId() == null) {
+ continue;
+ }
+ areaDeviceMap.put(area.getId(), parseIdList(area.getDeviceIds()));
+ }
+ }
+
+ for (FwDefenseZoneVO record : records) {
+ List<Long> sceneIds = zoneSceneMap.get(record.getId());
+ if (sceneIds == null) {
+ sceneIds = Collections.emptyList();
+ }
+ Set<Long> uniqueSceneIds = new HashSet<>(sceneIds);
+ record.setSceneCount(uniqueSceneIds.size());
+ Set<Long> sceneAreaIds = new HashSet<>();
+ for (Long sceneId : uniqueSceneIds) {
+ List<Long> areaIds = sceneAreaMap.get(sceneId);
+ if (areaIds != null) {
+ sceneAreaIds.addAll(areaIds);
+ }
+ }
+ Set<Long> deviceIds = new HashSet<>();
+ for (Long areaId : sceneAreaIds) {
+ List<Long> areaDeviceIds = areaDeviceMap.get(areaId);
+ if (areaDeviceIds != null) {
+ deviceIds.addAll(areaDeviceIds);
+ }
+ }
+ record.setAreaCount(sceneAreaIds.size());
+ record.setDeviceCount(deviceIds.size());
+ }
+ }
+
+ private List<Long> parseIdList(String ids) {
+ if (StringUtil.isBlank(ids)) {
+ return Collections.emptyList();
+ }
+ String[] idArray = ids.split(",");
+ List<Long> idList = new ArrayList<>(idArray.length);
+ for (String item : idArray) {
+ if (item == null) {
+ continue;
+ }
+ String value = item.trim();
+ if (StringUtil.isBlank(value)) {
+ continue;
+ }
+ try {
+ idList.add(Long.valueOf(value));
+ } catch (NumberFormatException ignored) {
+ }
+ }
+ return idList;
+ }
@Override
public List<FwDefenseZoneExcel> exportFwDefenseZone(Wrapper<FwDefenseZoneEntity> queryWrapper) {
@@ -51,4 +193,63 @@
return fwDefenseZoneList;
}
+ @Override
+ public boolean save(FwDefenseZoneEntity fwDefenseZone) {
+ fillCreateFields(fwDefenseZone);
+ return baseMapper.insertWithGeom(fwDefenseZone) > 0;
+ }
+
+ @Override
+ public boolean updateById(FwDefenseZoneEntity fwDefenseZone) {
+ fillUpdateFields(fwDefenseZone);
+ return baseMapper.updateWithGeomById(fwDefenseZone) > 0;
+ }
+
+ @Override
+ public boolean saveOrUpdate(FwDefenseZoneEntity fwDefenseZone) {
+ if (fwDefenseZone.getId() == null) {
+ fillCreateFields(fwDefenseZone);
+ return baseMapper.insertWithGeom(fwDefenseZone) > 0;
+ } else {
+ fillUpdateFields(fwDefenseZone);
+ return baseMapper.updateWithGeomById(fwDefenseZone) > 0;
+ }
+ }
+
+ private void fillCreateFields(FwDefenseZoneEntity fwDefenseZone) {
+ Long userId = AuthUtil.getUserId();
+ String deptIdStr = AuthUtil.getDeptId();
+ Long deptId = null;
+ if (StringUtil.isNotBlank(deptIdStr)) {
+ try {
+ deptId = Long.valueOf(deptIdStr);
+ } catch (NumberFormatException ignored) {
+ deptId = null;
+ }
+ }
+// String areaCode = HeaderUtils.getAreaCode();
+// if (StringUtil.isBlank(areaCode)) {
+// areaCode = fwDefenseZone.getAreaCode();
+// }
+ Date now = new Date();
+ fwDefenseZone.setCreateUser(userId);
+ fwDefenseZone.setUpdateUser(userId);
+ if (deptId != null) {
+ fwDefenseZone.setCreateDept(deptId);
+ }
+// if (StringUtil.isNotBlank(areaCode)) {
+// fwDefenseZone.setAreaCode(areaCode);
+// }
+ fwDefenseZone.setCreateTime(now);
+ fwDefenseZone.setUpdateTime(now);
+ }
+
+ private void fillUpdateFields(FwDefenseZoneEntity fwDefenseZone) {
+ Long userId = AuthUtil.getUserId();
+ if (userId != null) {
+ fwDefenseZone.setUpdateUser(userId);
+ }
+ fwDefenseZone.setUpdateTime(new Date());
+ }
+
}
--
Gitblit v1.9.3