Merge remote-tracking branch 'origin/master'

xuhy

2024-10-25 ab9eb0f1fcd3a20f7b1ec90fb63e9a8cb7f7792a

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

@@ -27,6 +27,7 @@
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.redis.service.RedisService;
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.UploadRealTimeMonitoringDataClient;
import com.ruoyi.integration.api.model.UploadRealTimeMonitoringData;
@@ -106,6 +107,9 @@
   
   @Resource
   private TFaultMessageService faultMessageService;
	
   @Resource
   private IntegrationClient integrationClient;
   
   
   
@@ -284,6 +288,11 @@
         tChargingGun.setAccountingStrategyId(setAccountingStrategy.getAccountingStrategyId());
      }
      chargingGunService.updateBatchById(list);
      //下发硬件更新计费模板
      for (TChargingPile chargingPile : this.listByIds(id)) {
         integrationClient.setupBillingModel1(chargingPile.getCode());
      }
		
   }

   @Override
@@ -589,20 +598,18 @@
      
      if(datas.size() > 0){
         for (TChargingPile data : datas) {
            if(data.getStatus() == 1){
               TFaultMessage faultMessage = faultMessageService.getOne(new LambdaQueryWrapper<TFaultMessage>().eq(TFaultMessage::getChargingPileId, data.getId())
                     .eq(TFaultMessage::getStatus, 1).eq(TFaultMessage::getDelFlag, 0).isNull(TFaultMessage::getEndTime));
               if(null == faultMessage){
                  faultMessage = new TFaultMessage();
                  faultMessage.setSiteId(data.getSiteId());
                  faultMessage.setChargingPileId(data.getId());
                  faultMessage.setStatus(1);
                  faultMessage.setDownTime(LocalDateTime.now());
                  faultMessage.setCreateTime(LocalDateTime.now());
                  faultMessage.setDelFlag(false);
                  faultMessage.setContent("设备离线");
                  faultMessageService.save(faultMessage);
               }
            TFaultMessage faultMessage = faultMessageService.getOne(new LambdaQueryWrapper<TFaultMessage>().eq(TFaultMessage::getChargingPileId, data.getId())
                  .eq(TFaultMessage::getStatus, 1).eq(TFaultMessage::getDelFlag, 0).isNull(TFaultMessage::getEndTime));
            if(null == faultMessage){
               faultMessage = new TFaultMessage();
               faultMessage.setSiteId(data.getSiteId());
               faultMessage.setChargingPileId(data.getId());
               faultMessage.setStatus(1);
               faultMessage.setDownTime(LocalDateTime.now());
               faultMessage.setCreateTime(LocalDateTime.now());
               faultMessage.setDelFlag(false);
               faultMessage.setContent("设备离线");
               faultMessageService.save(faultMessage);
            }
         }
         this.updateBatchById(datas);