xiugai

puzhibing

2024-10-28 03e20b226d79f4452722a42eae275edb94bebba5

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java

@@ -328,9 +328,15 @@
      }
      // 查询所有的停车场的站点id
      List<TParkingLot> list = parkingLotService.list();
      List<Integer> siteIds = list.stream().map(TParkingLot::getSiteId).collect(Collectors.toList());
      List<Integer> siteIds = list.stream().map(TParkingLot::getSiteId).distinct().collect(Collectors.toList());
      if(!CollectionUtils.isEmpty(ids) && !CollectionUtils.isEmpty(siteIds)){
         ids.addAll(siteIds);
         Iterator<Integer> iterator = ids.iterator();
         while (iterator.hasNext()){
            Integer next = iterator.next();
            if(siteIds.contains(next)){
               iterator.remove();
            }
         }
      }
      return this.baseMapper.getSiteListParkLot(ids);
   }
@@ -394,7 +400,7 @@
      Site site = this.getById(id);
      site.setAccountingStrategyId(accountingStrategyId);
      this.updateById(site);
      List<TChargingGun> list = chargingGunService.list(new LambdaQueryWrapper<TChargingGun>().in(TChargingGun::getChargingPileId, id).eq(TChargingGun::getDelFlag, 0));
      List<TChargingGun> list = chargingGunService.list(new LambdaQueryWrapper<TChargingGun>().in(TChargingGun::getSiteId, id).eq(TChargingGun::getDelFlag, 0));
      for (TChargingGun tChargingGun : list) {
         tChargingGun.setAccountingStrategyId(accountingStrategyId);
      }