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,
- remark
+ remark,
+
+
+ rate_value
@@ -578,7 +581,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{updateBy},
- #{remark}
+ #{remark},
+
+
+ #{rateValue}
@@ -625,10 +631,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update_by,
- remark
+ remark,
- type
+ type,
+
+
+ rate_value
@@ -669,10 +678,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{updateBy},
- #{remark}
+ #{remark},
- #{type}
+ #{type},
+
+
+ #{rateValue}