merge

luodangjia

2024-11-04 e0fc8f7e2230b51e3bbe8dea43790cf11b7170e9

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

@@ -1,15 +1,13 @@
package com.ruoyi.chargingPile.service.impl;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.api.feignClient.AppUserCarClient;
import com.ruoyi.account.api.model.TAppUserCar;
import com.ruoyi.chargingPile.api.dto.PageChargingPileListDTO;
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.TFaultMessage;
import com.ruoyi.chargingPile.api.model.*;
import com.ruoyi.chargingPile.api.query.BatchSetAccountingStrategy;
import com.ruoyi.chargingPile.api.query.PageChargingPileList;
import com.ruoyi.chargingPile.api.vo.TChargingGunVO;
@@ -111,6 +109,9 @@
   
   @Resource
   private IntegrationClient integrationClient;
	
   @Resource
   private TAccountingStrategyDetailService accountingStrategyDetailService;
   
   
   
@@ -286,12 +287,18 @@
      List<Integer> id = setAccountingStrategy.getId();
      List<TChargingGun> list = chargingGunService.list(new LambdaQueryWrapper<TChargingGun>().in(TChargingGun::getChargingPileId, id).eq(TChargingGun::getDelFlag, 0));
      for (TChargingGun tChargingGun : list) {
         tChargingGun.setAccountingStrategyId(setAccountingStrategy.getAccountingStrategyId());
         TChargingGun tChargingGun1 = new TChargingGun();
         tChargingGun1.setId(tChargingGun.getId());
         tChargingGun1.setAccountingStrategyId(setAccountingStrategy.getAccountingStrategyId());
         chargingGunService.updateById(tChargingGun1);
      }
      chargingGunService.updateBatchById(list);
      Integer accountingStrategyId = setAccountingStrategy.getAccountingStrategyId();
      List<TAccountingStrategyDetail> accountingStrategyDetails = accountingStrategyDetailService.list(new LambdaQueryWrapper<TAccountingStrategyDetail>()
            .eq(TAccountingStrategyDetail::getAccountingStrategyId, accountingStrategyId).orderByAsc(TAccountingStrategyDetail::getStartTime));
      //下发硬件更新计费模板
      for (TChargingPile chargingPile : this.listByIds(id)) {
         integrationClient.setupBillingModel1(chargingPile.getCode());
      List<TChargingPile> tChargingPiles = this.listByIds(id);
      for (TChargingPile chargingPile : tChargingPiles) {
         integrationClient.setupBillingModel1(chargingPile.getCode(), JSON.toJSONString(accountingStrategyDetails));
      }
      
   }
@@ -518,7 +525,7 @@
         if(status == 5 || status == 6){
            gunMonitoring.setStatus(3);
         }
         if(status == 4){
         if(status == 4 || status == 7){
            Integer id = gunMonitoring.getId();
            TChargingOrder chargingOrder = chargingOrderClient.getOrderDetailByGunId(id).getData();
            if(null != chargingOrder){