Merge remote-tracking branch 'origin/master'

rain

2026-01-29 5e73881ef728238e7f7a3bd5d74cf41f3f6b0923

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

@@ -33,6 +33,8 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.sxkj.system.cache.SysCache;

import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
@@ -63,6 +65,8 @@

   @Override
   public IPage<FwDefenseSceneVO> selectFwDefenseScenePage(IPage<FwDefenseSceneVO> page, FwDefenseSceneVO fwDefenseScene) {
      List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
      fwDefenseScene.setDeptList(deptList);
      IPage<FwDefenseSceneVO> result = page.setRecords(baseMapper.selectFwDefenseScenePage(page, fwDefenseScene));
      List<FwDefenseSceneVO> records = result.getRecords();
      if (records == null || records.isEmpty()) {
@@ -83,7 +87,7 @@
            if (area == null || area.getId() == null) {
               continue;
            }
            areaSizeMap.put(area.getId(), area.getAreaSize());
//            areaSizeMap.put(area.getId(), area.getAreaSize());
            List<Long> areaDeviceIds = parseIdList(area.getDeviceIds());
            areaDeviceMap.put(area.getId(), areaDeviceIds);
            deviceIdSet.addAll(areaDeviceIds);
@@ -104,7 +108,6 @@
      for (FwDefenseSceneVO record : records) {
         List<Long> areaIds = parseIdList(record.getAreaDivideIds());
         record.setAreaCount(areaIds.size());
         record.setDefenseArea(sumDefenseArea(areaIds, areaSizeMap));

         Set<Long> deviceIds = new HashSet<>();
         for (Long areaId : areaIds) {
@@ -134,8 +137,8 @@
   }

   @Override
   public List<FwDefenseSceneVO> selectFwDefenseSceneList(Integer filterSelected, Long areaId) {
      return baseMapper.selectFwDefenseSceneList(filterSelected, areaId);
   public List<FwDefenseSceneVO> selectFwDefenseSceneList(Integer filterSelected, Long zoneId, Long areaId) {
      return baseMapper.selectFwDefenseSceneList(filterSelected, zoneId, areaId);
   }

   private List<Long> parseIdList(String ids) {
@@ -159,25 +162,6 @@
      }
      return idList;
   }

   private Integer sumDefenseArea(List<Long> areaIds, Map<Long, BigDecimal> areaSizeMap) {
      if (areaIds == null || areaIds.isEmpty()) {
         return 0;
      }
      BigDecimal total = BigDecimal.ZERO;
      for (Long areaId : areaIds) {
         BigDecimal areaSize = areaSizeMap.get(areaId);
         if (areaSize != null) {
            total = total.add(areaSize);
         }
      }
      if (BigDecimal.ZERO.compareTo(total) == 0) {
         return 0;
      }
      BigDecimal totalArea = total.multiply(AREA_SIZE_FACTOR);
      return totalArea.setScale(0, RoundingMode.HALF_UP).intValue();
   }


   @Override
   public List<FwDefenseSceneExcel> exportFwDefenseScene(Wrapper<FwDefenseSceneEntity> queryWrapper) {