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;
@@ -24,6 +22,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.domain.BasePojo;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.utils.SecurityUtils;
@@ -110,6 +109,9 @@
   
   @Resource
   private IntegrationClient integrationClient;
	
   @Resource
   private TAccountingStrategyDetailService accountingStrategyDetailService;
   
   
   
@@ -285,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));
      }
      
   }
@@ -576,6 +584,13 @@
               }
            }
         }
         //test
//         if (status==1||status==7){
//            TFaultMessage one = faultMessageService.lambdaQuery().eq(TFaultMessage::getChargingGunId, gunMonitoring.getId()).orderByDesc(TFaultMessage::getCreateTime).last("limit 1").one();
//            if (one!=null) {
//               gunMonitoring.setFaultCause(one.getContent());
//            }
//         }
      }
      return pageInfo.setRecords(chargingGunMonitoring);
   }