From 09febbcb948049961072b54f6a82032e23031dff Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Tue, 4 Aug 2020 13:59:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=A7=84=E5=88=99=E4=B8=8A?=
 =?UTF-8?q?=E9=99=90=E7=9A=84=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/UserPointActionLogServiceImpl.java   |  2 +-
 .../java/com/epmet/utils/RuleCycleEnum.java   | 41 +++++++++++++++++++
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/utils/RuleCycleEnum.java

diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java
index 600e6aba28..094f7c8a51 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java
@@ -325,7 +325,7 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl<UserPointActi
         action.setPoint(grantPoint.getPoint());
         action.setEventStatement(grantPoint.getRemark());
         action.setEventName(EventEnum.ACTIVE_SEND_POINT.getEventDesc());
-        action.setEventId(EventEnum.ACTIVE_INSERT_LIVE.getEventTag());
+        action.setEventId("COMMON");
         action.setActionFlag(grantPoint.getActionFlag());
         action.setUserId(grantPoint.getUserId());
         action.setCreatedBy(grantPoint.getOperatorId());
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/utils/RuleCycleEnum.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/utils/RuleCycleEnum.java
new file mode 100644
index 0000000000..92548b7fc8
--- /dev/null
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/utils/RuleCycleEnum.java
@@ -0,0 +1,41 @@
+package com.epmet.utils;
+
+
+/**
+ * 系统支持的规则周期枚举类
+ *
+ * @author wangc
+ * @date 2020-07-03 11:14
+ **/
+public enum RuleCycleEnum {
+
+    UNLIMITED("unlimit","不限制"),
+    FIRST("first","首次"),
+    DAILY("day","每日"),
+    WEEKLY("week","每周"),
+    MONTHLY("month","每月"),
+    YEARLY("year","每年")
+    ;
+
+    private String key;
+    private String desc;
+
+    RuleCycleEnum(String key,String desc){
+        this.key = key;
+        this.desc = desc;
+    }
+
+    public static RuleCycleEnum getEnum(String key){
+        RuleCycleEnum[] values = RuleCycleEnum.values();
+        for (RuleCycleEnum value : values) {
+            if (null != key && value.getKey().equals(key)) {
+                return value;
+            }
+        }
+        return null;
+    }
+
+    public String getKey(){ return key;}
+
+    public String getValue(){ return desc;}
+}