Merge branch 'feature/rightsSettingDisplay' into 'master'

feat:[1003523] 可自定义配置显示权益板块高亮样式

See merge request rays/pcloud-book!935

pcloud-service-book/src/main/java/com/pcloud/book/rightsSetting/biz/impl/RightsSettingBizImpl.java

@@ -636,7 +636,10 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
         //校验数量
         rightsSettingCheck.checkRightNowTitles(rightsSettingTitleList);
         //给每个权益设置id
-        rightsSettingTitleList.forEach(e -> e.setRightsSettingId(rightsSettingId));
+        rightsSettingTitleList.forEach(e -> {
+            e.setRightsSettingId(rightsSettingId);
+            e.setDisplayType(e.getDisplayType()==null?0:e.getDisplayType());
+        });
         if (!ListUtils.isEmpty(rightsSettingTitleList)) {
             rightsSettingTitleMapper.batchInsert(rightsSettingTitleList);
         }
@@ -1721,6 +1724,7 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
             for (RightsSettingItem rightsSettingItem : rightsSettingItemList) {
                 rightsSettingItem.setRightsSettingId(rightsSettingId);
                 rightsSettingItem.setRightsType(rightsType);
+                rightsSettingItem.setDisplayType(rightsSettingItem.getDisplayType()==null?0:rightsSettingItem.getDisplayType());
             }
             rightsSettingItemDao.insert(rightsSettingItemList);
         }

pcloud-service-book/src/main/java/com/pcloud/book/rightsSetting/entity/RightsSettingItem.java

@@ -114,4 +114,7 @@ public class RightsSettingItem extends BaseEntity {
 
     @ApiModelProperty("外部书单列表")
     private List<AppletOuterBooklistDTO> outerBooklistDTOS;
+
+    @ApiModelProperty("客户端展示类型0默认")
+    private Integer displayType;
 }
\ No newline at end of file

pcloud-service-book/src/main/java/com/pcloud/book/rightsSetting/entity/RightsSettingTitle.java

@@ -2,6 +2,8 @@ package com.pcloud.book.rightsSetting.entity;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.pcloud.common.page.PageBeanNew;
+
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -64,4 +66,7 @@ public class RightsSettingTitle implements Serializable {
     private Integer collageState;
 
     private Integer seqNum;
+
+    @ApiModelProperty("客户端展示类型0默认")
+    private Integer displayType;
 }
\ No newline at end of file

pcloud-service-book/src/main/resources/mapper/rightssetting/RightsSettingItemMapper.xml

@@ -18,6 +18,7 @@
         <result property="efficientRead" column="efficient_read" jdbcType="TINYINT" />
         <result property="deepRead" column="deep_read" jdbcType="TINYINT" />
         <result property="collageState" column="collage_state" jdbcType="INTEGER" />
+        <result property="displayType" column="display_type" jdbcType="INTEGER" />
     </resultMap>
 
     <!--通过实体作为筛选条件查询-->
@@ -26,7 +27,8 @@
         i.id, i.rights_setting_id rightsSettingId,
         i.rights_type rightsType, i.rights_classify_id rightsClassifyId,
     i.description, i.create_time createTime, i.title,i.uuid,i.open_state openState,i.service_desc serviceDesc,i.serve_type serveType,
-        c.book_id bookId, i.easy_read easyRead,i.efficient_read efficientRead,i.deep_read deepRead,i.collage_state collageState
+        c.book_id bookId, i.easy_read easyRead,i.efficient_read efficientRead,i.deep_read deepRead,i.collage_state collageState,
+        i.display_type displayType
         from book.rights_setting_item i
         LEFT JOIN rights_setting c ON c.id=i.rights_setting_id
         <where>
@@ -62,7 +64,7 @@
         i.id, i.rights_setting_id rightsSettingId,
         i.rights_type rightsType, i.rights_classify_id rightsClassifyId,
         i.description, i.create_time createTime, i.title,i.uuid,i.open_state openState,i.service_desc serviceDesc,i.serve_type serveType,
-        c.book_id bookId, i.easy_read easyRead,i.efficient_read efficientRead,i.deep_read deepRead
+        c.book_id bookId, i.easy_read easyRead,i.efficient_read efficientRead,i.deep_read deepRead, i.display_type displayType
         from book.rights_setting_item i
         LEFT JOIN rights_setting c ON c.id=i.rights_setting_id
         <where>
@@ -108,9 +110,9 @@
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
         insert into book.rights_setting_item(rights_setting_id, rights_type, rights_classify_id, description, create_time,title,uuid,open_state,service_desc,serve_type,
-        easy_read,efficient_read,deep_read,collage_state)
+        easy_read,efficient_read,deep_read,collage_state,display_type)
         values (#{rightsSettingId}, #{rightsType}, #{rightsClassifyId}, #{description}, NOW(), #{title},#{uuid},#{openState},#{serviceDesc},#{serveType},
-        #{easyRead},#{efficientRead},#{deepRead},#{collageState})
+        #{easyRead},#{efficientRead},#{deepRead},#{collageState},#{displayType})
     </insert>
 
     <!--通过权益主键删除-->
@@ -126,7 +128,7 @@
     <insert id="batchInsert" useGeneratedKeys="true" parameterType="java.util.List">
         insert into book.rights_setting_item (
         rights_setting_id, rights_type, rights_classify_id, description, create_time,title,uuid,open_state,service_desc,serve_type,
-        easy_read,efficient_read,deep_read,collage_state
+        easy_read,efficient_read,deep_read,collage_state,display_type
         )
         values
         <foreach collection="list" item="item" index="index" separator="," >
@@ -142,7 +144,8 @@
             #{item.serviceDesc},
             #{item.serveType},
             #{item.easyRead},#{item.efficientRead},#{item.deepRead},
-            #{item.collageState}
+            #{item.collageState},
+            #{item.displayType}
             )
         </foreach>
     </insert>

pcloud-service-book/src/main/resources/mapper/rightssetting/RightsSettingTitleMapper.xml

@@ -16,12 +16,13 @@
     <result column="deep_read" jdbcType="TINYINT" property="deepRead" />
     <result column="seq_num" jdbcType="INTEGER" property="seqNum" />
     <result column="collage_state" jdbcType="TINYINT" property="collageState" />
+    <result column="display_type" jdbcType="INTEGER" property="displayType"/>
   </resultMap>
 
   <sql id="baseSql">
     id, rights_setting_id, rights_setting_title,
     rights_setting_desc, open_state, create_time,
-    update_time,rights_setting_now_type,serve_type,easy_read,efficient_read,deep_read,seq_num,collage_state
+    update_time,rights_setting_now_type,serve_type,easy_read,efficient_read,deep_read,seq_num,collage_state,display_type
   </sql>
   <insert id="insert" parameterType="com.pcloud.book.rightsSetting.entity.RightsSettingTitle">
     insert into rights_setting_title (id, rights_setting_id, rights_setting_title, 
@@ -99,12 +100,12 @@
   <insert id="batchInsert" parameterType="com.pcloud.book.rightsSetting.entity.RightsSettingTitle" useGeneratedKeys="true" keyProperty="id">
     insert into rights_setting_title (rights_setting_id, rights_setting_title,
     rights_setting_desc, open_state, create_time, update_time,rights_setting_now_type,serve_type,
-    easy_read,efficient_read,deep_read,seq_num, collage_state)
+    easy_read,efficient_read,deep_read,seq_num, collage_state,display_type)
     values
     <foreach collection="list" item="item" index="index" separator=",">
     (#{item.rightsSettingId,jdbcType=BIGINT}, #{item.rightsSettingTitle,jdbcType=VARCHAR},
     #{item.rightsSettingDesc,jdbcType=VARCHAR}, #{item.openState,jdbcType=TINYINT}, now(), now(),#{item.rightsSettingNowType},#{item.serveType},
-    #{item.easyRead},#{item.efficientRead},#{item.deepRead},#{item.seqNum}, #{item.collageState})
+    #{item.easyRead},#{item.efficientRead},#{item.deepRead},#{item.seqNum}, #{item.collageState}, #{item.displayType})
     </foreach>
   </insert>