From 24a7981f5b0f74b96b9df663e8a1b3365c85b6d8 Mon Sep 17 00:00:00 2001
From: wen <1455474577@qq.com>
Date: Mon, 27 Sep 2021 15:15:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BA=86=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=A1=A9=E5=AD=97=E6=AE=B5=E5=88=B0=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?UTF-8?q?=EF=BC=8C=20=E5=AE=8C=E6=88=90=E4=BA=86=E4=BB=8E=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93=E4=B8=AD=E6=9F=A5=E8=AF=A2=E6=A1=A9=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/XhpcChargingPileMapper.xml         | 42 +++++++++++--
 .../xhpc/common/domain/XhpcChargingPile.java  | 59 ++++++++++++++++++
 .../common/domain/XhpcChargingStation.java    | 60 -------------------
 3 files changed, 96 insertions(+), 65 deletions(-)

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 1e795ec9..61efb2dc 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
@@ -63,7 +63,11 @@
                update_by,
                remark,
                rate_model_id,
-               brand_model
+               brand_model,
+               production_date productionDate,
+               manufacture_name manufactureName,
+               connector_type connectorType,
+               current
         from xhpc_charging_pile
     </sql>
     <select id="selectXhpcChargingPileList" resultType="java.util.Map">
@@ -179,7 +183,19 @@
                 remark,
             </if>
             <if test="null != brandModel ">
-                brand_model
+                brand_model,
+            </if>
+            <if test="null != productionDate ">
+                production_date,
+            </if>
+            <if test="null != manufactureName ">
+                manufacture_name,
+            </if>
+            <if test="null != connectorType ">
+                connector_type,
+            </if>
+            <if test="null != current ">
+                current
             </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -262,7 +278,19 @@
                 #{remark},
             </if>
             <if test="null != brandModel ">
-                #{brandModel}
+                #{brandModel},
+            </if>
+            <if test="null != productionDate ">
+                #{productionDate},
+            </if>
+            <if test="null != manufactureName ">
+                #{manufactureName},
+            </if>
+            <if test="null != connectorType ">
+                #{connectorType},
+            </if>
+            <if test="null != current ">
+                #{current}
             </if>
         </trim>
     </insert>
@@ -310,8 +338,12 @@
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="remark != null">remark = #{remark}</if>
-            <if test="brandModel != null">brand_model = #{brandModel}</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="brandModel != null">brand_model = #{brandModel},</if>
+            <if test="productionDate != null">production_date = #{productionDate},</if>
+            <if test="manufactureName != null">manufacture_name = #{manufactureName},</if>
+            <if test="connectorType != null">connector_type = #{connectorType},</if>
+            <if test="current != null">current = #{current},</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 b6ee2c11..ccc7c887 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
@@ -57,6 +57,65 @@ public class XhpcChargingPile extends BaseEntity {
     private Integer delFlag;
     /** 计费模型id */
     private Long rateModelId;
+    /**
+     * 设备生产日期（格式YYYY-MM-DD）
+     */
+    private String productionDate;
+
+    /**
+     * 设备生产商名称
+     */
+    private String manufactureName;
+
+    /**
+     * 充电设备接口类型
+     */
+    private Integer connectorType;
+
+    /**
+     * 额定电流（单位A）
+     */
+    private Integer current;
+
+    public String getManufactureName() {
+
+        return manufactureName;
+    }
+
+    public void setManufactureName(String manufactureName) {
+
+        this.manufactureName = manufactureName;
+    }
+
+    public String getProductionDate() {
+
+        return productionDate;
+    }
+
+    public void setProductionDate(String productionDate) {
+
+        this.productionDate = productionDate;
+    }
+
+    public Integer getConnectorType() {
+
+        return connectorType;
+    }
+
+    public void setConnectorType(Integer connectorType) {
+
+        this.connectorType = connectorType;
+    }
+
+    public Integer getCurrent() {
+
+        return current;
+    }
+
+    public void setCurrent(Integer current) {
+
+        this.current = current;
+    }
 
     public Long getChargingPileId() {
 
diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcChargingStation.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcChargingStation.java
index d8eefa3e..6df37a5e 100644
--- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcChargingStation.java
+++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcChargingStation.java
@@ -105,66 +105,6 @@ public class XhpcChargingStation extends BaseEntity {
      */
     private String operatorIdEvcs;
 
-    /**
-     * 设备生产日期（格式YYYY-MM-DD）
-     */
-    private String productionDate;
-
-    /**
-     * 设备生产商名称
-     */
-    private String manufactrureName;
-
-    /**
-     * 充电设备接口类型
-     */
-    private Integer connectorType;
-
-    /**
-     * 额定电流（单位A）
-     */
-    private Integer current;
-
-    public String getProductionDate() {
-
-        return productionDate;
-    }
-
-    public void setProductionDate(String productionDate) {
-
-        this.productionDate = productionDate;
-    }
-
-    public String getManufactrureName() {
-
-        return manufactrureName;
-    }
-
-    public void setManufactrureName(String manufactrureName) {
-
-        this.manufactrureName = manufactrureName;
-    }
-
-    public Integer getConnectorType() {
-
-        return connectorType;
-    }
-
-    public void setConnectorType(Integer connectorType) {
-
-        this.connectorType = connectorType;
-    }
-
-    public Integer getCurrent() {
-
-        return current;
-    }
-
-    public void setCurrent(Integer current) {
-
-        this.current = current;
-    }
-
     public String getOperatorIdEvcs() {
 
         return operatorIdEvcs;