From 45d1fd04ff2283352225c2756edcfe99573828e1 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Thu, 30 May 2024 14:36:02 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E9=A2=84=E7=BA=A6=E5=85=85=E7=94=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jsowell/common/enums/ykc/PileStatusEnum.java | 2 +- .../jsowell/pile/service/impl/PileBasicInfoServiceImpl.java | 1 + .../java/com/jsowell/pile/vo/uniapp/PersonalPileInfoVO.java | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/PileStatusEnum.java b/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/PileStatusEnum.java index b70bab00e..a7264d0cf 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/PileStatusEnum.java +++ b/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/PileStatusEnum.java @@ -34,7 +34,7 @@ public enum PileStatusEnum { this.label = label; } - public static String getStatusDescription(String status) { + public static String getStatusDesc(String status) { for (PileStatusEnum pileStatusEnum : PileStatusEnum.values()) { if (pileStatusEnum.getValue().equals(status)) { return pileStatusEnum.getLabel(); 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 030b66f73..6a3b570b5 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 @@ -815,6 +815,7 @@ public class PileBasicInfoServiceImpl implements PileBasicInfoService { // 获取桩状态 Map pileStatus = pileConnectorInfoService.getPileStatus(Lists.newArrayList(pileSn)); personalPileInfoVO.setPileStatus(pileStatus.get(pileSn)); + personalPileInfoVO.setPileStatusDesc(PileStatusEnum.getStatusDesc(pileStatus.get(pileSn))); if (StringUtils.equals("1", personalPileInfoVO.getType())) { personalPileInfoVO.setType("管理员用户"); }else { diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/PersonalPileInfoVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/PersonalPileInfoVO.java index 806ffd747..fa49589a1 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/PersonalPileInfoVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/PersonalPileInfoVO.java @@ -30,6 +30,11 @@ public class PersonalPileInfoVO { */ private String pileStatus; + /** + * 桩状态描述 + */ + private String pileStatusDesc; + /** * 型号 */