Merge branch 'feature/1004736' into 'master'

feat: [1004736] RAYS码H5界面需增加图书封面图

See merge request rays/pcloud-book!1296

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

@@ -183,6 +183,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
             resourcePage.setStyle(updateResourcePageVO.getStyle());
             resourcePage.setOpenRays(updateResourcePageVO.getOpenRays());
             resourcePage.setShowBook(updateResourcePageVO.getShowBook());
+            resourcePage.setBookCover(updateResourcePageVO.getBookCover());
             resourcePageDao.update(resourcePage);
         }
         if (updateResourcePageVO.getOpenRays() == 1) {
@@ -221,6 +222,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
             resourcePage.setStyle(updateResourcePageVO.getStyle());
             resourcePage.setOpenRays(updateResourcePageVO.getOpenRays());
             resourcePage.setShowBook(updateResourcePageVO.getShowBook());
+            resourcePage.setBookCover(updateResourcePageVO.getBookCover());
             resourcePageDao.update(resourcePage);
         }
         if (updateResourcePageVO.getOpenRays() == 1) {
@@ -959,6 +961,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
             resourcePageVO.setStyle(resourcePage.getStyle());
             resourcePageVO.setQrcodeUrl(resourcePage.getQrcodeUrl());
             resourcePageVO.setId(resourcePage.getId());
+            resourcePageVO.setBookCover(resourcePage.getBookCover());
         }
         return resourcePageVO;
     }
@@ -990,6 +993,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
             resourcePageVO.setStyle(resourcePage.getStyle());
             resourcePageVO.setQrcodeUrl(resourcePage.getQrcodeUrl());
             resourcePageVO.setId(resourcePage.getId());
+            resourcePageVO.setBookCover(resourcePage.getBookCover());
         }
         return resourcePageVO;
     }

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

@@ -45,5 +45,9 @@ public class ResourcePage extends BaseEntity {
      * 公众号二维码id
      */
     private Long officialSceneId;
+    /**
+     * 自定义配置的图书封面
+     */
+    private String bookCover;
 
 }
\ No newline at end of file

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

@@ -65,4 +65,9 @@ public class ResourcePageVO extends BaseDto {
     private Integer collectState;
 
     private String qrcodeLink;
+
+    /**
+     * 自定义配置的图书封面
+     */
+    private String bookCover;
 }
\ No newline at end of file

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

@@ -44,4 +44,9 @@ public class UpdateResourcePageVO {
 
     @ApiModelProperty("栏目内容")
     private List<UpdateResourceColumnVO> columnVOS;
+
+    /**
+     * 自定义配置的图书封面
+     */
+    private String bookCover;
 }

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

@@ -14,12 +14,13 @@
         <result property="qrcodeUrl" column="qrcode_url" jdbcType="VARCHAR"/>
         <result property="sceneId" column="scene_id" jdbcType="INTEGER"/>
         <result property="officialSceneId" column="official_scene_id" jdbcType="INTEGER"/>
+        <result property="bookCover" column="book_cover" jdbcType="VARCHAR"/>
     </resultMap>
 
     <!--查询单个-->
     <select id="getById" resultMap="ResourcePageMap">
         select
-          id, book_group_id, style, show_book, open_rays, create_time, update_time, create_user, qrcode_url, scene_id, official_scene_id
+          id, book_group_id, style, show_book, open_rays, create_time, update_time, create_user, qrcode_url, scene_id, official_scene_id, book_cover
         from book.resource_page
         where id = #{id}
     </select>
@@ -28,8 +29,8 @@
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
         insert into book.resource_page(book_group_id, style, show_book, open_rays, create_time, update_time, create_user,
-         qrcode_url, scene_id)
-        values (#{bookGroupId}, #{style}, #{showBook}, #{openRays}, now(), now(), #{createUser}, #{qrcodeUrl}, #{sceneId})
+         qrcode_url, scene_id, book_cover)
+        values (#{bookGroupId}, #{style}, #{showBook}, #{openRays}, now(), now(), #{createUser}, #{qrcodeUrl}, #{sceneId}, #{bookCover})
     </insert>
 
     <!--通过主键修改数据-->
@@ -51,6 +52,7 @@
             <if test="qrcodeUrl != null">
                 qrcode_url = #{qrcodeUrl},
             </if>
+                book_cover = #{bookCover},
                 update_time = NOW(),
         </set>
         where id = #{id}
@@ -63,7 +65,7 @@
 
     <select id="getByBookGroupId" parameterType="long" resultMap="ResourcePageMap">
          select
-          id, book_group_id, style, show_book, open_rays, qrcode_url, official_scene_id
+          id, book_group_id, style, show_book, open_rays, qrcode_url, official_scene_id, book_cover
         from book.resource_page
         where book_group_id = #{bookGroupId}
         limit 1
@@ -75,6 +77,7 @@
             p.book_group_id,
             p.style,
             p.show_book,
+            p.book_cover,
             p.open_rays
         FROM
             resource_page p
@@ -119,7 +122,7 @@
 
     <select id="getBySceneId" parameterType="long" resultMap="ResourcePageMap">
         select
-        id, book_group_id, style, show_book, open_rays, qrcode_url, scene_id, official_scene_id
+        id, book_group_id, style, show_book, open_rays, qrcode_url, scene_id, official_scene_id, book_cover
         from book.resource_page
         where scene_id = #{sceneId}
         limit 1
@@ -127,7 +130,7 @@
 
     <select id="getPageByOfficialScene" parameterType="long" resultMap="ResourcePageMap">
         select
-        id, book_group_id, style, show_book, open_rays, qrcode_url, scene_id, official_scene_id
+        id, book_group_id, style, show_book, open_rays, qrcode_url, scene_id, official_scene_id, book_cover
         from book.resource_page
         where official_scene_id = #{officialSceneId}
         limit 1
@@ -176,6 +179,7 @@
         p.open_rays,
         p.qrcode_url,
         p.scene_id,
+        p.book_cover,
         p.official_scene_id
     FROM
         resource_page_column c