From 8ef73a8875b9b618e471aafc383f85ba6ab7a154 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 11 十二月 2024 19:17:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingGunServiceImpl.java | 42 +++++++++++++++++++++++++++++++++++-------
1 files changed, 35 insertions(+), 7 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 6e39044..db69720 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
@@ -6,17 +6,13 @@
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;
import com.ruoyi.chargingPile.api.vo.*;
-import com.ruoyi.chargingPile.domain.SiteMenu;
+import com.ruoyi.chargingPile.api.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;
@@ -136,13 +132,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);
@@ -172,13 +170,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);
@@ -302,8 +302,36 @@
StatusModeStatisticsVO statusModeStatistics1 = this.baseMapper.getStatusModeStatistics(siteIds,1);
StatusModeStatisticsVO statusModeStatistics2 = this.baseMapper.getStatusModeStatistics(siteIds,2);
StatusModeStatisticsVO statusModeStatistics3 = this.baseMapper.getStatusModeStatistics(siteIds,3);
+ if (statusModeStatistics1==null){
+ StatusModeStatisticsVO vo = new StatusModeStatisticsVO();
+ vo.setChargeMode(1);
+ vo.setFreeCount(0);
+ vo.setFilledCount(0);
+ vo.setInsertCount(0);
+ vo.setChargingCount(0);
+ statusModeStatistics1 =vo;
+ }
statusModeStatisticsVOS.add(statusModeStatistics1);
+ if (statusModeStatistics2==null){
+ StatusModeStatisticsVO vo = new StatusModeStatisticsVO();
+ vo.setChargeMode(2);
+ vo.setFreeCount(0);
+ vo.setFilledCount(0);
+ vo.setInsertCount(0);
+ vo.setChargingCount(0);
+ statusModeStatistics2 =vo;
+ }
statusModeStatisticsVOS.add(statusModeStatistics2);
+
+ if (statusModeStatistics3==null){
+ StatusModeStatisticsVO vo = new StatusModeStatisticsVO();
+ vo.setChargeMode(3);
+ vo.setFreeCount(0);
+ vo.setFilledCount(0);
+ vo.setInsertCount(0);
+ vo.setChargingCount(0);
+ statusModeStatistics3 =vo;
+ }
statusModeStatisticsVOS.add(statusModeStatistics3);
gunStatusStatisticsVO.setStatusModeStatistics(statusModeStatisticsVOS);
return gunStatusStatisticsVO;
--
Gitblit v1.7.1