From 7a0f52983724bd41ffaa3dc8e62e23a9f669a92f Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Tue, 6 Jun 2023 16:59:02 +0800
Subject: [PATCH] update

---
 .../pile/service/impl/PileBasicInfoServiceImpl.java    |  9 ++++++---
 .../java/com/jsowell/pile/vo/web/PileDetailVO.java     | 10 ++++++++++
 jsowell-ui/src/views/pile/basic/detail.vue             |  1 +
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java
index 842b96298..136806965 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java
@@ -17,6 +17,7 @@ import com.jsowell.common.util.SecurityUtils;
 import com.jsowell.common.util.StringUtils;
 import com.jsowell.pile.domain.PileBasicInfo;
 import com.jsowell.pile.domain.PileConnectorInfo;
+import com.jsowell.pile.domain.PileModelInfo;
 import com.jsowell.pile.domain.PileSimInfo;
 import com.jsowell.pile.dto.IndexQueryDTO;
 import com.jsowell.pile.dto.QueryPileDTO;
@@ -321,11 +322,13 @@ public class PileBasicInfoServiceImpl implements IPileBasicInfoService {
 		// 获取桩状态
 		Map<String, String> pileStatusMap = pileConnectorInfoService.getPileStatus(Lists.newArrayList(pileInfoVO.getPileSn()));
 		pileInfoVO.setStatus(pileStatusMap.get(pileInfoVO.getPileSn()));
-		// String url = "http://localhost:8080/uniapp/pile/pileDetail/";
 		String pileQrCodeUrl = getPileQrCodeUrl(pileInfoVO.getPileSn());
 		pileInfoVO.setQrCodeURL(pileQrCodeUrl);
-		// 额定功率 瓦改为千瓦(2023.2.8发现数据库中型号表已经存的单位是 kw，因此注释掉)
-		// pileInfoVO.setRatedPower(pileInfoVO.getRatedPower() / 1000);
+		// 设备型号
+		PileModelInfo pileModelInfo = pileModelInfoService.selectPileModelInfoById(Long.parseLong(pileInfoVO.getModelId()));
+		if (pileModelInfo != null) {
+			pileInfoVO.setModelName(pileModelInfo.getModelName());
+		}
 		return pileInfoVO;
 	}
 
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileDetailVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileDetailVO.java
index d827ac6d3..7e554ac71 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileDetailVO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileDetailVO.java
@@ -112,4 +112,14 @@ public class PileDetailVO {
 	 * 个人桩密钥
 	 */
 	private String secretKey;
+
+	/**
+	 * 型号id
+	 */
+	private String modelId;
+
+	/**
+	 * 型号名称
+	 */
+	private String modelName;
 }
diff --git a/jsowell-ui/src/views/pile/basic/detail.vue b/jsowell-ui/src/views/pile/basic/detail.vue
index cb8198013..83222bd20 100644
--- a/jsowell-ui/src/views/pile/basic/detail.vue
+++ b/jsowell-ui/src/views/pile/basic/detail.vue
@@ -49,6 +49,7 @@
                     <!--                    <el-descriptions-item label="使用车辆类型">{{
                       pileDetail.matchCars
                     }}</el-descriptions-item>-->
+                    <el-descriptions-item label="设备型号">{{pileDetail.modelName}}</el-descriptions-item>
                     <el-descriptions-item label="额定功率(kW)">{{
                       pileDetail.ratedPower
                     }}</el-descriptions-item>