Merge branch 'master' of http://begitlab.chubanyun.me/rays/pcloud-common-parent into hzk

pcloud-common-config/src/main/resources.prod/public_system.properties

@@ -92,4 +92,6 @@ jsbj.agent.id = 1000009100
 
 product.parentTutor.proLabelId = 7461
 
+book.group.qrcode.domain = https://qrcode.5rs.me
+
 ownAgentIds = 2,1362
\ No newline at end of file

pcloud-common-config/src/main/resources.uat/public_system.properties

@@ -93,4 +93,6 @@ jsbj.agent.id = 12829
 
 product.parentTutor.proLabelId = 812
 
+book.group.qrcode.domain = https://qrcode.raysyun.com
+
 ownAgentIds = 12829
\ No newline at end of file

pcloud-common-core/src/main/java/com/pcloud/common/core/constant/AppTypeEnum.java

@@ -12,90 +12,150 @@ public enum AppTypeEnum {
 	/**
 	 * 一对一辅导
 	 */
-	CC("cc"),
+	CC("cc", com.pcloud.common.core.enums.AppTypeEnum.TUTOR.value),
 
 	/**
 	 * 圈子 
 	 */
-	GROUP("group"),
+	GROUP("group", com.pcloud.common.core.enums.AppTypeEnum.GROUP.value),
 	
 	/**
 	 * 扫扫看
 	 */
-	KK("kk"),
+	KK("kk", com.pcloud.common.core.enums.AppTypeEnum.KK.value),
 	
 	/**
 	 * 专题
 	 */
-	ST("st"),
+	ST("st", com.pcloud.common.core.enums.AppTypeEnum.SPECIAL.value),
 	
 	/**
 	 * 背单词
 	 */
-	WD("wd"),
+	WD("wd", com.pcloud.common.core.enums.AppTypeEnum.RECITE_WORD.value),
 	
 	/**
 	 * 数据采集/问卷调查
 	 */
-	QN("qn"),
+	QN("qn", com.pcloud.common.core.enums.AppTypeEnum.DA.value),
 	
 	/**
 	 * 报名
 	 */
-	REPLY_SCENE("mt"),
+	REPLY_SCENE("mt", com.pcloud.common.core.enums.AppTypeEnum.BM.value),
 	
 	/**
 	 * 投票
 	 */
-	VT("vt"),
+	VT("vt", com.pcloud.common.core.enums.AppTypeEnum.VOTE.value),
 	
 	/**
 	 * 题库
 	 */
-	PRETEST("pretest"),
+	PRETEST("pretest", com.pcloud.common.core.enums.AppTypeEnum.ITEM_BANK.value),
 	
 	/**
 	 * 标准分
 	 */
-	ZSCORE("zscore"),
+	ZSCORE("zscore", com.pcloud.common.core.enums.AppTypeEnum.ZSCORE.value),
 	
 	/**
 	 * 读书卡片
 	 */
-	BOOKCARD("card"),
+	BOOKCARD("card", com.pcloud.common.core.enums.AppTypeEnum.BOOKCARD.value),
 	
 	/**
 	 * 教育表格
 	 */
-	TB("tb"),
+	TB("tb", com.pcloud.common.core.enums.AppTypeEnum.EF.value),
 
 	/**
 	 * 直播
 	 */
-	LIVE("live"),
+	LIVE("live", com.pcloud.common.core.enums.AppTypeEnum.LIVE.value),
 
 	/**
 	 * 打卡
 	 */
-	CLOCK("clock"),
+	CLOCK("clock", com.pcloud.common.core.enums.AppTypeEnum.CLOCK.value),
 
     /**
      * 伴读魔法箱
      */
-    AUDIO_MAGIC("magic"),
+    AUDIO_MAGIC("magic", com.pcloud.common.core.enums.AppTypeEnum.AUDIO_MAGIC.value),
 
 	/**
 	 * 课件
 	 */
-	COURSE_WARE("courseWare");
-	
-	
+	COURSE_WARE("cw", com.pcloud.common.core.enums.AppTypeEnum.COURSE_WARE.value),
+
+	/**
+	 * 读者反馈
+	 */
+	NAIRE("qn", com.pcloud.common.core.enums.AppTypeEnum.NAIRE.value),
+
+	/**
+	 * 互动墙
+	 */
+	INTERACT("interact", com.pcloud.common.core.enums.AppTypeEnum.INTERACT.value),
+
+	/**
+	 * 抽奖
+	 */
+	DRAW("luck", com.pcloud.common.core.enums.AppTypeEnum.DRAW.value),
+
+	/**
+	 * 教辅资料包
+	 */
+	TEACH_RESOURCE("tr", com.pcloud.common.core.enums.AppTypeEnum.TEACH_RESOURCE.value),
+
+	/**
+	 * 测试工具
+	 */
+	TEST("tt", com.pcloud.common.core.enums.AppTypeEnum.TEST.value),
+
+	/**
+	 * 愿望单
+	 */
+	WISH("wish", com.pcloud.common.core.enums.AppTypeEnum.WISH.value),
+
+	/**
+	 * 笔顺动图
+	 */
+	STROKE_ORDER("pen", com.pcloud.common.core.enums.AppTypeEnum.STROKE_ORDER.value),
+
+	/**
+	 * 生词听写
+	 */
+	WORD_DICTATION("dictation", com.pcloud.common.core.enums.AppTypeEnum.WORD_DICTATION.value),
+
+	/**
+	 * 配套听力
+	 */
+	MATCH_LISTEN("mv", com.pcloud.common.core.enums.AppTypeEnum.MATCH_LISTEN.value),
+
+    /**
+     * 开通会员
+     */
+    MEMBER("member", com.pcloud.common.core.enums.AppTypeEnum.MEMBER.value),
+
+	/**
+	 * 课文诵读
+	 */
+	ARTICLE_READING("ar", com.pcloud.common.core.enums.AppTypeEnum.ARTICLE_READING.value),
+
+	/**
+	 * 英语随身听
+	 */
+	ENGLISH_WALKMAN("wm", com.pcloud.common.core.enums.AppTypeEnum.ENGLISH_WALKMAN.value);
 	
 	/**
 	 * 值
 	 */
 	public final String value;
 
+	public String typeCode;
+
 	/**
 	 * 构造
 	 * 
@@ -105,4 +165,9 @@ public enum AppTypeEnum {
 		this.value = value;
 	}
 
+	private AppTypeEnum(String value, String typeCode) {
+		this.value = value;
+		this.typeCode = typeCode;
+	}
+
 }

pcloud-common-core/src/main/java/com/pcloud/common/core/constant/ConvertEnum.java

@@ -93,7 +93,12 @@ public enum ConvertEnum {
 	/**
 	 * 音频魔法箱
 	 */
-	AUDIO_MAGIC("AUDIO_MAGIC");
+	AUDIO_MAGIC("AUDIO_MAGIC"),
+
+	/**
+	 * 场景化应用
+	 */
+	SCENARIZED_APP("SCENARIZED_APP");
 
 	/**
 	 * 值

pcloud-common-core/src/main/java/com/pcloud/common/core/constant/MQQueueConstant.java

@@ -94,6 +94,10 @@ public class MQQueueConstant {
 	 * 文件转码结束(音视频)->音频课/纯听
 	 */
 	public static final String CONVERT_TO_AUDIOMAGIC = "convert2AudioMagicQueue";
+	/**
+	 * 文件转码结束(音视频)->场景化应用
+	 */
+	public static final String CONVERT_TO_SCENARIZEDAPP = "convert2ScenarizedAppQueue";
 
 	/**
 	 * 数据埋点

pcloud-common-core/src/main/java/com/pcloud/common/core/constant/ProductTypeConstant.java

@@ -183,11 +183,6 @@ public class ProductTypeConstant {
     public static final String PBMUSIC = "PBMUSIC";
 
     /**
-     * 绘本资源
-     */
-    public static final String MUSIC = "MUSIC";
-
-    /**
      * 一对一辅导
      */
     public static final String TUTORIAL = "TUTORIAL";
@@ -283,6 +278,11 @@ public class ProductTypeConstant {
     public static final String MEMBER_APP = "MEMBER_APP";
 
     /**
+     * 绘本故事
+     */
+    public static final String PBSTORY = "PBSTORY";
+
+    /**
      * 课文诵读
      */
     public static final String ARTICLE_READING = "ARTICLE_READING";
@@ -293,6 +293,21 @@ public class ProductTypeConstant {
     public static final String ENGLISH_WALKMAN = "ENGLISH_WALKMAN";
 
     /**
+     * 口语评测Oral evaluation
+     */
+    public static final String ORAL_EVALUATION = "ORAL_EVALUATION";
+
+    /**
+     * 微信学习群
+     */
+    public static final String BOOK_GROUP = "BOOK_GROUP";
+
+    /**
+     * 延伸阅读
+     */
+    public static final String PDF_APP = "PDF_APP";
+
+    /**
      * 热门作品类型
      */
     public static final String[] HOT_PRODUCT_TYPE = {QA, PDF, VIDEO, PRETEST};
@@ -320,7 +335,7 @@ public class ProductTypeConstant {
     public static final String[] APP_PRODUCT = {LOOK, LIVE, TUTOR, GROUP, ZSCORE, VOTE, CLOCK, TEST, AUDIOAPP, ANSWER,
             EF, VIDEO_COURSE, PRETESTAPP, AUDIO_RESOURCE, QA_APP, EBOOK_APP, AUDIO_MAGIC, TEACH_RESOURCE_APP,
             COURSE_WARE, TEST_PAPER_APP, MATCH_LISTEN, WORD_DICTATION, STROKE_ORDER_APP, IMAGE_APP, MEMBER_APP,
-            ARTICLE_READING,ENGLISH_WALKMAN};
+            ARTICLE_READING, ENGLISH_WALKMAN, ORAL_EVALUATION, PBSTORY, PDF_APP};
 
     /**
      * 数据平台埋点型作品

pcloud-common-core/src/main/java/com/pcloud/common/core/constant/SMSTemplateConstant.java

@@ -135,6 +135,11 @@ public class SMSTemplateConstant {
 	 */
 	public static final String APPOINTMENT_CODE = "SMS_90735003";
 
+    /**
+     * 尊敬的${name}老师，您的课程${title}报名人数已达${number}人，将于${time}开播，提醒您提前做好准备，预祝直播顺利！
+     */
+    public static final String START_COURSE_NOTICE = "SMS_163852029";
+
 	/*----------tradecenter------------*/
 	/**
 	 * 您有一个超过24小时的订单没有发货，请及时处理！

pcloud-common-core/src/main/java/com/pcloud/common/core/enums/AppProductTypeEnum.java

@@ -32,7 +32,9 @@ public enum AppProductTypeEnum {
     IMAGE(AppTypeEnum.IMAGE.value, ProductTypeConstant.IMAGE_APP),
     MEMBER(AppTypeEnum.MEMBER.value, ProductTypeConstant.MEMBER_APP),
     ARTICLE_READING(AppTypeEnum.ARTICLE_READING.value, ProductTypeConstant.ARTICLE_READING),
-    ENGLISH_WALKMAN(AppTypeEnum.ENGLISH_WALKMAN.value, ProductTypeConstant.ENGLISH_WALKMAN);
+    ENGLISH_WALKMAN(AppTypeEnum.ENGLISH_WALKMAN.value, ProductTypeConstant.ENGLISH_WALKMAN),
+    ORAL_EVALUATION(AppTypeEnum.ORAL_EVALUATION.value, ProductTypeConstant.ORAL_EVALUATION),
+    PDF(AppTypeEnum.PDF.value, ProductTypeConstant.PDF_APP);
 
     public final String appTypeCode;
 
@@ -62,4 +64,36 @@ public enum AppProductTypeEnum {
         }
         return null;
     }
+
+    /**
+     * 根据作品类型编码获取应用类型编码
+     * @param productTypeCode 作品类型编码
+     * @return
+     */
+    public static String getAppTypeCodeByProductTypeCode(String productTypeCode) {
+        if (StringUtil.isEmpty(productTypeCode)) {
+            return null;
+        }
+        AppProductTypeEnum[] var1 = values();
+        int var2 = var1.length;
+        for (int var3 = 0; var3 < var2; ++var3) {
+            AppProductTypeEnum appProductTypeEnum = var1[var3];
+            if (appProductTypeEnum.productTypeCode.equals(productTypeCode)) {
+                return appProductTypeEnum.appTypeCode;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 会员应用可设置会员免费的作品类型
+     */
+    public static final String[] MEMBER_INCLUDE_PRODUCT_TYPE = {ProductTypeConstant.PDF, ProductTypeConstant.AUDIO, ProductTypeConstant.VIDEO, ProductTypeConstant.PRETEST, ProductTypeConstant.ARTICLE,
+            ProductTypeConstant.FORMAT, ProductTypeConstant.ALBUM, ProductTypeConstant.BOOK, ProductTypeConstant.EBOOK, ProductTypeConstant.VIDEO_SCHEDULE};
+
+    /**
+     * 会员应用可设置会员免费的应用类型
+     */
+    public static final String[] MEMBER_INCLUDE_APP_TYPE = {AppTypeEnum.ANSWER.value, AppTypeEnum.ITEM_BANK.value, AppTypeEnum.EBOOK.value, AppTypeEnum.TEACH_RESOURCE.value, AppTypeEnum.COURSE_WARE.value,
+            AppTypeEnum.TEST_PAPER.value};
 }

pcloud-common-core/src/main/java/com/pcloud/common/core/enums/AppTypeEnum.java

@@ -21,7 +21,7 @@ public enum AppTypeEnum {
     VOTE("VOTE"),                // 投票
     ENROLL("ENROLL"),            // 编创赛报名
     BM("BM"),                    // 报名
-    NAIRE("NAIRE"),            // 问卷调查
+    NAIRE("NAIRE"),            // 问卷调查/读者反馈
     DA("DA"),                    // 数据采集
     BOOKCARD("BOOKCARD"),        // 读书卡片
     TUTOR("TUTOR"),            // 一对一辅导
@@ -56,7 +56,10 @@ public enum AppTypeEnum {
     STROKE_ORDER("STROKE_ORDER"),     // 笔顺动图
     MEMBER("MEMBER"),    // 开通会员
     ARTICLE_READING("ARTICLE_READING"), //课文诵读
-    ENGLISH_WALKMAN("ENGLISH_WALKMAN"); //英语随身听
+    ENGLISH_WALKMAN("ENGLISH_WALKMAN"), //英语随身听
+    ORAL_EVALUATION("ORAL_EVALUATION"), //口语评测
+    WISH("WISH"),//愿望单
+    DRAW("DRAW");//抽奖
     /**
      * 值
      */

pcloud-common/src/main/java/com/pcloud/common/enums/AppTypeEnum.java

@@ -62,10 +62,14 @@ public enum AppTypeEnum {
     MATCH_LISTEN("MATCH_LISTEN"),  //配套听力
     WORD_DICTATION("WORD_DICTATION"),    //生词听写
     STROKE_ORDER("STROKE_ORDER"),     //笔顺动图
+    ARTICLE_READING("ARTICLE_READING"), //课文诵读
+    ENGLISH_WALKMAN("ENGLISH_WALKMAN"), //英语随身听
     WECHAT_STUDY_GROUP("WECHAT_STUDY_GROUP"), // 微信学习交流圈
     TASK_CLOCK("TASK_CLOCK"), //任务打卡
     REWARD_CLOCK("REWARD_CLOCK"), //奖励打卡
     CUSTOM_CLOCK("CUSTOM_CLOCK"), //自定义打卡
+ 	MEMBER("MEMBER"), //开通会员
+    ORAL_EVALUATION("ORAL_EVALUATION"), //口语评测
     PIC_NOTE("PIC_NOTE"); // 图文应用
 
     /**