Merge remote-tracking branch 'origin/master'

luodangjia

2024-11-05 11b6cfb2d3312b018b68eecadc798dfa3e2ec6db

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

@@ -28,7 +28,9 @@
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.model.QrCodeDelivery;
import com.ruoyi.integration.api.model.UploadRealTimeMonitoringData;
import com.ruoyi.integration.api.vo.AddDevice;
import com.ruoyi.integration.api.vo.AddDeviceResp;
@@ -112,6 +114,9 @@
   
   @Resource
   private TAccountingStrategyDetailService accountingStrategyDetailService;
	
   @Resource
   private SendMessageClient sendMessageClient;
   
   
   
@@ -248,6 +253,25 @@
         return AjaxResult.error("设备编号已存在");
      }
      this.updateById(chargingPile);
		
      List<TChargingGun> list = chargingGunService.list(new LambdaQueryWrapper<TChargingGun>().eq(TChargingGun::getChargingPileId, chargingPile.getId()).eq(TChargingGun::getDelFlag, 0));
      for (TChargingGun chargingGun : list) {
         TChargingGun chargingGun1 = new TChargingGun();
         chargingGun1.setId(chargingGun.getId());
         chargingGun1.setFullNumber(chargingPile.getCode() + chargingGun.getCode());
         chargingGunService.updateById(chargingGun1);
			
         //下发硬件充电二维码
         String code_prefix = "https://mxcd.zhinenganguan.com?No=";
         QrCodeDelivery qrCodeDelivery = new QrCodeDelivery();
         qrCodeDelivery.setCharging_pile_code(chargingPile.getCode());
         qrCodeDelivery.setCharging_gun_code(chargingGun.getCode());
         qrCodeDelivery.setCode_format(1);
         qrCodeDelivery.setPrefix_length(code_prefix.length());
         qrCodeDelivery.setCode_prefix(code_prefix);
         qrCodeDelivery.setQr_code(code_prefix + chargingPile.getCode() + chargingGun.getCode());
         sendMessageClient.qrCodeDelivery(qrCodeDelivery);
      }
      return AjaxResult.success();
   }
   
@@ -298,7 +322,6 @@
      //下发硬件更新计费模板
      List<TChargingPile> tChargingPiles = this.listByIds(id);
      for (TChargingPile chargingPile : tChargingPiles) {
         System.err.println(JSON.toJSONString(accountingStrategyDetails));
         integrationClient.setupBillingModel1(chargingPile.getCode(), JSON.toJSONString(accountingStrategyDetails));
      }