From 89943f65866c56b0d2cea73ff0fbf689d828ee86 Mon Sep 17 00:00:00 2001
From: Jason <jason.niu@estsh.com>
Date: Wed, 20 Nov 2019 11:03:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B5=84=E6=BA=90=E8=A1=A8?=
 =?UTF-8?q?=E5=A4=9A=E9=80=89=E6=9E=9A=E4=B8=BE=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/aps/bean/Resource.java    |  7 +++---
 .../i3plus/pojo/aps/enums/EFFICIENCY_EFFECT.java   | 24 ---------------------
 .../i3plus/pojo/base/enumutil/ApsEnumUtil.java     | 25 ++++++++++++++++++++++
 3 files changed, 28 insertions(+), 28 deletions(-)
 delete mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/EFFICIENCY_EFFECT.java

diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java
index f5d5503..5ae21a4 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java
@@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.aps.bean;
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseCode;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
-import cn.estsh.i3plus.pojo.aps.enums.*;
 import cn.estsh.i3plus.pojo.aps.holders.EResource;
 import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
 import com.fasterxml.jackson.annotation.JsonBackReference;
@@ -84,17 +83,17 @@ public class Resource extends BaseCode {
 
     @Column(name="EFFICIENCY_EFFECT")
     @ApiParam(value ="效率影响类型")
-    @FieldAnnotation(multiEnumClass = EFFICIENCY_EFFECT.class)
+    @FieldAnnotation(multiEnumClass = ApsEnumUtil.EFFICIENCY_EFFECT.class)
     private Integer EfficiencyEffect;
 
     @Column(name="TIME_ROUND")
     @ApiParam(value ="时间圆整影响")
-    @FieldAnnotation(multiEnumClass = EFFICIENCY_EFFECT.class)
+    @FieldAnnotation(multiEnumClass = ApsEnumUtil.EFFICIENCY_EFFECT.class)
     private Integer timeRound;
 
     @Column(name="TIME_TAIL_ROUND")
     @ApiParam(value ="时间尾数影响")
-    @FieldAnnotation(multiEnumClass = EFFICIENCY_EFFECT.class)
+    @FieldAnnotation(multiEnumClass = ApsEnumUtil.EFFICIENCY_EFFECT.class)
     private Integer timeTailRound;
 
     @Column(name="LOCK_TYPE")
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/EFFICIENCY_EFFECT.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/EFFICIENCY_EFFECT.java
deleted file mode 100644
index f1da6b4..0000000
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/EFFICIENCY_EFFECT.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package cn.estsh.i3plus.pojo.aps.enums;
-
-/**
- * @Description :资源效率影响的计划类型
- * @Reference :
- * @Author : jason.niu
- * @CreateDate : 2019-10-17
- * @Modify:
- **/
-public enum EFFICIENCY_EFFECT {
-    PREV_SET(1),    // 前设置
-    PRODUCE(2),     // 生产
-    POST_SET(4);    // 后设置
-
-    private int _value;
-
-    EFFICIENCY_EFFECT(int value){
-        _value = value;
-    }
-
-    public int value() {
-        return this._value;
-    }
-}
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java
index b84ac79..e2c94c3 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java
@@ -324,6 +324,31 @@ public class ApsEnumUtil {
     }
 
     /**
+     * 资源效率影响类型
+     */
+    public enum EFFICIENCY_EFFECT {
+        PREV_SET(1, "前设置"),    // 前设置
+        PRODUCE(2, "生产"),     // 生产
+        POST_SET(4, "后设置");    // 后设置
+
+        private int value;
+        private String description;
+
+        EFFICIENCY_EFFECT(int value, String description){
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
      * 预置的资源选择规则
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)