From 74f2558e82713c10f468f325060672b634d5732e Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Tue, 4 Aug 2020 10:29:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E8=AF=A6=E6=83=85=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=8D=95=E4=BD=8D=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/result/PointDetailResultDTO.java | 1 +
 .../main/java/com/epmet/service/impl/PointRuleServiceImpl.java   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointDetailResultDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointDetailResultDTO.java
index cf8dfa8f67..687a8def4a 100644
--- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointDetailResultDTO.java
+++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointDetailResultDTO.java
@@ -18,6 +18,7 @@ public class PointDetailResultDTO implements Serializable {
 	private String ruleDesc;
 	private Integer point;
 	private String pointUnit;
+	private String pointUnitDesc;
 	private Integer upLimit;
 	private Boolean enabledFlag;
 	private String upLimitDesc;
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java
index c46ec497b7..9e5d5dea95 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java
@@ -131,6 +131,7 @@ public class PointRuleServiceImpl extends BaseServiceImpl<PointRuleDao, PointRul
 		PointDetailResultDTO resultDTO = ConvertUtils.sourceToTarget(pointRuleEntity, PointDetailResultDTO.class);
 		resultDTO.setRuleId(pointRuleEntity.getId());
 		resultDTO.setEnabledFlag(NumConstant.ONE_STR.equals(pointRuleEntity.getEnabledFlag()) ? true : false);
+		resultDTO.setPointUnitDesc(PointUnitEnum.getEnum(pointRuleEntity.getPointUnit()).getDesc());
 		return resultDTO;
 	}