From 4da4a76899f62782867a136066e328b7e3ae146b Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Wed, 9 Aug 2023 10:28:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9E=AA=E5=8F=A3=E4=BF=A1=E6=81=AF=E8=A1=A8?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=20=E8=BD=A6=E4=BD=8D=E5=8F=B7=20=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsowell/pile/domain/PileConnectorInfo.java | 14 ++++++++++++++
 .../mapper/pile/PileConnectorInfoMapper.xml        |  9 +++++++--
 .../lianlian/service/impl/LianLianServiceImpl.java |  1 +
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileConnectorInfo.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileConnectorInfo.java
index 33bcf4ec3..c4fcf29e1 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileConnectorInfo.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileConnectorInfo.java
@@ -43,6 +43,11 @@ public class PileConnectorInfo extends BaseEntity {
 	@Excel(name = "状态")
 	private String status;
 
+	/**
+	 * 车位号
+	 */
+	private String parkNo;
+
 	/**
 	 * 所属充电桩id
 	 */
@@ -86,6 +91,14 @@ public class PileConnectorInfo extends BaseEntity {
 		return status;
 	}
 
+	public String getParkNo() {
+		return parkNo;
+	}
+
+	public void setParkNo(String parkNo) {
+		this.parkNo = parkNo;
+	}
+
 	public void setPileSn(String pileSn) {
 		this.pileSn = pileSn;
 	}
@@ -109,6 +122,7 @@ public class PileConnectorInfo extends BaseEntity {
 				.append("name", getName())
 				.append("pileConnectorCode", getPileConnectorCode())
 				.append("status", getStatus())
+				.append("parkNo", getParkNo())
 				.append("pileId", getPileSn())
 				.append("createBy", getCreateBy())
 				.append("createTime", getCreateTime())
diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileConnectorInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileConnectorInfoMapper.xml
index 5e8fecae6..dab811679 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/PileConnectorInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/PileConnectorInfoMapper.xml
@@ -9,6 +9,7 @@
         <result property="name"    column="name"    />
         <result property="pileConnectorCode"    column="pile_connector_code"    />
         <result property="status"    column="status"    />
+        <result property="parkNo"    column="park_no"    />
         <result property="pileSn" column="pile_sn"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -18,7 +19,7 @@
     </resultMap>
 
     <sql id="selectPileConnectorInfoVo">
-        select id, name, pile_connector_code, status, pile_sn, create_by, create_time, update_by, update_time, del_flag from pile_connector_info
+        select id, name, pile_connector_code, status, park_no, pile_sn, create_by, create_time, update_by, update_time, del_flag from pile_connector_info
     </sql>
 
     <select id="selectPileConnectorInfoList" parameterType="com.jsowell.pile.domain.PileConnectorInfo"
@@ -51,6 +52,7 @@
             <if test="name != null">name,</if>
             <if test="pileConnectorCode != null">pile_connector_code,</if>
             <if test="status != null">status,</if>
+            <if test="parkNo != null">park_no,</if>
             <if test="pileSn != null">pile_sn,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -62,6 +64,7 @@
             <if test="name != null">#{name},</if>
             <if test="pileConnectorCode != null">#{pileConnectorCode},</if>
             <if test="status != null">#{status},</if>
+            <if test="parkNo != null">#{parkNo},</if>
             <if test="pileSn != null">#{pileSn},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -77,6 +80,7 @@
             <if test="name != null">name = #{name},</if>
             <if test="pileConnectorCode != null">pile_connector_code = #{pileConnectorCode},</if>
             <if test="status != null">status = #{status},</if>
+            <if test="parkNo != null">park_no = #{parkNo},</if>
             <if test="pileSn != null">pile_sn = #{pileSn},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
@@ -120,13 +124,14 @@
 
     <insert id="batchInsertConnectorInfo">
         insert into pile_connector_info
-            (name,pile_connector_code,status,pile_sn,create_by,update_by,del_flag)
+            (name,pile_connector_code,status,park_no,pile_sn,create_by,update_by,del_flag)
         values
             <foreach collection="connectorList" item="item" separator=",">
                 (
                 #{item.name,jdbcType=VARCHAR},
                 #{item.pileConnectorCode,jdbcType=VARCHAR},
                 #{item.status,jdbcType=VARCHAR},
+                #{item.parkNo,jdbcType=VARCHAR},
                 #{item.pileSn,jdbcType=VARCHAR},
                 #{item.createBy,jdbcType=VARCHAR},
                 #{item.updateBy,jdbcType=VARCHAR},
diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java
index f7b42c2e4..c3d80063c 100644
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java
@@ -185,6 +185,7 @@ public class LianLianServiceImpl implements LianLianService {
         String payment = StationPaymentEnum.getPaymentByCode(pileStationInfo.getPayment());
         info.setPayment(payment);
         if (StringUtils.isNotBlank(pileStationInfo.getParkingNumber())) {
+            info.setIsPublicParkingLot(1);
             info.setParkingLotNumber(pileStationInfo.getParkingNumber());
         }
         List<EquipmentInfo> pileList = getPileList(pileStationInfo);