From d4c18164aecb83d03a2bc382c4b5f969dc2b5f2f Mon Sep 17 00:00:00 2001
From: wen <1455474577@qq.com>
Date: Tue, 28 Sep 2021 17:45:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=85=85=E7=94=B5=E6=A1=A9?=
 =?UTF-8?q?=E7=9A=84equipment=E5=AD=97=E6=AE=B5=E7=9A=84=E5=A2=9E=E3=80=81?=
 =?UTF-8?q?=E6=9F=A5=E3=80=81=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/XhpcChargingPileServiceImpl.java      |  4 ++--
 .../resources/mapper/XhpcChargingPileMapper.xml   | 14 +++++++++++---
 .../com/xhpc/common/domain/XhpcChargingPile.java  | 15 +++++++++++++++
 3 files changed, 28 insertions(+), 5 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 2df489ae..e8c14609 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
@@ -101,7 +101,7 @@ public class XhpcChargingPileServiceImpl implements IXhpcChargingPileService {
 //        HashSet<String> noSet = new HashSet<>();
 //        noSet.add(serialNumber);
 //        powerPileService.addPileWhitelist(chargingStationId, noSet);
-        return AjaxResult.success();
+        return AjaxResult.success(null);
     }
 
     private void addXhpcTerminal(String name, Long chargingStationId, Long rateModelId, String serialNumber, Long chargingPileId, int i, int number) {
@@ -163,7 +163,7 @@ public class XhpcChargingPileServiceImpl implements IXhpcChargingPileService {
             powerPileService.addPileWhitelist(chargingStationId, noSet);
         }
         xhpcChargingPileMapper.updaeXhpcChargingPile(xhpcChargingPile);
-        return AjaxResult.success();
+        return AjaxResult.success(null);
     }
 
     @Override
diff --git a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingPileMapper.xml b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingPileMapper.xml
index 02b65782..220cd49f 100644
--- a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingPileMapper.xml
+++ b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingPileMapper.xml
@@ -67,7 +67,8 @@
                production_date productionDate,
                manufacture_name manufactureName,
                connector_type connectorType,
-               current
+               current,
+               equipment_type equipmentType
         from xhpc_charging_pile
     </sql>
     <select id="selectXhpcChargingPileList" resultType="java.util.Map">
@@ -195,7 +196,10 @@
                 connector_type,
             </if>
             <if test="null != current ">
-                current
+                current,
+            </if>
+            <if test="null != equipmentType ">
+                equipment_type
             </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -290,7 +294,10 @@
                 #{connectorType},
             </if>
             <if test="null != current ">
-                #{current}
+                #{current},
+            </if>
+            <if test="null != equipmentType ">
+                #{equipmentType}
             </if>
         </trim>
     </insert>
@@ -344,6 +351,7 @@
             <if test="manufactureName != null">manufacture_name = #{manufactureName},</if>
             <if test="connectorType != null">connector_type = #{connectorType},</if>
             <if test="current != null">current = #{current},</if>
+            <if test="equipmentType!=null">equipment_type = #{equipmentType}</if>
         </trim>
         where charging_pile_id = #{chargingPileId}
     </update>
diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcChargingPile.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcChargingPile.java
index ccc7c887..d9a21842 100644
--- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcChargingPile.java
+++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcChargingPile.java
@@ -77,6 +77,21 @@ public class XhpcChargingPile extends BaseEntity {
      */
     private Integer current;
 
+    /**
+     * 设备类型
+     */
+    private Integer equipmentType;
+
+    public Integer getEquipmentType() {
+
+        return equipmentType;
+    }
+
+    public void setEquipmentType(Integer equipmentType) {
+
+        this.equipmentType = equipmentType;
+    }
+
     public String getManufactureName() {
 
         return manufactureName;