From 8e93590b735377c2529619212fbb3aae600d2b2a Mon Sep 17 00:00:00 2001
From: yuyang <2265829957@qq.com>
Date: Wed, 4 Aug 2021 17:12:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=BA=E7=AB=99=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/XhpcChargingPileServiceImpl.java  |  4 ++--
 .../XhpcChargingStationServiceImpl.java       | 13 ++++------
 .../mapper/XhpcChargingStationMapper.xml      | 24 ++++++++++++++-----
 3 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingPileServiceImpl.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingPileServiceImpl.java
index e668066b..06eab553 100644
--- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingPileServiceImpl.java
+++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingPileServiceImpl.java
@@ -59,8 +59,8 @@ public class XhpcChargingPileServiceImpl implements IXhpcChargingPileService{
                 XhpcTerminal xhpcTerminal =new XhpcTerminal();
                 xhpcTerminal.setChargingStationId(chargingStationId);
                 xhpcTerminal.setChargingPileId(chargingPileId);
-                xhpcTerminal.setName(serialNumber + "-" + (i + 1));
-                xhpcTerminal.setPileSerialNumber(serialNumber);
+                xhpcTerminal.setName(serialNumber + "-" + (i));
+                xhpcTerminal.setPileSerialNumber(serialNumber+ "0" + i);
                 xhpcTerminal.setWorkStatus(2);
                 xhpcTerminal.setStatus(0);
                 xhpcTerminalMapper.addXhpcTerminal(xhpcTerminal);
diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java
index 68fd7948..dcad0f5a 100644
--- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java
+++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java
@@ -1,10 +1,13 @@
 package com.xhpc.charging.station.service;
 
-import cn.hutool.core.date.BetweenFormatter;
+
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
+import com.xhpc.charging.station.mapper.XhpcChargingStationMapper;
 import com.xhpc.common.api.PowerPileService;
-import com.xhpc.common.api.dto.ChargingPileDto;
+import com.xhpc.common.api.dto.XhpcChargingStationDto;
+import com.xhpc.common.api.dto.XhpcRateDto;
+import com.xhpc.common.api.dto.XhpcRateTimeDto;
 import com.xhpc.common.core.domain.R;
 import com.xhpc.common.core.utils.DateUtils;
 import com.xhpc.common.core.web.domain.AjaxResult;
@@ -13,14 +16,8 @@ import com.xhpc.common.domain.XhpcChargingStation;
 import com.xhpc.common.domain.XhpcRate;
 import com.xhpc.common.domain.XhpcRateModel;
 import com.xhpc.common.domain.XhpcRateTime;
-import com.xhpc.common.api.dto.XhpcChargingStationDto;
-import com.xhpc.common.api.dto.XhpcRateDto;
-import com.xhpc.common.api.dto.XhpcRateTimeDto;
-import com.xhpc.charging.station.mapper.XhpcChargingStationMapper;
-import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.annotation.Version;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingStationMapper.xml b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingStationMapper.xml
index 0ebb4bd9..e5944e3a 100644
--- a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingStationMapper.xml
+++ b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingStationMapper.xml
@@ -543,7 +543,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 update_by,
             </if>
             <if test="null != remark and '' != remark">
-                remark
+                remark,
+            </if>
+            <if test="null != rateValue">
+                rate_value
             </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -578,7 +581,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{updateBy},
             </if>
             <if test="null != remark and '' != remark">
-                #{remark}
+                #{remark},
+            </if>
+            <if test="null != rateValue">
+                #{rateValue}
             </if>
         </trim>
     </insert>
@@ -625,10 +631,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 update_by,
             </if>
             <if test="null != remark and '' != remark">
-                remark
+                remark,
             </if>
             <if test="null != type ">
-                type
+                type,
+            </if>
+            <if test="null != rateValue ">
+                rate_value
             </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -669,10 +678,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{updateBy},
             </if>
             <if test="null != remark and '' != remark">
-                #{remark}
+                #{remark},
             </if>
             <if test="null != type ">
-                #{type}
+                #{type},
+            </if>
+            <if test="null != rateValue ">
+                #{rateValue}
             </if>
         </trim>
     </insert>