From 727bd67e564a447ced5d42e11e87315bd6ee5db4 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 25 十月 2024 09:45:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingGunServiceImpl.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 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 5fda203..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
@@ -136,8 +136,9 @@
         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=";
@@ -173,8 +174,9 @@
         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=";

--
Gitblit v1.7.1