会员标签4.0

src/main/java/com/gic/spark/entity/enumtype/AllOrExistType.java

-package com.gic.spark.entity.enumtype;
-
-/**
- * @author Luojs
- * @version 1.0
- * @Package com.gic.spark.filter.enumtype
- * @Description: (这里用一句话描述这个类的作用)
- * @date 九月 11 2018 ,17:39
- */
-public enum AllOrExistType {
-    /**
-     * 所有
-     */
-    ISALL("all"),
-    /**
-     * 存在
-     */
-    ISEXIST("exist");
-
-    private String value;
-    AllOrExistType(String value){
-        this.value = value;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-}

src/main/java/com/gic/spark/entity/enumtype/BelongType.java

-package com.gic.spark.entity.enumtype;
-
-/**
- * @author Luojs
- * @version 1.0
- * @Package com.gic.spark.filter.enumtype
- * @Description: (这里用一句话描述这个类的作用)
- * @date 九月 11 2018 ,17:40
- */
-public enum BelongType {
-    /**
-     * 属于
-     */
-    ISBELONG("belong"),
-    /**
-     * 不属于
-     */
-    NOTBELONG("notbelong");
-
-    private String value;
-    BelongType(String value){
-        this.value = value;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-}

src/main/java/com/gic/spark/entity/enumtype/CardType.java

-package com.gic.spark.entity.enumtype;
-
-/**
- * @author Luojs
- * @version 1.0
- * @Package com.gic.spark
- * @Description: (这里用一句话描述这个类的作用)
- * @date 八月 21 2018 ,9:49
- */
-public enum CardType {
-    /**
-     * 已使用卡券
-     */
-    USEDCARD,
-    /**
-     * 持有卡券
-     */
-    AVAILABLECARD,
-
-    //待领取
-    UNHOLD,
-
-    //已过期
-    EXPIRED;
-
-    private CardType(){}
-}

src/main/java/com/gic/spark/entity/enumtype/DayMonYearType.java

-package com.gic.spark.entity.enumtype;
-
-/**
- * @author Luojs
- * @version 1.0
- * @Package com.gic.spark.filter.enumtype
- * @Description: (这里用一句话描述这个类的作用)
- * @date 九月 11 2018 ,19:18
- */
-public enum DayMonYearType {
-    /**
-     * 天
-     */
-    DAY("day"),
-    /**
-     * 月
-     */
-    MONTH("month"),
-    /**
-     * 年
-     */
-    YEAR("year");
-
-    private String value;
-    DayMonYearType(String value){
-        this.value = value;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-}

src/main/java/com/gic/spark/entity/enumtype/DescOrAscType.java

-package com.gic.spark.entity.enumtype;
-
-/**
- * @author Luojs
- * @version 1.0
- * @Package com.gic.spark.filter.enumtype
- * @Description: (这里用一句话描述这个类的作用)
- * @date 九月 10 2018 ,15:49
- */
-public enum DescOrAscType {
-    /**
-     * 降序 最近
-     */
-    DESC("desc"),
-    /**
-     * 升序 首次
-     */
-    ASC("asc");
-
-    private String value;
-    DescOrAscType(String value){
-        this.value = value;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-}

src/main/java/com/gic/spark/entity/enumtype/DomainType.java

+package com.gic.spark.entity.enumtype;
+
+/**
+ * @description:
+ * @author: wangxk
+ * @date: 2020/4/24
+ */
+public enum  DomainType {
+
+    ACU_INFO("acuInfo"),
+
+    SCU_INFO("scuInfo"),
+
+    MCU_INFO("mcuInfo");
+    private String value;
+
+    DomainType(String value) {
+        this.value = value;
+    }
+}

src/main/java/com/gic/spark/entity/enumtype/FixHisRelaType.java

-package com.gic.spark.entity.enumtype;
-
-/**
- * @author Luojs
- * @version 1.0
- * @Package com.gic.spark.filter.enumtype
- * @Description: (固定,历史,最近)
- * @date 九月 11 2018 ,19:14
- */
-public enum FixHisRelaType {
-
-    FIRSTTIME("firsttime"),
-
-    LASTTIME("lasttime"),
-    /**
-     * 最近 几天
-     */
-    RECENTTIME("recenttime"),
-    /**
-     * 固定时段
-     */
-    FIXEDTIME("fixedtime"),
-    /**
-     * 历史累计,所有时间的所有数据
-     */
-    HISTORYTIME("historytime");
-
-    private String value;
-    FixHisRelaType(String value){
-        this.value = value;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-}

src/main/java/com/gic/spark/entity/enumtype/FixedOrRelativeType.java

-package com.gic.spark.entity.enumtype;
-
-/**
- * @author Luojs
- * @version 1.0
- * @Package com.gic.spark.filter.enumtype
- * @Description: (固定,相对)
- * @date 九月 11 2018 ,19:12
- */
-public enum FixedOrRelativeType {
-    /**
-     * 固定时段
-     */
-    FIXEDTIME("fixedtime"),
-    /**
-     * 相对时段
-     */
-    RELATIVETIME("relativetime"),;
-
-    private String value;
-    FixedOrRelativeType(String value){
-        this.value = value;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-}

src/main/java/com/gic/spark/entity/enumtype/MarketingType.java

-package com.gic.spark.entity.enumtype;
-
-/**
- * @author Luojs
- * @version 1.0
- * @Package com.gic.spark
- * @Description: (营销类型)
- * @date 八月 20 2018 ,20:46
- */
-public enum MarketingType {
-
-    SMS("message"),
-    CARD("card"),
-    WXIMAGETEXT("teletext"),
-    WXTEXT("text"),
-    WXIMAGE("image"),
-
-    TELTASK("teltask"),
-    WXA("wxa");
-//    SMS("短信"),
-//    CARD("卡券"),
-//    WXIMAGETEXT("微信图文"),
-//    WXTEXT("微信文本"),
-//    WXIMAGE("微信图片"),
-//
-//    TELTASK("话务"),
-//    WXA("小程序");
-    private String value;
-
-    MarketingType(String value){
-        this.value = value;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-}

src/main/java/com/gic/spark/entity/enumtype/MemberSignType.java

-package com.gic.spark.entity.enumtype;
-
-/**
- * @author Luojs
- * @version 1.0
- * @Package com.gic.spark.filter.enumtype
- * @Description: (这里用一句话描述这个类的作用)
- * @date 十月 10 2018 ,16:03
- */
-public enum MemberSignType {
-    /**
-     * 线上签到
-     */
-    LINESIGN(1)
-    ,
-    /**
-     * 门店签到
-     */
-    STORESIGN(2);
-
-    private int value;
-
-    MemberSignType(int value){
-        this.value = value;
-    }
-
-    public int getValue() {
-        return value;
-    }
-
-    public void setValue(int value) {
-        this.value = value;
-    }
-}

src/main/java/com/gic/spark/entity/enumtype/NumberIntervalType.java

-package com.gic.spark.entity.enumtype;
-
-/**
- * @description:
- * @author: wangxk
- * @date: 2019/5/10
- */
-public enum NumberIntervalType {
-
-    BETWEEN("between"),
-
-    EQUAL("="),
-
-    LESSEQUAL("<="),
-
-    LARGEREQUAL(">="),
-
-    LESS("<"),
-
-    LARGER(">");
-
-    private String value;
-
-    NumberIntervalType(String value) {
-        this.value = value;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-}

src/main/java/com/gic/spark/entity/enumtype/PreseBefOrLaterType.java

-package com.gic.spark.entity.enumtype;
-
-/**
- * @author Luojs
- * @version 1.0
- * @Package com.gic.spark.filter.enumtype
- * @Description: (这里用一句话描述这个类的作用)
- * @date 九月 11 2018 ,19:20
- */
-public enum PreseBefOrLaterType {
-    /**
-     * 当天 当月 当年
-     */
-    PRESENT_TIME("present_time"),
-//    /**
-//     * 当天前 当月前 当年前 不含当天 当月 当年
-//     */
-//    PRESENTTIMEBEFORE("presenttimebefore"),
-    /**
-     * 最近n天后 最近n月后 最近n年后 不含当天 当月 当年
-     */
-
-    //最近
-    RECENT_TIME("recent_time"),
-
-    //最近包含现在
-
-    RECENT_HAS_PRESENT_TIME("recent_has_present_time");
-
-    private String value;
-
-    PreseBefOrLaterType(String value){
-        this.value = value;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-}

src/main/java/com/gic/spark/entity/enumtype/SmsStatusType.java

-package com.gic.spark.entity.enumtype;
-
-/**
- * @author Luojs
- * @version 1.0
- * @Package com.gic.spark
- * @Description: (短信退订状态)
- * @date 八月 20 2018 ,21:04
- */
-public enum  SmsStatusType {
-    /**
-     * 短信退订
-     */
-    SMSUNSUBSCRIBE(1),
-    /**
-     * 短信未退订
-     */
-    SMSNOTUNSUBSCRIBE(-1);
-
-    private int value;
-
-    SmsStatusType(int value){
-        this.value = value;
-    }
-
-    public int getValue() {
-        return value;
-    }
-
-    public void setValue(int value) {
-        this.value = value;
-    }
-}

src/main/java/com/gic/spark/entity/enumtype/TimeRangeType.java

+package com.gic.spark.entity.enumtype;
+
+/**
+ * @description:
+ * @author: wangxk
+ * @date: 2020/4/24
+ */
+public enum TimeRangeType {
+
+}

src/main/java/com/gic/spark/entity/enumtype/WxMarketingType.java

-package com.gic.spark.entity.enumtype;
-
-/**
- * @author Luojs
- * @version 1.0
- * @Package com.gic.spark
- * @Description: (这里用一句话描述这个类的作用)
- * @date 八月 21 2018 ,9:19
- */
-public enum  WxMarketingType {
-    /**
-     * 微信图文
-     */
-    WXIMAGETEXT(0),
-    /**
-     * 微信文本
-     */
-    WXTEXT(1),
-    WXIMAGE(2);
-
-    private int value;
-
-    private WxMarketingType(int value){
-        this.value = value;
-    }
-
-    public int getValue() {
-        return value;
-    }
-
-    public void setValue(int value) {
-        this.value = value;
-    }
-}

src/main/java/com/gic/spark/filter/TagAboutExpireIntegralFilter.java

+package com.gic.spark.filter;
+
+import com.gic.spark.datasource.entity.DataSourceEntity;
+import com.gic.spark.entity.request.FilterRequest;
+import org.apache.spark.api.java.JavaRDD;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: wangxk
+ * @date: 2020/4/24
+ */
+public class TagAboutExpireIntegralFilter implements BaseTagFilter{
+
+    private static TagAboutExpireIntegralFilter instance;
+
+    public static TagAboutExpireIntegralFilter getInstance() {
+        if(null==instance){
+            instance=new TagAboutExpireIntegralFilter();
+        }
+        return instance;
+    }
+
+    private TagAboutExpireIntegralFilter(){}
+    @Override
+    public List<DataSourceEntity> necessarySourceList() {
+        return null;
+    }
+
+    @Override
+    public JavaRDD<Integer> filterValidMember(Integer enterpriseId, FilterRequest filterOption) {
+        return null;
+    }
+}

src/main/java/com/gic/spark/filter/TagAccumulatedIntegralFilter.java

+package com.gic.spark.filter;
+
+import com.gic.spark.datasource.entity.DataSourceEntity;
+import com.gic.spark.entity.request.FilterRequest;
+import org.apache.spark.api.java.JavaRDD;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: wangxk
+ * @date: 2020/4/24
+ */
+public class TagAccumulatedIntegralFilter implements BaseTagFilter{
+
+    private static TagAccumulatedIntegralFilter instance;
+
+    public static TagAccumulatedIntegralFilter getInstance() {
+            if(null==instance){
+                instance=new TagAccumulatedIntegralFilter();
+            }
+        return instance;
+    }
+
+    private TagAccumulatedIntegralFilter(){}
+
+    @Override
+    public List<DataSourceEntity> necessarySourceList() {
+        return null;
+    }
+
+    @Override
+    public JavaRDD<Integer> filterValidMember(Integer enterpriseId, FilterRequest filterOption) {
+        return null;
+    }
+}

src/main/java/com/gic/spark/tag/TagConstant.java

@@ -75,4 +75,10 @@ public class TagConstant {
     public static final String TAG_CODE_DONATIONINCOUPON="donationInCoupon";//转赠中卡券
     public static final String TAG_CODE_YETDONATIONCOUPON="yetDonationCoupon";//已转增卡券
 
+//    积分信息
+    /*累计获取积分
+    即将过期积分*/
+
+    public static final String TAG_CODE_ACCUMULATED_INTEGRAL="accumulatedIntegral_f";//累计获取积分
+    public static final String TAG_CODE_ABOUT_EXPIRE_INTEGRAL="aboutExpireIntegral";//即将过期积分
 }

src/main/java/com/gic/spark/tag/TagProcess.java

@@ -114,6 +114,7 @@ public class TagProcess {
                             tagIdToFilterMap.put(conditionDTO.getTagId(),tagFilter);
                         }
                     }
+
                     if(!tagGroupByEnterpriseMap.containsKey(sceneCrowdDTO.getEnterprise_Id())){
                         tagGroupByEnterpriseMap.put(sceneCrowdDTO.getEnterprise_Id(),new ArrayList());
                     }
@@ -186,13 +187,13 @@ public class TagProcess {
                                                                                 return result.iterator();
                                                                             });
 
-                updateMemberGroupRdd.cache();
+                JavaPairRDD<Integer,String>cacheMemberGroupRdd=updateMemberGroupRdd.cache();
 
-                updateIndex(updateMemberGroupRdd,enterpriseId);
+                updateIndex(cacheMemberGroupRdd,enterpriseId);
 
-                saveToHive(updateMemberGroupRdd,enterpriseId);
+                saveToHive(cacheMemberGroupRdd,enterpriseId);
 
-                updateMemberGroupRdd.unpersist();
+                cacheMemberGroupRdd.unpersist();
             }
         }
 
@@ -254,6 +255,14 @@ public class TagProcess {
     private static BaseTagFilter getTagFilter(String tagEsFieldName){
         BaseTagFilter tagFilter=null;
         switch (tagEsFieldName) {
+            //积分信息
+            case TagConstant.TAG_CODE_ACCUMULATED_INTEGRAL:
+                tagFilter= TagAccumulatedIntegralFilter.getInstance();
+                break;
+            case TagConstant.TAG_CODE_ABOUT_EXPIRE_INTEGRAL:
+                tagFilter= TagAboutExpireIntegralFilter.getInstance();
+                break;
+
 
             //卡卷类
             case TagConstant.TAG_CODE_CURRENT_COUPON_NUM: