From 21775c75545616beec1fdba433f7b45d621e0c95 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 02 十一月 2024 14:19:18 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingGunServiceImpl.java | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingGunServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingGunServiceImpl.java
index c512cb8..dcea1b1 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingGunServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingGunServiceImpl.java
@@ -4,6 +4,11 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.chargingPile.api.dto.TChargingGunDTO;
+import com.ruoyi.chargingPile.api.feignClient.SiteClient;
+import com.ruoyi.chargingPile.api.model.Site;
+import com.ruoyi.chargingPile.api.model.TAccountingStrategy;
+import com.ruoyi.chargingPile.api.feignClient.SiteClient;
+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.query.TChargingGunQuery;
@@ -11,6 +16,7 @@
import com.ruoyi.chargingPile.domain.SiteMenu;
import com.ruoyi.chargingPile.mapper.TChargingGunMapper;
import com.ruoyi.chargingPile.service.IPartnerService;
+import com.ruoyi.chargingPile.service.TAccountingStrategyService;
import com.ruoyi.chargingPile.service.TChargingGunService;
import com.ruoyi.chargingPile.service.TChargingPileService;
import com.ruoyi.common.core.enums.status.ChargingGunModeEnum;
@@ -66,7 +72,10 @@
@Resource
private SendMessageClient sendMessageClient;
-
+ @Resource
+ private SiteClient siteClient;
+
+
@Override
@@ -99,6 +108,13 @@
tChargingGunVO.setAuthQueryInfo(roleType == 1 ? true : partnerService.authMenu(objectId, siteId, SiteMenu.CHARGING_GUN_QUERY_INFO));
tChargingGunVO.setAuthUpdate(roleType == 1 ? true : partnerService.authMenu(objectId, siteId, SiteMenu.CHARGING_GUN_UPDATE));
tChargingGunVO.setAuthViewRates(roleType == 1 ? true : partnerService.authMenu(objectId, siteId, SiteMenu.CHARGING_GUN_VIEW_RATES));
+ if(null == tChargingGunVO.getAccountingStrategyId()){
+ List<Site> data = siteClient.getSiteByIds(Arrays.asList(tChargingGunVO.getSiteId())).getData();
+ if(data.size() > 0){
+ Site site = data.get(0);
+ tChargingGunVO.setAccountingStrategyId(site.getAccountingStrategyId());
+ }
+ }
}
pageInfo.setRecords(list);
return pageInfo;
@@ -120,13 +136,15 @@
if(count > 0){
return AjaxResult.error("接口编码已存在");
}
- this.save(dto);
TChargingPile chargingPile = chargingPileService.getById(dto.getChargingPileId());
+ dto.setFullNumber(chargingPile.getCode() + dto.getCode());
+ this.save(dto);
//下发硬件充电二维码
String code_prefix = "https://mxcd.zhinenganguan.com?No=";
QrCodeDelivery qrCodeDelivery = new QrCodeDelivery();
qrCodeDelivery.setCharging_pile_code(chargingPile.getCode());
+ qrCodeDelivery.setCharging_gun_code(dto.getCode());
qrCodeDelivery.setCode_format(1);
qrCodeDelivery.setPrefix_length(code_prefix.length());
qrCodeDelivery.setCode_prefix(code_prefix);
@@ -156,13 +174,15 @@
if(null != one && !dto.getId().equals(one.getId())){
return AjaxResult.error("接口编码已存在");
}
- this.updateById(dto);
TChargingPile chargingPile = chargingPileService.getById(dto.getChargingPileId());
+ dto.setFullNumber(chargingPile.getCode() + dto.getCode());
+ this.updateById(dto);
//下发硬件充电二维码
String code_prefix = "https://mxcd.zhinenganguan.com?No=";
QrCodeDelivery qrCodeDelivery = new QrCodeDelivery();
qrCodeDelivery.setCharging_pile_code(chargingPile.getCode());
+ qrCodeDelivery.setCharging_gun_code(dto.getCode());
qrCodeDelivery.setCode_format(1);
qrCodeDelivery.setPrefix_length(code_prefix.length());
qrCodeDelivery.setCode_prefix(code_prefix);
--
Gitblit v1.7.1