From d58a8c8c7fd48042f2b4f5a2e28530d27ff293f0 Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Tue, 14 Nov 2023 14:39:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E7=AE=A1=E7=AB=99=E7=82=B9=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PileStationInfoServiceImpl.java       |  7 ++++++-
 .../com/jsowell/pile/vo/web/PileStationVO.java | 10 ++++++++++
 .../lianlian/domain/StationInfo.java           |  4 ++--
 .../service/impl/LianLianServiceImpl.java      |  8 ++++++++
 .../views/pile/station/components/SiteInfo.vue | 18 ++++++++++++++++++
 5 files changed, 44 insertions(+), 3 deletions(-)

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 c7716e040..fb828c03f 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
@@ -155,7 +155,12 @@ public class PileStationInfoServiceImpl implements IPileStationInfoService {
 			if (StringUtils.isNotBlank(pileStationInfo.getParkFeeDescribe())) {
 				vo.setParkFeeDescribe(pileStationInfo.getParkFeeDescribe());
 			}
-
+			if (StringUtils.isNotBlank(pileStationInfo.getAccountNumber())) {
+				vo.setAccountNumber(pileStationInfo.getAccountNumber());
+			}
+			if (StringUtils.isNotBlank(String.valueOf(pileStationInfo.getCapacity()))) {
+				vo.setCapacity(pileStationInfo.getCapacity());
+			}
 			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 e4466e147..6c9c39afd 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
@@ -211,4 +211,14 @@ public class PileStationVO {
      */
     private BigDecimal occupyFee;
 
+    /**
+     * 电费户号
+     */
+    private String accountNumber;
+
+    /**
+     * 容量
+     */
+    private BigDecimal capacity;
+
 }
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 46ae0e8f0..fdb1ea9ac 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
@@ -57,13 +57,13 @@ public class StationInfo {
      * 户号  N
      * 国网电费账单户号
      */
-    // private String AccountNumber;
+    private String AccountNumber;
 
     /**
      * 容量(单位KW)  N
      * 独立电表申请的功率
      */
-    // private BigDecimal Capacity;
+    private BigDecimal Capacity;
 
     /**
      * 是否是公共停车场库 (0-否;1-是)  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 fa5b099d5..bcec26508 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
@@ -202,6 +202,14 @@ public class LianLianServiceImpl implements LianLianService {
             info.setIsPublicParkingLot(1);
             info.setParkingLotNumber(pileStationInfo.getParkingNumber());
         }
+        // 户号
+        if (StringUtils.isNotBlank(pileStationInfo.getAccountNumber())) {
+            info.setAccountNumber(pileStationInfo.getAccountNumber());
+        }
+        // 容量
+        if (StringUtils.isNotBlank(String.valueOf(pileStationInfo.getCapacity()))) {
+            info.setCapacity(pileStationInfo.getCapacity().setScale(4, BigDecimal.ROUND_HALF_UP));
+        }
         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 41afc5ff4..ddf1a7ab4 100644
--- a/jsowell-ui/src/views/pile/station/components/SiteInfo.vue
+++ b/jsowell-ui/src/views/pile/station/components/SiteInfo.vue
@@ -224,6 +224,22 @@
                   ></el-input>
                 </el-form-item>
               </el-col>
+                <el-col :span="6">
+                    <el-form-item prop="accountNumber" label="国网电费账单户号" label-width="130px">
+                        <el-input
+                            v-model="station.accountNumber"
+                            required="true"
+                        ></el-input>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                    <el-form-item prop="capacity" label="容量">
+                        <el-input
+                            v-model="station.capacity"
+                            required="true"
+                        ></el-input>
+                    </el-form-item>
+                </el-col>
             </el-row>
         </el-form>
         <el-button
@@ -263,6 +279,8 @@ export default {
                 matchCars: "",
                 parkingNumber: "",
                 parkFeeDescribe: "",
+                accountNumber: "",
+                capacity: "",
                 selectMatchCars: [],
                 publicFlag: "",
                 openFlag: "",