Merge branch 'feature/1006409' into 'master'

feat: [1006409] 自定义大小图标题

See merge request rays/pcloud-book!1501

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

@@ -1586,9 +1586,29 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
             fillQrcodeType(resourcePageColumn.getResourcePageId(), entry.getValue());
             fillResourceByType(entry.getValue(), wechatUserId, entry.getKey());
         }
+        //填充自定义图片
+        fillSelfPic(pageBeanNew.getRecordList());
         return pageBeanNew;
     }
 
+    private void fillSelfPic(List<ResourcePageItemVO> resourcePageItemVOList) {
+        if (ListUtils.isEmpty(resourcePageItemVOList)) {
+            return;
+        }
+         resourcePageItemVOList.stream().forEach(e -> {
+            if (!StringUtil.isEmpty(e.getSelfSmallPic())) {
+                e.setServePic(e.getSelfSmallPic());
+                e.setCoverImg(e.getSelfSmallPic());
+            }
+            if (!StringUtil.isEmpty(e.getSelfBigPic())) {
+                e.setTransverseImg(e.getSelfBigPic());
+            }
+            if (!StringUtil.isEmpty(e.getSelfServeName())) {
+                e.setServeName(e.getSelfServeName());
+            }
+        });
+    }
+
     @Override
     public ResourcePage getPageByBookGroupId(Long bookGroupId) {
         return resourcePageDao.getByBookGroupId(bookGroupId);
@@ -3450,15 +3470,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
         if (ListUtils.isEmpty(resourcePageItemVOList)) {
             return new ArrayList<>();
         }
-        resourcePageItemVOList.stream().forEach(e -> {
-            if (!StringUtil.isEmpty(e.getSelfSmallPic())) {
-                e.setServePic(e.getSelfSmallPic());
-                e.setCoverImg(e.getSelfSmallPic());
-            }
-            if (!StringUtil.isEmpty(e.getSelfBigPic())) {
-                e.setTransverseImg(e.getSelfBigPic());
-            }
-        });
+        fillSelfPic(resourcePageItemVOList);
         return resourceColumnAndServeVOS;
     }
 

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

@@ -79,4 +79,7 @@ public class ResourcePageItem extends BaseEntity {
 
     @ApiModelProperty("简介")
     private String selfSmallPic;
+
+    @ApiModelProperty("自定义标题")
+    private String selfServeName;
 }

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

@@ -134,4 +134,7 @@ public class ResourcePageItemVO extends BaseDto{
     private Integer shareState;
 
     private Long appCreateUser;
+
+    @ApiModelProperty("自定义标题")
+    private String selfServeName;
 }

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

@@ -22,12 +22,13 @@
         <result property="accountSettingId" column="account_setting_id" jdbcType="INTEGER"/>
         <result property="selfBigPic" column="self_big_pic" jdbcType="VARCHAR"/>
         <result property="selfSmallPic" column="self_small_pic" jdbcType="VARCHAR"/>
+        <result property="selfServeName" column="self_serve_name" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
          id, resource_page_id, resource_page_column_id, serve_id, serve_type, link_url, type_code, seq_num, is_show,
            guide_content, logo_url, create_time, qrcode_source, qrcode_show_type, account_setting_id,
-            self_big_pic, self_small_pic
+            self_big_pic, self_small_pic, self_serve_name
     </sql>
 
     <!--查询单个-->
@@ -42,22 +43,22 @@
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
         insert into book.resource_page_item(resource_page_id, resource_page_column_id, serve_id, serve_type, link_url, type_code,
         seq_num, is_show, guide_content, logo_url, create_time, update_time, create_user, qrcode_source,
-        qrcode_show_type, account_setting_id, self_big_pic, self_small_pic)
+        qrcode_show_type, account_setting_id, self_big_pic, self_small_pic, self_serve_name)
         values (#{resourcePageId}, #{resourcePageColumnId}, #{serveId}, #{serveType}, #{linkUrl}, #{typeCode},
          #{seqNum}, #{isShow}, #{guideContent}, #{logoUrl}, now(), now(), #{createUser}, #{qrcodeSource},
-         #{qrcodeShowType}, #{accountSettingId}, #{selfBigPic}, #{selfSmallPic})
+         #{qrcodeShowType}, #{accountSettingId}, #{selfBigPic}, #{selfSmallPic}, #{selfServeName})
     </insert>
 
     <insert id="batchInsert" keyProperty="id" useGeneratedKeys="true">
         insert into book.resource_page_item(resource_page_id, resource_page_column_id, serve_id, serve_type,
         link_url, type_code, seq_num, is_show, guide_content, logo_url,
-        create_time, update_time, create_user, qrcode_source, qrcode_show_type, account_setting_id, self_big_pic, self_small_pic)
+        create_time, update_time, create_user, qrcode_source, qrcode_show_type, account_setting_id, self_big_pic, self_small_pic, self_serve_name)
         values
         <foreach collection="list" separator="," index="index" item="item">
             (#{item.resourcePageId}, #{item.resourcePageColumnId}, #{item.serveId}, #{item.serveType},
             #{item.linkUrl}, #{item.typeCode}, #{item.seqNum}, #{item.isShow}, #{item.guideContent}, #{item.logoUrl},
             now(), now(), #{item.createUser}, #{item.qrcodeSource}, #{item.qrcodeShowType}, #{item.accountSettingId},
-            #{item.selfBigPic}, #{item.selfSmallPic})
+            #{item.selfBigPic}, #{item.selfSmallPic}, #{item.selfServeName})
         </foreach>
     </insert>
 
@@ -87,6 +88,9 @@
             <if test="selfSmallPic != null and selfSmallPic != ''">
                 self_small_pic = #{selfSmallPic},
             </if>
+            <if test="selfServeName != null and selfServeName != ''">
+                self_serve_name = #{selfServeName},
+            </if>
         </set>
         where id = #{id}
     </update>
@@ -111,7 +115,8 @@
             guide_content guideContent,
             create_user createUser,
             self_big_pic selfBigPic,
-            self_small_pic selfSmallPic
+            self_small_pic selfSmallPic,
+            self_serve_name selfServeName
         FROM
             resource_page_item
         WHERE
@@ -136,6 +141,7 @@
             account_setting_id accountSettingId,
             self_big_pic selfBigPic,
             self_small_pic selfSmallPic
+            self_serve_name selfServeName
         FROM
             resource_page_item
         WHERE
@@ -361,7 +367,8 @@
         qrcode_show_type qrcodeShowType,
         account_setting_id accountSettingId,
         self_big_pic selfBigPic,
-        self_small_pic selfSmallPic
+        self_small_pic selfSmallPic,
+        self_serve_name selfServeName
         FROM
         resource_page_item
         WHERE