From 0b15319e4a0043629a97298914be101bc47796ce Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Wed, 9 Aug 2023 09:29:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=94=E8=81=94=E5=B9=B3=E5=8F=B0=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=81=9C=E8=BD=A6=E5=9C=BA=E5=BA=93=E7=BC=96=E5=8F=B7?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pile/service/impl/PileStationInfoServiceImpl.java       | 3 +++
 .../main/java/com/jsowell/pile/vo/web/PileStationVO.java    | 5 +++++
 .../com/jsowell/thirdparty/lianlian/domain/StationInfo.java | 3 ++-
 .../lianlian/service/impl/LianLianServiceImpl.java          | 3 +++
 jsowell-ui/src/views/pile/station/components/SiteInfo.vue   | 6 ++++++
 5 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java
index 7ad31182f..f73d4140b 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java
@@ -120,6 +120,9 @@ public class PileStationInfoServiceImpl implements IPileStationInfoService {
 			if (StringUtils.isNotBlank(pileStationInfo.getQrcodePrefix())) {
 				vo.setQrcodePrefix(pileStationInfo.getQrcodePrefix());
 			}
+			if (StringUtils.isNotBlank(pileStationInfo.getParkingNumber())) {
+				vo.setParkingNumber(pileStationInfo.getParkingNumber());
+			}
 			vo.setMerchantAdminName(pileStationInfo.getStationAdminName());
 			vo.setStationStatus(Integer.parseInt(pileStationInfo.getStationStatus()));
 			vo.setStationType(pileStationInfo.getStationType());
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileStationVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileStationVO.java
index 06c2b9693..da6670743 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileStationVO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileStationVO.java
@@ -112,6 +112,11 @@ public class PileStationVO {
      */
     private String stationLat;
 
+    /**
+     * 停车场库编号
+     */
+    private String parkingNumber;
+
     /**
      * 建设场所
      */
diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/StationInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/StationInfo.java
index fccfc4665..46ae0e8f0 100644
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/StationInfo.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/StationInfo.java
@@ -76,7 +76,8 @@ public class StationInfo {
      * 停车场库编号  N
      * 公共停车场库编号
      */
-    // private String ParkingLotNumber;
+    @JSONField(name = "ParkingLotNumber")
+    private String parkingLotNumber;
 
     /**
      * 充电站国家代码  Y
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 b5899ff8b..f7b42c2e4 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
@@ -184,6 +184,9 @@ public class LianLianServiceImpl implements LianLianService {
                 .build();
         String payment = StationPaymentEnum.getPaymentByCode(pileStationInfo.getPayment());
         info.setPayment(payment);
+        if (StringUtils.isNotBlank(pileStationInfo.getParkingNumber())) {
+            info.setParkingLotNumber(pileStationInfo.getParkingNumber());
+        }
         List<EquipmentInfo> pileList = getPileList(pileStationInfo);
         if (CollectionUtils.isNotEmpty(pileList)) {
             info.setEquipmentInfos(pileList); // 充电设备信息列表
diff --git a/jsowell-ui/src/views/pile/station/components/SiteInfo.vue b/jsowell-ui/src/views/pile/station/components/SiteInfo.vue
index 532e162a4..529fb46ea 100644
--- a/jsowell-ui/src/views/pile/station/components/SiteInfo.vue
+++ b/jsowell-ui/src/views/pile/station/components/SiteInfo.vue
@@ -115,6 +115,11 @@
                         ></el-input>
                     </el-form-item>
                 </el-col>
+                <el-col :span="6">
+                    <el-form-item prop="parkingNumber" label="停车场库编号">
+                        <el-input v-model="station.parkingNumber" required="true"></el-input>
+                    </el-form-item>
+                </el-col>
             </el-row>
 
             <el-row :gutter="24">
@@ -245,6 +250,7 @@ export default {
                 address: "",
                 stationTel: "",
                 matchCars: "",
+                parkingNumber: "",
                 selectMatchCars: [],
                 publicFlag: "",
                 openFlag: "",