Merge branch 'revert-b43557db' into 'master'

Revert "Merge branch 'revert-fc219f07' into 'master'"

See merge request rays/pcloud-book!1643

pcloud-facade-book/src/main/java/com/pcloud/book/group/enums/PageLandingPageTypeEnum.java

@@ -9,9 +9,9 @@ package com.pcloud.book.group.enums;
 public enum PageLandingPageTypeEnum {
 
     /**
-     *  RAYS码落地页类型1本书服务2企微
+     *  RAYS码落地页类型1本书服务2企微3一码一资源
      **/
-    RESOURCE(1), WXWORK(2);
+    RESOURCE(1), WXWORK(2),SINGLE_RESOURCE(3);
     private Integer code;
 
     public Integer getCode() {

pcloud-service-book/pom.xml

@@ -267,6 +267,12 @@
 			<version>${pcloud-facade3.version}</version>
 		</dependency>
 
+		<dependency>
+			<groupId>io.vavr</groupId>
+			<artifactId>vavr</artifactId>
+			<version>0.10.4</version>
+		</dependency>
+
     </dependencies>
 
      <build>

pcloud-service-book/src/main/java/com/pcloud/book/group/biz/ResourcePageBiz.java

@@ -18,6 +18,7 @@ import com.pcloud.book.group.entity.ResourcePageTool;
 import com.pcloud.book.group.entity.ResourceRecomManage;
 import com.pcloud.book.group.vo.RecommendServeVO;
 import com.pcloud.book.group.vo.ResourceColumnAndServeVO;
+import com.pcloud.book.group.vo.ResourcePageFolderItemVO;
 import com.pcloud.book.group.vo.ResourcePageItemResourceVO;
 import com.pcloud.book.group.vo.ResourcePageItemVO;
 import com.pcloud.book.group.vo.ResourcePageOneServe;
@@ -607,4 +608,6 @@ public interface ResourcePageBiz {
      * @param wechatUserId
      */
     void deleteDouluoCache(Long sceneId, List<Long> mapSceneIds, Long wechatUserId);
+
+    List<ResourcePageFolderItemVO> getFolderItemList(Long wechatUserId, Long folderId);
 }

pcloud-service-book/src/main/java/com/pcloud/book/group/biz/ResourcePageBookstoreBiz.java

@@ -4,6 +4,7 @@ import com.pcloud.book.group.entity.ResourcePageBookstore;
 import com.pcloud.book.group.enums.ResourcePageFixtureTypeEnum;
 import com.pcloud.book.group.vo.ResourcePageBookstoreVO;
 import com.pcloud.common.page.PageBeanNew;
+
 import java.util.List;
 
 /**
@@ -28,7 +29,7 @@ public interface ResourcePageBookstoreBiz {
      * 新增数据
      */
     Long insert(ResourcePageBookstore resourcePageBookstore);
-    
+
     /**
      * 新增数据
      */

pcloud-service-book/src/main/java/com/pcloud/book/group/constant/ResourcePageConstants.java

 package com.pcloud.book.group.constant;
 
 import com.pcloud.book.applet.contants.AppletResourceApplyConstants;
-import com.pcloud.common.constant.CacheConstant;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Optional;
 
 /**
  * @ClassName com.pcloud.book.group.constant.ResourcePageConstants
@@ -35,7 +36,10 @@ public class ResourcePageConstants {
         MEMBER_ACTIVITY(8,"平台会员活动", new String[]{ServeTypeEnum.MEMBER_ACTIVITY.getValue()}),
         CHANNEL_SHOP(9,"运营商城", new String[]{ServeTypeEnum.SHOP.getValue()}),
         OUTER_LINK(10,"外链",new String[]{ServeTypeEnum.OUTER_LINK.getValue()}),
-        MULTI_CHANNEL(12,"多渠道资源",new String[]{ServeTypeEnum.MULTI_CHANNEL.getValue()});
+        MULTI_CHANNEL(12,"多渠道资源",new String[]{ServeTypeEnum.MULTI_CHANNEL.getValue()}),
+        COMMON_COMPONENT(13, "通用组件", new String[]{ServeTypeEnum.FOLDER.getValue()}),
+        MARKETING_ACTIVITY(14, "营销活动", new String[]{ServeTypeEnum.FOLDER.getValue()}),
+        ;
 
         private Integer code;
         private String name;
@@ -93,7 +97,9 @@ public class ResourcePageConstants {
         SHOP("SHOP","运营商城"),
         RESOURCE("RESOURCE","素材"),
         OUTER_LINK("OUTER_LINK","外链"),
-        MULTI_CHANNEL("MULTI_CHANNEL","多渠道资源");
+        MULTI_CHANNEL("MULTI_CHANNEL","多渠道资源"),
+        FOLDER("FOLDER", "通用组件资源集合"),
+        ;
 
         private String value;
 
@@ -120,6 +126,10 @@ public class ResourcePageConstants {
             }
             return null;
         }
+
+        public static Optional<ServeTypeEnum> of(String value){
+            return Arrays.stream(ServeTypeEnum.values()).filter(x -> StringUtils.equalsAny(x.getValue(), value)).findFirst();
+        }
     }
 
     /**

pcloud-service-book/src/main/java/com/pcloud/book/group/entity/ResourcePage.java

@@ -4,6 +4,7 @@ import com.pcloud.common.entity.BaseEntity;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * 自有码H5页面(ResourcePage)实体类
@@ -12,6 +13,7 @@ import lombok.Data;
  * @since 2021-03-26 15:25:28
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 public class ResourcePage extends BaseEntity {
     private static final long serialVersionUID = 220369810358566952L;
     /**
@@ -105,4 +107,14 @@ public class ResourcePage extends BaseEntity {
      * 是否展示价格
      */
     private Integer isShowPrice;
+
+    /**
+     * 纯色背景颜色
+     */
+    private String bgColor;
+
+    /**
+     * 开关配置
+     */
+    private Integer switchConfig;
 }

pcloud-service-book/src/main/java/com/pcloud/book/group/entity/ResourcePageColumn.java

@@ -6,6 +6,7 @@ import java.util.Date;
 import java.io.Serializable;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * 自有码H5页面栏目(ResourcePageColumn)实体类
@@ -14,6 +15,7 @@ import lombok.Data;
  * @since 2021-03-26 15:26:02
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 public class ResourcePageColumn extends BaseEntity {
     private static final long serialVersionUID = -78405010138867722L;
     /**
@@ -66,4 +68,19 @@ public class ResourcePageColumn extends BaseEntity {
      * 背景图地址
      */
     private String backgroundUrl;
+
+    /**
+     * 标题颜色
+     */
+    private String columnTitleColor;
+
+    /**
+     * 标题背景图
+     */
+    private String columnTitleBg;
+
+    /**
+     * 查看更多位置 【0标题后】【1列表后】
+     */
+    private Integer showPosition;
 }
\ No newline at end of file

pcloud-service-book/src/main/java/com/pcloud/book/group/entity/ResourcePageFolder.java

+package com.pcloud.book.group.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.pcloud.common.entity.BaseEntity;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 自有码H5页面通用组件资源
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class ResourcePageFolder extends BaseEntity implements Serializable {
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 资源页id
+     */
+    private Long resourcePageId;
+
+    /**
+     * 资源栏目id
+     */
+    private Long resourcePageColumnId;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 子标题
+     */
+    private String subTitle;
+
+    /**
+     * 跳转类型 1单资源 2资源列表 3链接
+     */
+    private Integer jumpType;
+
+    /**
+     * 图标
+     */
+    private String icon;
+
+    /**
+     * 链接url
+     */
+    private String linkUrl;
+
+    /**
+     * 排序值
+     */
+    private Integer seqNum;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date updateTime;
+
+    /**
+     * 创建人
+     */
+    private Long createUser;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

pcloud-service-book/src/main/java/com/pcloud/book/group/entity/ResourcePageFolderItem.java

+package com.pcloud.book.group.entity;
+
+import com.pcloud.common.entity.BaseEntity;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 自有码H5页面通用组件资源项
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class ResourcePageFolderItem extends BaseEntity implements Serializable {
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 资源页id
+     */
+    private Long resourcePageId;
+
+    /**
+     * 通用组件资源id
+     */
+    private Long folderId;
+
+    /**
+     * 资源栏目id
+     */
+    private Long resourcePageColumnId;
+
+    /**
+     * 资源id
+     */
+    private Long serveId;
+
+    /**
+     * 资源类型
+     */
+    private String serveType;
+
+    /**
+     * 链接url
+     */
+    private String linkUrl;
+
+    /**
+     * 资源类型
+     */
+    private String typeCode;
+
+    /**
+     * 排序值
+     */
+    private Integer seqNum;
+
+    /**
+     * 是否展示
+     */
+    private Integer isShow;
+
+    /**
+     * 二维码引导关注文案
+     */
+    private String guideContent;
+
+    /**
+     * 二维码logo链接
+     */
+    private String logoUrl;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 创建人
+     */
+    private Long createUser;
+
+    /**
+     * 二维码来源；0：默认公众号；1：自定义
+     */
+    private Integer qrcodeSource;
+
+    /**
+     * 二维码展示方式（1平铺2弹窗）
+     */
+    private Integer qrcodeShowType;
+
+    /**
+     * 二维码公众号id
+     */
+    private Long accountSettingId;
+
+    /**
+     * 自定义大图
+     */
+    private String selfBigPic;
+
+    /**
+     * 自定义小图
+     */
+    private String selfSmallPic;
+
+    private String selfServeName;
+
+    /**
+     * 书刊链接来源（1当当2京东3拼多多）
+     */
+    private Integer linkFrom;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

pcloud-service-book/src/main/java/com/pcloud/book/group/entity/ResourcePageMarketingActivity.java

+package com.pcloud.book.group.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 营销活动
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ResourcePageMarketingActivity implements Serializable {
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 资源页ID
+     */
+    private Long resourcePageId;
+
+    /**
+     * 类型 0会员 1优惠券
+     */
+    private Integer type;
+
+    /**
+     * 宣传文案
+     */
+    private String content;
+
+    /**
+     * 配图
+     */
+    private String img;
+
+    /**
+     * 会员应用/优惠券ID
+     */
+    private Long serveId;
+
+    /**
+     * 资源类型
+     */
+    private String serveType;
+
+    /**
+     * 跳转地址
+     */
+    private String linkUrl;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 创建人
+     */
+    private Long createUser;
+
+    private static final long serialVersionUID = 1L;
+
+}
\ No newline at end of file

pcloud-service-book/src/main/java/com/pcloud/book/group/enums/IMaskFlag.java

+package com.pcloud.book.group.enums;
+
+import java.util.Objects;
+import java.util.Optional;
+
+public interface IMaskFlag {
+
+    int getFlag();
+
+    default boolean defaultState() {
+        return false;
+    }
+
+    /**
+     * 计算辅助工具
+     */
+    class Helper {
+        private int flagVal;
+
+        private Helper(int flagVal) {
+            this.flagVal = flagVal;
+        }
+
+        public static Helper of() {
+            return new Helper(0);
+        }
+
+        public static Helper of(Integer flagVal) {
+            return new Helper(Optional.ofNullable(flagVal).orElse(0));
+        }
+
+        /**
+         * 校验标识位是否开启
+         *
+         * @param maskFlag 掩码表示枚举实现
+         * @return 是否开启
+         */
+        public boolean checkFlagEnable(IMaskFlag maskFlag) {
+            if (Objects.isNull(maskFlag)) {
+                return false;
+            }
+            return (flagVal & maskFlag.getFlag()) != 0;
+        }
+
+        /**
+         * 指定条件开启
+         *
+         * @param maskFlag 指定条件枚举
+         * @return 计算值
+         */
+        public Helper onState(IMaskFlag maskFlag) {
+            flagVal |= maskFlag.getFlag();
+            return this;
+        }
+
+        /**
+         * 指定条件关闭
+         *
+         * @param maskFlag 指定条件枚举
+         * @return 计算值
+         */
+        public Helper offState(IMaskFlag maskFlag) {
+            flagVal &= ~maskFlag.getFlag();
+            return this;
+        }
+
+        /**
+         * 设置条件默认状态
+         *
+         * @param maskFlag 指定条件枚举
+         * @return 计算值
+         */
+        public Helper defaultState(IMaskFlag maskFlag) {
+            return state(maskFlag, maskFlag.defaultState());
+        }
+
+        /**
+         * 设置条件状态
+         *
+         * @param maskFlag 指定条件枚举
+         * @return 计算值
+         */
+        public Helper state(IMaskFlag maskFlag, Boolean state) {
+            if (state == null) {
+                state = maskFlag.defaultState();
+            }
+            if (state) {
+                return onState(maskFlag);
+            }
+            return offState(maskFlag);
+        }
+
+        public int getFlagVal() {
+            return flagVal;
+        }
+    }
+
+}

pcloud-service-book/src/main/java/com/pcloud/book/group/enums/ResourcePageSwitchConfigEnum.java

+package com.pcloud.book.group.enums;
+
+/**
+ * 资源页开关配置
+ */
+public enum ResourcePageSwitchConfigEnum implements IMaskFlag {
+    SHOW_SELF(0, "开启展示我的页面"),
+    /**
+     * 默认开启收藏
+     */
+    SHOW_COLLECT(1, "开启展示收藏", true),
+    /**
+     * 默认开启分享
+     */
+    SHOW_SHARE(2, "开启展示分享", true),
+
+    NEW_EDITOR(3, "新版编辑器", false),
+    ;
+
+
+    private final int flag;
+    private final String desc;
+    private final boolean defaultState;
+
+    ResourcePageSwitchConfigEnum(int flag, String desc) {
+        this(flag, desc, false);
+    }
+
+    ResourcePageSwitchConfigEnum(int flag, String desc, boolean defaultState) {
+        this.flag = flag;
+        this.desc = desc;
+        this.defaultState = defaultState;
+    }
+
+    @Override
+    public int getFlag() {
+        return 1 << flag;
+    }
+
+    @Override
+    public boolean defaultState() {
+        return this.defaultState;
+    }
+
+
+    public String getDesc() {
+        return desc;
+    }
+
+}

pcloud-service-book/src/main/java/com/pcloud/book/group/facade/impl/ResourcePageFacade.java

@@ -7,6 +7,7 @@ import com.pcloud.book.group.entity.BookGroupServe;
 import com.pcloud.book.group.entity.ResourcePageCollect;
 import com.pcloud.book.group.entity.ResourcePagePic;
 import com.pcloud.book.group.entity.ResourceRecomManage;
+import com.pcloud.book.group.vo.ResourcePageFolderItemVO;
 import com.pcloud.book.group.vo.ResourcePageShareParam;
 import com.pcloud.book.group.vo.ResourcePageVO;
 import com.pcloud.book.group.vo.UpdateResourceColumnVO;
@@ -127,6 +128,14 @@ public class ResourcePageFacade {
         return new ResponseDto<>(resourcePageBiz.getColumnTypeByPageId4Wechat(resourcePageId, wechatUserId, bookId, adviserId, channelId, enableAdverting, navigationId));
     }
 
+    @ApiOperation("根据FolderId批量获取详情")
+    @GetMapping("getFolderItemList")
+    public ResponseDto<List<ResourcePageFolderItemVO>> getFolderItemList(@CookieValue("userInfo") String userInfo,
+                                                                         @RequestParam("folderId") Long folderId){
+        Long wechatUserId = Cookie.getId(userInfo,Cookie._WECHAT_USER_ID);
+        return new ResponseDto<>(resourcePageBiz.getFolderItemList(wechatUserId, folderId));
+    }
+
     //优化  此处把模块分开调接口  columnType
     @ApiOperation("客户端-根据页面id查资源页栏目及资源")
     @GetMapping("getColumnAndServeListByPageId4WechatV2")

pcloud-service-book/src/main/java/com/pcloud/book/group/mapper/ResourcePageFolderItemMapper.java

+package com.pcloud.book.group.mapper;
+
+import com.pcloud.book.group.entity.ResourcePageFolderItem;
+import com.pcloud.book.group.vo.ResourcePageFolderItemVO;
+import com.pcloud.book.group.vo.ResourcePageItemVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+public interface ResourcePageFolderItemMapper {
+    int deleteByPrimaryKey(Long id);
+
+    int insert(ResourcePageFolderItem record);
+
+    int insertSelective(ResourcePageFolderItem record);
+
+    ResourcePageFolderItem selectByPrimaryKey(Long id);
+
+    int updateByPrimaryKeySelective(ResourcePageFolderItem record);
+
+    int updateByPrimaryKey(ResourcePageFolderItem record);
+
+    void deleteByColumnIds(@Param("columnIds") List<Long> columnIds);
+
+    void batchInsert(@Param("itemList") List<ResourcePageFolderItem> itemList);
+
+    List<ResourcePageFolderItemVO> listByFolderIds(@Param("folderIds") Collection<Long> folderIds);
+
+    List<ResourcePageItemVO> getServeListBySceneId4QrUpdate(@Param("sceneId") Long sceneId);
+
+    ResourcePageItemVO checkOneServeItemByPageId(@Param("resourcePageId") Long resourcePageId, @Param("ignoreRays") Boolean ignoreRays);
+}
\ No newline at end of file

pcloud-service-book/src/main/java/com/pcloud/book/group/mapper/ResourcePageFolderMapper.java

+package com.pcloud.book.group.mapper;
+
+import com.pcloud.book.group.entity.ResourcePageFolder;
+import com.pcloud.book.group.vo.ResourcePageFolderVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+public interface ResourcePageFolderMapper {
+    int deleteByPrimaryKey(Long id);
+
+    int insert(ResourcePageFolder record);
+
+    int insertSelective(ResourcePageFolder record);
+
+    ResourcePageFolder selectByPrimaryKey(Long id);
+
+    int updateByPrimaryKeySelective(ResourcePageFolder record);
+
+    int updateByPrimaryKey(ResourcePageFolder record);
+
+    void deleteByColumnIds(@Param("columnIds") List<Long> columnIds);
+
+    List<ResourcePageFolderVO> selectByPrimaryKeys(@Param("ids") Collection<Long> ids);
+}
\ No newline at end of file

pcloud-service-book/src/main/java/com/pcloud/book/group/mapper/ResourcePageMarketingActivityMapper.java

+package com.pcloud.book.group.mapper;
+
+import com.pcloud.book.group.entity.ResourcePageMarketingActivity;
+import com.pcloud.book.group.vo.ResourcePageMarketingActivityVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface ResourcePageMarketingActivityMapper {
+    int deleteByPrimaryKey(Long id);
+
+    int insert(ResourcePageMarketingActivity record);
+
+    int insertSelective(ResourcePageMarketingActivity record);
+
+    ResourcePageMarketingActivity selectByPrimaryKey(Long id);
+
+    int updateByPrimaryKeySelective(ResourcePageMarketingActivity record);
+
+    int updateByPrimaryKey(ResourcePageMarketingActivity record);
+
+    void deleteByResourcePageId(@Param("resourcePageId") Long resourcePageId);
+
+    void batchInsert(@Param("records") List<ResourcePageMarketingActivity> records);
+
+    List<ResourcePageMarketingActivityVO> listByResourcePageId(@Param("resourcePageId") Long resourcePageId);
+}
\ No newline at end of file

pcloud-service-book/src/main/java/com/pcloud/book/group/vo/ResourceColumnAndServeVO.java

@@ -107,4 +107,19 @@ public class ResourceColumnAndServeVO extends BaseDto{
      * 背景图地址
      */
     private String backgroundUrl;
+
+    /**
+     * 标题颜色
+     */
+    private String columnTitleColor;
+
+    /**
+     * 标题背景图
+     */
+    private String columnTitleBg;
+
+    /**
+     * 查看更多位置 【0标题后】【1列表后】
+     */
+    private Integer showPosition;
 }

pcloud-service-book/src/main/java/com/pcloud/book/group/vo/ResourcePageFolderItemVO.java

+package com.pcloud.book.group.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class ResourcePageFolderItemVO extends ResourcePageItemVO {
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 通用组件资源id
+     */
+    private Long folderId;
+
+    /**
+     * 资源页id
+     */
+    private Long resourcePageId;
+
+    /**
+     * 资源栏目id
+     */
+    private Long resourcePageColumnId;
+
+    /**
+     * 资源id
+     */
+    private Long serveId;
+
+    /**
+     * 资源类型
+     */
+    private String serveType;
+
+    /**
+     * 链接url
+     */
+    private String linkUrl;
+
+    /**
+     * 资源类型
+     */
+    private String typeCode;
+
+    /**
+     * 排序值
+     */
+    private Integer seqNum;
+
+    /**
+     * 是否展示
+     */
+    private Integer isShow;
+
+    /**
+     * 二维码引导关注文案
+     */
+    private String guideContent;
+
+    /**
+     * 二维码logo链接
+     */
+    private String logoUrl;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 创建人
+     */
+    private Long createUser;
+
+    /**
+     * 二维码来源；0：默认公众号；1：自定义
+     */
+    private Integer qrcodeSource;
+
+    /**
+     * 二维码展示方式（1平铺2弹窗）
+     */
+    private Integer qrcodeShowType;
+
+    /**
+     * 二维码公众号id
+     */
+    private Long accountSettingId;
+
+    /**
+     * 自定义大图
+     */
+    private String selfBigPic;
+
+    /**
+     * 自定义小图
+     */
+    private String selfSmallPic;
+
+    private String selfServeName;
+
+    /**
+     * 书刊链接来源（1当当2京东3拼多多）
+     */
+    private Integer linkFrom;
+}

pcloud-service-book/src/main/java/com/pcloud/book/group/vo/ResourcePageFolderVO.java

+package com.pcloud.book.group.vo;
+
+import com.pcloud.book.group.entity.ResourcePageFolder;
+import com.pcloud.book.group.entity.ResourcePageFolderItem;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class ResourcePageFolderVO extends ResourcePageFolder implements Serializable {
+    private static final long serialVersionUID = 7842343942101042009L;
+
+    private List<ResourcePageFolderItemVO> folderItemList;
+}

pcloud-service-book/src/main/java/com/pcloud/book/group/vo/ResourcePageItemVO.java

@@ -10,6 +10,8 @@ import com.pcloud.common.dto.BaseDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @ClassName com.pcloud.book.group.vo.ResourcePageItemVO
  * @Author zhuyajie
@@ -150,4 +152,12 @@ public class ResourcePageItemVO extends BaseDto{
 
     @ApiModelProperty("版权保护状态")
     private Boolean bookAuthState;
+
+    private ResourcePageFolderVO resourcePageFolder;
+
+    private Integer columnSeq;
+
+    private Integer folderNum;
+
+    private Integer serveNum;
 }

pcloud-service-book/src/main/java/com/pcloud/book/group/vo/ResourcePageMarketingActivityVO.java

+package com.pcloud.book.group.vo;
+
+import com.pcloud.promotion.couponsnew.dto.CouponsNewDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ResourcePageMarketingActivityVO extends ResourcePageItemVO {
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 资源页ID
+     */
+    private Long resourcePageId;
+
+    /**
+     * 类型 0会员 1优惠券
+     */
+    private Integer type;
+
+    /**
+     * 宣传文案
+     */
+    private String content;
+
+    /**
+     * 配图
+     */
+    private String img;
+
+    /**
+     * 会员应用/优惠券ID
+     */
+    private Long serveId;
+
+    /**
+     * 资源类型
+     */
+    private String serveType;
+
+    /**
+     * 跳转地址
+     */
+    private String linkUrl;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 创建人
+     */
+    private Long createUser;
+
+    private CouponsNewDto couponsNewDto;
+
+}

pcloud-service-book/src/main/java/com/pcloud/book/group/vo/ResourcePageVO.java

@@ -3,12 +3,11 @@ package com.pcloud.book.group.vo;
 import com.pcloud.book.group.entity.ResourcePageModel;
 import com.pcloud.book.group.entity.ResourcePageNavigation;
 import com.pcloud.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModelProperty;
-import java.util.List;
-
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 自有码H5页面(ResourcePage)实体类
  *
@@ -144,4 +143,26 @@ public class ResourcePageVO extends BaseDto {
 
     @ApiModelProperty("图书标准服务")
     private List<ResourcePageModel> resourcePageModelList;
+    @ApiModelProperty("图书标准服务")
+    private List<ResourcePageMarketingActivityVO> resourcePageMarketingActivityList;
+
+    /**
+     * 展示我的页面
+     */
+    private Boolean showSelf;
+
+    /**
+     * 展示收藏
+     */
+    private Boolean showCollect;
+
+    /**
+     * 展示分享
+     */
+    private Boolean showShare;
+
+    /**
+     * 新版编辑器
+     */
+    private Boolean newEditor;
 }

pcloud-service-book/src/main/java/com/pcloud/book/group/vo/UpdateResourceColumnVO.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import javax.validation.constraints.NotNull;
 
+import com.pcloud.book.group.entity.ResourcePageFolder;
 import lombok.Data;
 
 /**
@@ -84,4 +85,19 @@ public class UpdateResourceColumnVO {
      * 背景图地址
      */
     private String backgroundUrl;
+
+    /**
+     * 标题颜色
+     */
+    private String columnTitleColor;
+
+    /**
+     * 标题背景图
+     */
+    private String columnTitleBg;
+
+    /**
+     * 查看更多位置 【0标题后】【1列表后】
+     */
+    private Integer showPosition;
 }

pcloud-service-book/src/main/java/com/pcloud/book/group/vo/UpdateResourcePageVO.java

@@ -5,6 +5,7 @@ import java.util.List;
 import javax.validation.constraints.NotNull;
 
 import com.pcloud.book.group.entity.ResourcePageBookstore;
+import com.pcloud.book.group.entity.ResourcePageMarketingActivity;
 import com.pcloud.book.group.entity.ResourcePageModel;
 
 import io.swagger.annotations.ApiModelProperty;
@@ -68,6 +69,10 @@ public class UpdateResourcePageVO {
 
     @ApiModelProperty("优惠券")
     private List<ResourcePageBookstore> resourcePageCouponList;
+
+    @ApiModelProperty("营销活动")
+    private List<ResourcePageMarketingActivity> resourcePageMarketingActivityList;
+
     /**
      * 字体颜色
      */
@@ -98,4 +103,29 @@ public class UpdateResourcePageVO {
 
     @ApiModelProperty("图书标准服务")
     private List<ResourcePageModel> resourcePageModelList;
+
+    /**
+     * 纯色背景颜色
+     */
+    private String bgColor;
+
+    /**
+     * 展示我的页面
+     */
+    private Boolean showSelf;
+
+    /**
+     * 展示收藏
+     */
+    private Boolean showCollect;
+
+    /**
+     * 展示分享
+     */
+    private Boolean showShare;
+
+    /**
+     * 新版编辑器
+     */
+    private Boolean newEditor;
 }

pcloud-service-book/src/main/resources/mapper/group/ResourcePageColumnDao.xml

@@ -18,6 +18,9 @@
         <result property="navigationId" column="navigation_id" jdbcType="INTEGER"/>
         <result property="backgroundType" column="background_type" jdbcType="INTEGER"/>
         <result property="backgroundUrl" column="background_url" jdbcType="VARCHAR"/>
+        <result property="columnTitleColor" column="column_title_color" jdbcType="VARCHAR"/>
+        <result property="columnTitleBg" column="column_title_bg" jdbcType="VARCHAR"/>
+        <result property="showPosition" column="show_position" jdbcType="VARCHAR"/>
     </resultMap>
 
     <resultMap id="ResourceColumnAndServe" type="com.pcloud.book.group.vo.ResourceColumnAndServeVO">
@@ -33,12 +36,16 @@
         <result property="navigationId" column="navigation_id" jdbcType="INTEGER"/>
         <result property="backgroundType" column="background_type" jdbcType="INTEGER"/>
         <result property="backgroundUrl" column="background_url" jdbcType="VARCHAR"/>
+        <result property="columnTitleColor" column="column_title_color" jdbcType="VARCHAR"/>
+        <result property="columnTitleBg" column="column_title_bg" jdbcType="VARCHAR"/>
+        <result property="showPosition" column="show_position" jdbcType="VARCHAR"/>
     </resultMap>
 
     <!--查询单个-->
     <select id="getById" resultMap="ResourcePageColumnMap">
         select
-          id, resource_page_id, column_type, column_name, column_format, column_seq, show_more,show_count, create_time, label_icon, navigation_id,background_type,background_url
+        id, resource_page_id, column_type, column_name, column_format, column_seq, show_more,show_count, create_time, label_icon,
+        navigation_id,background_type,background_url,column_title_color, column_title_bg, show_position
         from book.resource_page_column
         where id = #{id}
     </select>
@@ -46,9 +53,11 @@
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
         insert into book.resource_page_column(resource_page_id, column_type, column_name, column_format, column_seq,
-         show_more, show_count, create_time, update_time, create_user, label_icon, navigation_id,background_type,background_url)
+         show_more, show_count, create_time, update_time, create_user, label_icon, navigation_id,background_type,background_url
+        ,column_title_color, column_title_bg, show_position)
         values (#{resourcePageId}, #{columnType}, #{columnName}, #{columnFormat}, #{columnSeq},
-        #{showMore}, #{showCount}, now(), now(), #{createUser}, #{labelIcon}, #{navigationId},#{backgroundType}, #{backgroundUrl})
+        #{showMore}, #{showCount}, now(), now(), #{createUser}, #{labelIcon}, #{navigationId},#{backgroundType}, #{backgroundUrl},
+        #{columnTitleColor},#{columnTitleBg},#{showPosition})
     </insert>
 
     <!--通过主键修改数据-->
@@ -58,9 +67,9 @@
             <if test="columnType != null">
                 column_type = #{columnType},
             </if>
-            <if test="columnName != null and columnName != ''">
+<!--            <if test="columnName != null and columnName != ''">-->
                 column_name = #{columnName},
-            </if>
+<!--            </if>-->
             <if test="columnFormat != null">
                 column_format = #{columnFormat},
             </if>
@@ -84,6 +93,15 @@
             <if test="backgroundUrl != null">
                 background_url = #{backgroundUrl},
             </if>
+            <if test="columnTitleColor != null">
+                column_title_color = #{columnTitleColor},
+            </if>
+            <if test="columnTitleBg != null">
+                column_title_bg = #{columnTitleBg},
+            </if>
+            <if test="showPosition != null">
+                show_position = #{showPosition},
+            </if>
         </set>
         where id = #{id}
     </update>
@@ -117,7 +135,10 @@
         label_icon,
         navigation_id,
         background_type,
-        background_url
+        background_url,
+        column_title_color,
+        column_title_bg,
+        show_position
         FROM
             resource_page_column
         WHERE
@@ -147,7 +168,8 @@
 
     <select id="getByColumnTypeAndPage" parameterType="map" resultMap="ResourcePageColumnMap">
          select
-          id, resource_page_id, column_type, column_name, column_format, column_seq, show_more, show_count, create_time, navigation_id, background_type, background_url
+          id, resource_page_id, column_type, column_name, column_format, column_seq, show_more, show_count, create_time, navigation_id, background_type, background_url,
+        column_title_color, column_title_bg, show_position
         from book.resource_page_column
         where resource_page_id = #{resourcePageId}
         and column_type = #{columnType}
@@ -162,7 +184,8 @@
 
     <select id="getColumByMoveType" parameterType="map" resultMap="ResourcePageColumnMap">
         SELECT
-        id, resource_page_id, column_type, column_name, column_format, column_seq, show_more, show_count, create_time, navigation_id,background_type, background_url
+        id, resource_page_id, column_type, column_name, column_format, column_seq, show_more, show_count, create_time, navigation_id,background_type, background_url,
+        column_title_color, column_title_bg, show_position
         FROM
         book.resource_page_column
         WHERE
@@ -206,7 +229,8 @@
 
     <select id="getByNavigation" resultMap="ResourcePageColumnMap" parameterType="long">
          select
-          id, resource_page_id, column_type, column_name, column_format, column_seq, show_more,show_count, create_time, label_icon, navigation_id, background_type, background_url
+          id, resource_page_id, column_type, column_name, column_format, column_seq, show_more,show_count, create_time, label_icon, navigation_id, background_type, background_url,
+        column_title_color, column_title_bg, show_position
         from book.resource_page_column
         where navigation_id = #{navigationId}
     </select>

pcloud-service-book/src/main/resources/mapper/group/ResourcePageDao.xml

@@ -28,12 +28,14 @@
         <result property="transparency" column="transparency" jdbcType="INTEGER"/>
         <result property="navigationJumpType" column="navigation_jump_type" jdbcType="INTEGER"/>
         <result property="isShowPrice" column="is_show_price" jdbcType="TINYINT"/>
+        <result property="bgColor" column="bg_color" jdbcType="VARCHAR"/>
+        <result property="switchConfig" column="switch_config" jdbcType="INTEGER"/>
     </resultMap>
 
     <sql id="Base_Column_List">
          id, book_group_id, style, show_book, open_rays, open_food, create_time, update_time, create_user, qrcode_url, scene_id, official_scene_id,
           book_cover, book_id, channel_id, background_img, navigation_color, navigation_format, font_color,watermark, watermark_style, landing_page_type
-         ,transparency, navigation_jump_type, is_show_price
+         ,transparency, navigation_jump_type, is_show_price, bg_color, switch_config
     </sql>
 
     <!--查询单个-->
@@ -48,9 +50,10 @@
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
         insert into book.resource_page(book_group_id, style, show_book, open_rays, open_food, create_time, update_time, create_user,
-         qrcode_url, scene_id, book_cover, book_id, channel_id, background_img, font_color, watermark, watermark_style, landing_page_type, transparency, navigation_jump_type)
+         qrcode_url, scene_id, book_cover, book_id, channel_id, background_img, font_color, watermark, watermark_style, landing_page_type, transparency, navigation_jump_type, bg_color, switch_config)
         values (#{bookGroupId}, #{style}, #{showBook}, #{openRays}, IFNULL(#{openFood},0), now(), now(), #{createUser}, #{qrcodeUrl}, #{sceneId}, #{bookCover},
-        #{bookId}, #{channelId}, #{backgroundImg}, #{fontColor}, #{watermark}, #{watermarkStyle}, IFNULL(#{landingPageType},1), IFNULL(#{transparency},0), IFNULL(#{navigationJumpType},1))
+        #{bookId}, #{channelId}, #{backgroundImg}, #{fontColor}, #{watermark}, #{watermarkStyle}, IFNULL(#{landingPageType},1), IFNULL(#{transparency},0), IFNULL(#{navigationJumpType},1), #{bgColor}
+        ,#{switchConfig})
     </insert>
 
     <!--通过主键修改数据-->
@@ -84,12 +87,22 @@
             <if test="channelId != null">
                 channel_id = #{channelId},
             </if>
+            <if test="bookCover != null">
                 book_cover = #{bookCover},
-                update_time = NOW(),
+            </if>
+            update_time = NOW(),
+            <if test="backgroundImg != null">
                 background_img = #{backgroundImg},
+            </if>
+            <if test="fontColor != null">
                 font_color = #{fontColor},
-                 watermark =  #{watermark},
+            </if>
+            <if test="watermark != null">
+                watermark = #{watermark},
+            </if>
+            <if test="watermarkStyle != null">
                 watermark_style = #{watermarkStyle},
+            </if>
             <if test="landingPageType != null">
                 landing_page_type = #{landingPageType},
             </if>
@@ -102,6 +115,12 @@
             <if test="isShowPrice != null">
                 is_show_price = #{isShowPrice},
             </if>
+            <if test="bgColor != null">
+                bg_color = #{bgColor},
+            </if>
+            <if test="switchConfig != null">
+                switch_config = #{switchConfig},
+            </if>
         </set>
         where id = #{id}
     </update>
@@ -136,7 +155,9 @@
         p.transparency,
         p.navigation_jump_type,
         p.is_show_price,
-        p.landing_page_type
+        p.landing_page_type,
+        p.bg_color,
+        p.switch_config
         FROM
         resource_page p
         LEFT JOIN resource_page_item i ON p.id = i.resource_page_id
@@ -173,7 +194,7 @@
 
     <select id="getPageByOfficialScene" parameterType="long" resultMap="ResourcePageMap">
         select
-        id, book_group_id, style, show_book, open_rays, open_food, qrcode_url, scene_id, official_scene_id, book_cover,transparency
+        id, book_group_id, style, show_book, open_rays, open_food, qrcode_url, scene_id, official_scene_id, book_cover,transparency,bg_color,switch_config
         from book.resource_page
         where official_scene_id = #{officialSceneId}
         limit 1
@@ -215,7 +236,9 @@
         p.scene_id,
         p.book_cover,
         p.official_scene_id,
-        p.transparency
+        p.transparency,
+        p.bg_color,
+        p.switch_config
     FROM
         resource_page_column c
     LEFT JOIN resource_page p ON c.resource_page_id = p.id

pcloud-service-book/src/main/resources/mapper/group/ResourcePageFolderMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.pcloud.book.group.mapper.ResourcePageFolderMapper">
+    <resultMap id="BaseResultMap" type="com.pcloud.book.group.entity.ResourcePageFolder">
+        <id column="id" jdbcType="BIGINT" property="id"/>
+        <result column="resource_page_id" jdbcType="BIGINT" property="resourcePageId"/>
+        <result column="resource_page_column_id" jdbcType="BIGINT" property="resourcePageColumnId"/>
+        <result column="title" jdbcType="VARCHAR" property="title"/>
+        <result column="sub_title" jdbcType="VARCHAR" property="subTitle"/>
+        <result column="icon" jdbcType="VARCHAR" property="icon"/>
+        <result column="jump_type" jdbcType="TINYINT" property="jumpType"/>
+        <result column="link_url" jdbcType="VARCHAR" property="linkUrl"/>
+        <result column="seq_num" jdbcType="INTEGER" property="seqNum"/>
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="create_user" jdbcType="BIGINT" property="createUser"/>
+    </resultMap>
+
+    <resultMap id="resourcePageFolderVO" type="com.pcloud.book.group.vo.ResourcePageFolderVO" extends="BaseResultMap">
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,
+        resource_page_id,
+        resource_page_column_id,
+        title,
+        sub_title,
+        icon,
+        jump_type,
+        link_url,
+        seq_num,
+        create_time,
+        update_time,
+        create_user
+    </sql>
+    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from resource_page_folder
+        where id = #{id,jdbcType=BIGINT}
+    </select>
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+        delete
+        from resource_page_folder
+        where id = #{id,jdbcType=BIGINT}
+    </delete>
+    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.pcloud.book.group.entity.ResourcePageFolder"
+            useGeneratedKeys="true">
+        insert into resource_page_folder (resource_page_id, resource_page_column_id,
+                                          title, sub_title, icon, jump_type,
+                                          link_url, seq_num, create_time,
+                                          update_time, create_user)
+        values (#{resourcePageId,jdbcType=BIGINT}, #{resourcePageColumnId,jdbcType=BIGINT},
+                #{title,jdbcType=VARCHAR}, #{subTitle,jdbcType=VARCHAR}, #{icon,jdbcType=VARCHAR}, #{jumpType,jdbcType=TINYINT},
+                #{linkUrl,jdbcType=VARCHAR}, #{seqNum,jdbcType=INTEGER}, now(),
+                now(), #{createUser,jdbcType=BIGINT})
+    </insert>
+    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.pcloud.book.group.entity.ResourcePageFolder"
+            useGeneratedKeys="true">
+        insert into resource_page_folder
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="resourcePageId != null">
+                resource_page_id,
+            </if>
+            <if test="resourcePageColumnId != null">
+                resource_page_column_id,
+            </if>
+            <if test="title != null and title != ''">
+                title,
+            </if>
+            <if test="subTitle != null and subTitle != ''">
+                sub_title,
+            </if>
+            <if test="icon != null and icon != ''">
+                icon,
+            </if>
+            <if test="jumpType != null">
+                jump_type,
+            </if>
+            <if test="linkUrl != null and linkUrl != ''">
+                link_url,
+            </if>
+            <if test="seqNum != null">
+                seq_num,
+            </if>
+            create_time,
+            update_time,
+            <if test="createUser != null">
+                create_user,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="resourcePageId != null">
+                #{resourcePageId,jdbcType=BIGINT},
+            </if>
+            <if test="resourcePageColumnId != null">
+                #{resourcePageColumnId,jdbcType=BIGINT},
+            </if>
+            <if test="title != null and title != ''">
+                #{title,jdbcType=VARCHAR},
+            </if>
+            <if test="subTitle != null and subTitle != ''">
+                #{subTitle,jdbcType=VARCHAR},
+            </if>
+            <if test="icon != null and icon != ''">
+                #{icon,jdbcType=VARCHAR},
+            </if>
+            <if test="jumpType != null">
+                #{jumpType,jdbcType=TINYINT},
+            </if>
+            <if test="linkUrl != null and linkUrl != ''">
+                #{linkUrl,jdbcType=VARCHAR},
+            </if>
+            <if test="seqNum != null">
+                #{seqNum,jdbcType=INTEGER},
+            </if>
+            now(),
+            now(),
+            <if test="createUser != null">
+                #{createUser,jdbcType=BIGINT},
+            </if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKeySelective" parameterType="com.pcloud.book.group.entity.ResourcePageFolder">
+        update resource_page_folder
+        <set>
+            <if test="resourcePageId != null">
+                resource_page_id = #{resourcePageId,jdbcType=BIGINT},
+            </if>
+            <if test="resourcePageColumnId != null">
+                resource_page_column_id = #{resourcePageColumnId,jdbcType=BIGINT},
+            </if>
+            <if test="title != null and title != ''">
+                title = #{title,jdbcType=VARCHAR},
+            </if>
+            <if test="subTitle != null and subTitle != ''">
+                sub_title = #{subTitle,jdbcType=VARCHAR},
+            </if>
+            <if test="icon != null and icon != ''">
+                sub_title = #{icon,jdbcType=VARCHAR},
+            </if>
+            <if test="jumpType != null">
+                jump_type = #{jumpType,jdbcType=TINYINT},
+            </if>
+            <if test="linkUrl != null and linkUrl != ''">
+                link_url = #{linkUrl,jdbcType=VARCHAR},
+            </if>
+            <if test="seqNum != null">
+                seq_num = #{seqNum,jdbcType=INTEGER},
+            </if>
+            update_time = now(),
+            <if test="createUser != null">
+                create_user = #{createUser,jdbcType=BIGINT},
+            </if>
+        </set>
+        where id = #{id,jdbcType=BIGINT}
+    </update>
+    <update id="updateByPrimaryKey" parameterType="com.pcloud.book.group.entity.ResourcePageFolder">
+        update resource_page_folder
+        set resource_page_id        = #{resourcePageId,jdbcType=BIGINT},
+            resource_page_column_id = #{resourcePageColumnId,jdbcType=BIGINT},
+            title                   = #{title,jdbcType=VARCHAR},
+            sub_title               = #{subTitle,jdbcType=VARCHAR},
+            icon                    = #{icon,jdbcType=VARCHAR},
+            jump_type               = #{jumpType,jdbcType=TINYINT},
+            link_url                = #{linkUrl,jdbcType=VARCHAR},
+            seq_num                 = #{seqNum,jdbcType=INTEGER},
+            update_time             = now(),
+            create_user             = #{createUser,jdbcType=BIGINT}
+        where id = #{id,jdbcType=BIGINT}
+    </update>
+
+    <delete id="deleteByColumnIds">
+        delete
+        from resource_page_folder
+        where resource_page_column_id in
+        <foreach collection="columnIds" open="(" item="it" separator="," close=")">
+            #{it,jdbcType=BIGINT}
+        </foreach>
+    </delete>
+
+    <select id="selectByPrimaryKeys" resultMap="resourcePageFolderVO">
+        select
+        <include refid="Base_Column_List"/>
+        from resource_page_folder
+        where id in
+        <foreach collection="ids" open="(" item="it" separator="," close=")">
+            #{it,jdbcType=BIGINT}
+        </foreach>
+    </select>
+</mapper>
\ No newline at end of file

pcloud-service-book/src/main/resources/mapper/group/ResourcePageItemDao.xml

@@ -436,7 +436,8 @@
         p.create_user createUser,
         i.type_code typeCode,
         p.scene_id sceneId,
-        i.resource_page_id resourcePageId
+        i.resource_page_id resourcePageId,
+        c.column_seq columnSeq
         FROM
         resource_page_item i
         LEFT JOIN resource_page p ON i.resource_page_id = p.id

pcloud-service-book/src/main/resources/mapper/group/ResourcePageMarketingActivityMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.pcloud.book.group.mapper.ResourcePageMarketingActivityMapper">
+    <resultMap id="BaseResultMap" type="com.pcloud.book.group.entity.ResourcePageMarketingActivity">
+        <id column="id" jdbcType="BIGINT" property="id"/>
+        <result column="resource_page_id" jdbcType="BIGINT" property="resourcePageId"/>
+        <result column="type" jdbcType="TINYINT" property="type"/>
+        <result column="content" jdbcType="VARCHAR" property="content"/>
+        <result column="img" jdbcType="VARCHAR" property="img"/>
+        <result column="serve_id" jdbcType="BIGINT" property="serveId"/>
+        <result column="serve_type" jdbcType="VARCHAR" property="serveType"/>
+        <result column="link_url" jdbcType="VARCHAR" property="linkUrl"/>
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="create_user" jdbcType="BIGINT" property="createUser"/>
+    </resultMap>
+    <resultMap id="resourcePageMarketingActivityVO" type="com.pcloud.book.group.vo.ResourcePageMarketingActivityVO" extends="BaseResultMap">
+    </resultMap>
+    <sql id="Base_Column_List">
+        id,
+        resource_page_id,
+        `type`,
+        content,
+        img,
+        serve_id,
+        serve_type,
+        link_url,
+        create_time,
+        update_time,
+        create_user
+    </sql>
+    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from resource_page_marketing_activity
+        where id = #{id,jdbcType=BIGINT}
+    </select>
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+        delete
+        from resource_page_marketing_activity
+        where id = #{id,jdbcType=BIGINT}
+    </delete>
+    <insert id="insert" parameterType="com.pcloud.book.group.entity.ResourcePageMarketingActivity">
+        insert into resource_page_marketing_activity (id, resource_page_id, `type`,
+                                                      content, img, serve_id,
+                                                      serve_type, link_url, create_time,
+                                                      update_time, create_user)
+        values (#{id,jdbcType=BIGINT}, #{resourcePageId,jdbcType=BIGINT}, #{type,jdbcType=TINYINT},
+                #{content,jdbcType=VARCHAR}, #{img,jdbcType=VARCHAR}, #{serveId,jdbcType=BIGINT},
+                #{serveType,jdbcType=VARCHAR}, #{linkUrl,jdbcType=VARCHAR}, now(),
+                now(), #{createUser,jdbcType=BIGINT})
+    </insert>
+    <insert id="insertSelective" parameterType="com.pcloud.book.group.entity.ResourcePageMarketingActivity">
+        insert into resource_page_marketing_activity
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                id,
+            </if>
+            <if test="resourcePageId != null">
+                resource_page_id,
+            </if>
+            <if test="type != null">
+                `type`,
+            </if>
+            <if test="content != null and content != ''">
+                content,
+            </if>
+            <if test="img != null and img != ''">
+                img,
+            </if>
+            <if test="serveId != null">
+                serve_id,
+            </if>
+            <if test="serveType != null and serveType != ''">
+                serve_type,
+            </if>
+            <if test="linkUrl != null and linkUrl != ''">
+                link_url,
+            </if>
+            create_time,
+            update_time,
+            <if test="createUser != null">
+                create_user,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                #{id,jdbcType=BIGINT},
+            </if>
+            <if test="resourcePageId != null">
+                #{resourcePageId,jdbcType=BIGINT},
+            </if>
+            <if test="type != null">
+                #{type,jdbcType=TINYINT},
+            </if>
+            <if test="content != null and content != ''">
+                #{content,jdbcType=VARCHAR},
+            </if>
+            <if test="img != null and img != ''">
+                #{img,jdbcType=VARCHAR},
+            </if>
+            <if test="serveId != null">
+                #{serveId,jdbcType=BIGINT},
+            </if>
+            <if test="serveType != null and serveType != ''">
+                #{serveType,jdbcType=VARCHAR},
+            </if>
+            <if test="linkUrl != null and linkUrl != ''">
+                #{linkUrl,jdbcType=VARCHAR},
+            </if>
+            now(),
+            now(),
+            <if test="createUser != null">
+                #{createUser,jdbcType=BIGINT},
+            </if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKeySelective" parameterType="com.pcloud.book.group.entity.ResourcePageMarketingActivity">
+        update resource_page_marketing_activity
+        <set>
+            <if test="resourcePageId != null">
+                resource_page_id = #{resourcePageId,jdbcType=BIGINT},
+            </if>
+            <if test="type != null">
+                `type` = #{type,jdbcType=TINYINT},
+            </if>
+            <if test="content != null and content != ''">
+                content = #{content,jdbcType=VARCHAR},
+            </if>
+            <if test="img != null and img != ''">
+                img = #{img,jdbcType=VARCHAR},
+            </if>
+            <if test="serveId != null">
+                serve_id = #{serveId,jdbcType=BIGINT},
+            </if>
+            <if test="serveType != null and serveType != ''">
+                serve_type = #{serveType,jdbcType=VARCHAR},
+            </if>
+            <if test="linkUrl != null and linkUrl != ''">
+                link_url = #{linkUrl,jdbcType=VARCHAR},
+            </if>
+            update_time = now(),
+            <if test="createUser != null">
+                create_user = #{createUser,jdbcType=BIGINT},
+            </if>
+        </set>
+        where id = #{id,jdbcType=BIGINT}
+    </update>
+    <update id="updateByPrimaryKey" parameterType="com.pcloud.book.group.entity.ResourcePageMarketingActivity">
+        update resource_page_marketing_activity
+        set resource_page_id = #{resourcePageId,jdbcType=BIGINT},
+            `type`           = #{type,jdbcType=TINYINT},
+            content          = #{content,jdbcType=VARCHAR},
+            img              = #{img,jdbcType=VARCHAR},
+            serve_id         = #{serveId,jdbcType=BIGINT},
+            serve_type       = #{serveType,jdbcType=VARCHAR},
+            link_url         = #{linkUrl,jdbcType=VARCHAR},
+            update_time      = now(),
+            create_user      = #{createUser,jdbcType=BIGINT}
+        where id = #{id,jdbcType=BIGINT}
+    </update>
+
+    <insert id="batchInsert">
+        insert into resource_page_marketing_activity (id, resource_page_id, `type`,
+                                                      content, img, serve_id,
+                                                      serve_type, link_url, create_time,
+                                                      update_time, create_user)
+        values
+        <foreach collection="records" separator="," item="it">
+            (#{it.id,jdbcType=BIGINT}, #{it.resourcePageId,jdbcType=BIGINT}, #{it.type,jdbcType=TINYINT},
+             #{it.content,jdbcType=VARCHAR}, #{it.img,jdbcType=VARCHAR}, #{it.serveId,jdbcType=BIGINT},
+             #{it.serveType,jdbcType=VARCHAR}, #{it.linkUrl,jdbcType=VARCHAR}, now(),
+             now(), #{it.createUser,jdbcType=BIGINT})
+        </foreach>
+    </insert>
+
+    <delete id="deleteByResourcePageId">
+        delete
+        from resource_page_marketing_activity
+        where resource_page_id = #{resourcePageId,jdbcType=BIGINT}
+    </delete>
+
+    <select id="listByResourcePageId" resultMap="resourcePageMarketingActivityVO">
+        select
+        <include refid="Base_Column_List"/>
+        from resource_page_marketing_activity
+        where resource_page_id = #{resourcePageId,jdbcType=BIGINT}
+    </select>
+</mapper>
\ No newline at end of file