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

无关风月

2025-02-20 0d4c9f50ee2bc3e4a03abd91ac7c9e03891d37f2

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

@@ -26,10 +26,7 @@
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.integration.api.feignClient.IntegrationClient;
import com.ruoyi.integration.api.feignClient.IotInterfaceClient;
import com.ruoyi.integration.api.feignClient.SendMessageClient;
import com.ruoyi.integration.api.feignClient.UploadRealTimeMonitoringDataClient;
import com.ruoyi.integration.api.feignClient.*;
import com.ruoyi.integration.api.model.QrCodeDelivery;
import com.ruoyi.integration.api.model.UploadRealTimeMonitoringData;
import com.ruoyi.integration.api.vo.AddDevice;
@@ -69,6 +66,9 @@
   
   @Resource
   private TChargingGunService chargingGunService;
	
   @Resource
   private TCECClient tcecClient;
   
   @Resource
   private SysUserClient sysUserClient;
@@ -486,12 +486,12 @@
      chargeTrend.put("value", value1);
      chargeMonitoring.setChargeTrend(chargeTrend);
      
      //每日利用率=当日充电度数/（总桩数量*桩总功率*24小时）
      //每日利用率=当日充电度数/（桩总功率*24小时）
      List<TChargingPile> list = this.list(new LambdaQueryWrapper<TChargingPile>().in(TChargingPile::getSiteId, siteIds).eq(TChargingPile::getDelFlag, 0));
      BigDecimal v = list.stream().map(TChargingPile::getRatedPower).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(4, RoundingMode.HALF_EVEN);
      List<Double> data = chargingOrderAccountingStrategyClient.getDailyChargingDegree(6, siteIds).getData();
      List<Double> value2 = new ArrayList<>();
      BigDecimal multiply = new BigDecimal(list.size()).multiply(v).multiply(new BigDecimal(24));
      BigDecimal multiply = v.multiply(new BigDecimal(24));
      for (Double datum : data) {
         if(list.size() == 0){
            value2.add(0D);
@@ -615,6 +615,8 @@
               if(null != appUserCarId){
                  TAppUserCar tAppUserCar = appUserCarClient.getCarByIds(Arrays.asList(appUserCarId)).getData().get(0);
                  gunMonitoring.setLicensePlate(tAppUserCar.getLicensePlate());
               }else{
                  gunMonitoring.setLicensePlate(chargingOrder.getPlateNum());
               }

               UploadRealTimeMonitoringData data = uploadRealTimeMonitoringDataClient.chargingOrderInfo(chargingOrder.getCode()).getData();
@@ -696,6 +698,8 @@
            chargingGun1.setId(chargingGun.getId());
            chargingGun1.setStatus(1);
            chargingGunService.updateById(chargingGun1);
            //推送状态给三方平台
            tcecClient.pushChargingGunStatus(chargingGun1.getFullNumber(), chargingGun1.getStatus());
            
            //桩处于正常，桩所属的枪都处于非正常，修改桩状态为异常
            TChargingPile chargingPile = this.getById(chargingGun.getChargingPileId());
@@ -736,7 +740,6 @@
                  siteName = siteName.substring(0,10);
               }
               chargingPileNotificationService.saveData(4,faultMessage.getSiteId(),faultMessage.getChargingPileId(),site.getPhone(),"检测到"+siteName+"..."+chargingPile.getNumber()+"号桩设备离线，请及时查看处理！");

            }
         }
      }