消息通知和附件

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/NoticeMessageTypeEnum.java

@@ -82,6 +82,8 @@ public enum NoticeMessageTypeEnum {
 
     MATERIAL_AUDIT_NOTIFY(6006, "素材审核通知", NoticeMessageCategoryTypeEnum.MATERIAL.getType(), "material_audit_notify", "/pages/route/index?pageType=", "hbapp_create_center", "materialAuditNotify", "haobanNotice"),
 
+    KNOWLEDGE_NEW_NOTIFY(6007, "知识库上新通知", NoticeMessageCategoryTypeEnum.MATERIAL.getType(), "knowledge_new_notify", "/pages/route/index?pageType=", "hbapp_guide_knowledge", "knowledgeNewNotify", "clerkMaterialsNotice"),
+
     CASH_APPLY_REFUSE_NOTIFY(7001,"提现通知", NoticeMessageCategoryTypeEnum.OTHER.getType(),"cash_apply_refuse_notify","/pages/route/index?pageType=","hbapp_withdraw_list","cashApplyRefuseNotify","haobanNotice"),
 
     CASH_APPLY_FAIL_NOTIFY(7002,"提现通知", NoticeMessageCategoryTypeEnum.OTHER.getType(),"cash_apply_fail_notify","/pages/route/index?pageType=","hbapp_withdraw_list","cashApplyFailNotify","haobanNotice"),

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/content/ContentMaterialInfoVO.java

@@ -2,6 +2,7 @@ package com.gic.haoban.manage.web.vo.content;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.gic.content.api.dto.additional.ContentMaterialAdditionalDTO;
 import com.gic.content.api.dto.ext.ContentMaterialExt;
 import org.apache.commons.lang3.StringUtils;
 
@@ -47,6 +48,11 @@ public class ContentMaterialInfoVO implements Serializable {
     private Integer topFlag = 0;
 
     /**
+     * 是否支持下载1是0否
+     */
+    private Integer downloadFlag;
+
+    /**
      * 发布时间
      */
     private Date publishTime;
@@ -162,6 +168,12 @@ public class ContentMaterialInfoVO implements Serializable {
      */
     private ContentMaterialExt ext;
 
+    /**
+     * 素材附件列表
+     * KEY:link链接、link_image链接小工具图片
+     */
+    private List<ContentMaterialAdditionalDTO> additionalList;
+
 
     public Long getContentMaterialId() {
         return contentMaterialId;
@@ -203,6 +215,14 @@ public class ContentMaterialInfoVO implements Serializable {
         this.topFlag = topFlag;
     }
 
+    public Integer getDownloadFlag() {
+        return downloadFlag;
+    }
+
+    public void setDownloadFlag(Integer downloadFlag) {
+        this.downloadFlag = downloadFlag;
+    }
+
     public Date getPublishTime() {
         return publishTime;
     }
@@ -395,6 +415,14 @@ public class ContentMaterialInfoVO implements Serializable {
         this.ext = ext;
     }
 
+    public List<ContentMaterialAdditionalDTO> getAdditionalList() {
+        return additionalList;
+    }
+
+    public void setAdditionalList(List<ContentMaterialAdditionalDTO> additionalList) {
+        this.additionalList = additionalList;
+    }
+
     public void convertMaterialImages(String materialImageUrls, String materialThumbnailImageUrls) {
         if (StringUtils.isNotBlank(materialImageUrls)) {
             String[] split = StringUtils.split(materialImageUrls, ",");