Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charg...

无关风月

2024-10-23 94b0a6092c7bcc11bec5f8a3cbee3c46acf12a23

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

@@ -8,23 +8,23 @@
import com.ruoyi.chargingPile.api.model.Site;
import com.ruoyi.chargingPile.api.model.TChargingGun;
import com.ruoyi.chargingPile.api.model.TChargingPile;
import com.ruoyi.chargingPile.api.model.TParkingLot;
import com.ruoyi.chargingPile.api.query.GetSiteList;
import com.ruoyi.chargingPile.api.query.SiteDetailQuery;
import com.ruoyi.chargingPile.api.query.SiteQuery;
import com.ruoyi.chargingPile.api.vo.SiteDetailVO;
import com.ruoyi.chargingPile.api.vo.SiteVO;
import com.ruoyi.chargingPile.api.vo.TAccountingStrategyVO;
import com.ruoyi.chargingPile.domain.SiteMenu;
import com.ruoyi.chargingPile.mapper.SiteMapper;
import com.ruoyi.chargingPile.service.IPartnerService;
import com.ruoyi.chargingPile.service.ISiteService;
import com.ruoyi.chargingPile.service.TChargingGunService;
import com.ruoyi.chargingPile.service.TChargingPileService;
import com.ruoyi.chargingPile.service.*;
import com.ruoyi.common.core.utils.ServletUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.integration.api.feignClient.IntegrationClient;
import com.ruoyi.other.api.domain.TVip;
import com.ruoyi.other.api.feignClient.RoleSiteClient;
import com.ruoyi.other.api.feignClient.UserSiteClient;
@@ -36,9 +36,12 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;

import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;

/**
 * @author zhibing.pu
@@ -72,6 +75,11 @@
   private VipClient vipClient;
   @Resource
   private SysUserRoleClient sysUserRoleClient;
   @Resource
   private TParkingLotService parkingLotService;
	
   @Resource
   private IntegrationClient integrationClient;

   
   
@@ -230,9 +238,9 @@
      if(StringUtils.isEmpty(site.getAddress())){
         return AjaxResult.error("详细地址不能为空");
      }
      if(StringUtils.isEmpty(site.getLon()) || StringUtils.isEmpty(site.getLat())){
         return AjaxResult.error("地图位置不能为空");
      }
//      if(StringUtils.isEmpty(site.getLon()) || StringUtils.isEmpty(site.getLat())){
//         return AjaxResult.error("地图位置不能为空");
//      }
      if(StringUtils.isEmpty(site.getPhone())){
         return AjaxResult.error("站点电话不能为空");
      }
@@ -285,7 +293,7 @@
         TVip vip = vipClient.getInfo1(appUser.getVipId()).getData();
         if(Objects.nonNull(vip) && vip.getType() == 2){
            list.forEach(item -> {
               item.setVipElectrovalence(vip.getDiscount().multiply(item.getElectrovalence()));
               item.setVipElectrovalence(vip.getDiscount().divide(new BigDecimal(10)).multiply(item.getServiceCharge()).add(item.getElectrovalenceOriginal()));
            });
         }
      }
@@ -294,8 +302,8 @@
   }

   @Override
   public SiteDetailVO getDetailById(Integer siteId) {
      return this.baseMapper.getDetailById(siteId);
   public SiteDetailVO getDetailById(SiteDetailQuery query) {
      return this.baseMapper.getDetailById(query);
   }

   @Override
@@ -317,6 +325,12 @@
            data.addAll(data1);
            ids = new HashSet<>(data);
         }
      }
      // 查询所有的停车场的站点id
      List<TParkingLot> list = parkingLotService.list();
      List<Integer> siteIds = list.stream().map(TParkingLot::getSiteId).collect(Collectors.toList());
      if(!CollectionUtils.isEmpty(ids) && !CollectionUtils.isEmpty(siteIds)){
         ids.addAll(siteIds);
      }
      return this.baseMapper.getSiteListParkLot(ids);
   }
@@ -361,7 +375,7 @@
         TVip vip = vipClient.getInfo1(appUser.getVipId()).getData();
         if(Objects.nonNull(vip) && vip.getType() == 2){
            list.forEach(item -> {
               item.setVipElectrovalence(vip.getDiscount().multiply(item.getElectrovalence()));
               item.setVipElectrovalence(vip.getDiscount().divide(new BigDecimal(10)).multiply(item.getServiceCharge()).add(item.getElectrovalenceOriginal()));
            });
         }
      }
@@ -385,5 +399,11 @@
         tChargingGun.setAccountingStrategyId(accountingStrategyId);
      }
      chargingGunService.updateBatchById(list);
		
      //下发硬件数据
      List<TChargingPile> list1 = chargingPileService.lambdaQuery().eq(TChargingPile::getSiteId, id).eq(TChargingPile::getDelFlag, 0).list();
      for (TChargingPile tChargingPile : list1) {
         integrationClient.setupBillingModel1(tChargingPile.getCode());
      }
   }
}