取消areaCode相关插入

rain

2026-01-13 631b1895a9a12ceace45fcd877d3f4e6fbf0885f

 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwDefenseZoneServiceImpl.java

@@ -21,13 +21,11 @@
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.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;
@@ -53,9 +51,6 @@
 */
@Service
public class FwDefenseZoneServiceImpl extends BaseServiceImpl<FwDefenseZoneMapper, FwDefenseZoneEntity> implements IFwDefenseZoneService {

   @Resource
   private IFwDefenseSceneService fwDefenseSceneService;

   @Resource
   private IFwAreaDivideService fwAreaDivideService;
@@ -105,17 +100,8 @@
         }
         return;
      }
      Map<Long, List<Long>> sceneDeviceMap = new HashMap<>();
      if (!sceneIdSet.isEmpty()) {
         List<FwDefenseSceneEntity> sceneList = fwDefenseSceneService.listByIds(sceneIdSet);
         for (FwDefenseSceneEntity scene : sceneList) {
            if (scene == null || scene.getId() == null) {
               continue;
            }
            sceneDeviceMap.put(scene.getId(), parseIdList(scene.getDeviceIds()));
         }
      }
      Map<Long, BigDecimal> areaSizeMap = new HashMap<>();
      Map<Long, List<Long>> areaDeviceMap = new HashMap<>();
      if (!areaIdSet.isEmpty()) {
         List<FwAreaDivideEntity> areaList = fwAreaDivideService.listByIds(areaIdSet);
         for (FwAreaDivideEntity area : areaList) {
@@ -123,6 +109,7 @@
               continue;
            }
            areaSizeMap.put(area.getId(), area.getAreaSize());
            areaDeviceMap.put(area.getId(), parseIdList(area.getDeviceIds()));
         }
      }

@@ -139,10 +126,10 @@
         }
         Set<Long> areaIds = new HashSet<>(zoneAreaIds);
         Set<Long> deviceIds = new HashSet<>();
         for (Long sceneId : uniqueSceneIds) {
            List<Long> sceneDeviceIds = sceneDeviceMap.get(sceneId);
            if (sceneDeviceIds != null) {
               deviceIds.addAll(sceneDeviceIds);
         for (Long areaId : areaIds) {
            List<Long> areaDeviceIds = areaDeviceMap.get(areaId);
            if (areaDeviceIds != null) {
               deviceIds.addAll(areaDeviceIds);
            }
         }
         record.setAreaCount(areaIds.size());
@@ -234,19 +221,19 @@
            deptId = null;
         }
      }
      String areaCode = HeaderUtils.getAreaCode();
      if (StringUtil.isBlank(areaCode)) {
         areaCode = fwDefenseZone.getAreaCode();
      }
//      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);
      }
//      if (StringUtil.isNotBlank(areaCode)) {
//         fwDefenseZone.setAreaCode(areaCode);
//      }
      fwDefenseZone.setCreateTime(now);
      fwDefenseZone.setUpdateTime(now);
   }