Merge branch 'feature/1005492' into 'master'

feat: [1005492] 出版社印章自定义

See merge request rays/pcloud-book!1427

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

@@ -270,6 +270,8 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
             this.checkOpenRays(resourcePage.getBookId(), updateResourcePageVO.getOpenRays());
             resourcePage.setBackgroundImg(updateResourcePageVO.getBackgroundImg());
             resourcePage.setFontColor(updateResourcePageVO.getFontColor());
+            resourcePage.setWatermark(updateResourcePageVO.getWatermark());
+            resourcePage.setWatermarkStyle(updateResourcePageVO.getWatermarkStyle());
             resourcePageDao.update(resourcePage);
         }
         if (updateResourcePageVO.getOpenRays() == 1) {
@@ -336,6 +338,8 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
             resourcePage.setBookId(null == dto?null:dto.getBookId());
             resourcePage.setChannelId(null == dto?null:dto.getChannelId());
             resourcePage.setFontColor(updateResourcePageVO.getFontColor());
+            resourcePage.setWatermark(updateResourcePageVO.getWatermark());
+            resourcePage.setWatermarkStyle(updateResourcePageVO.getWatermarkStyle());
             resourcePageDao.update(resourcePage);
         }
         if (updateResourcePageVO.getOpenRays() == 1) {
@@ -1617,6 +1621,8 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
             resourcePageVO.setNavigationColor(resourcePage.getNavigationColor());
             resourcePageVO.setNavigationFormat(resourcePage.getNavigationFormat());
             resourcePageVO.setFontColor(resourcePage.getFontColor());
+            resourcePageVO.setWatermark(resourcePage.getWatermark());
+            resourcePageVO.setWatermarkStyle(resourcePage.getWatermarkStyle());
         }
         return resourcePageVO;
     }
@@ -1661,6 +1667,9 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
             resourcePageVO.setNavigationColor(resourcePage.getNavigationColor());
             resourcePageVO.setNavigationFormat(resourcePage.getNavigationFormat());
             resourcePageVO.setFontColor(resourcePage.getFontColor());
+            resourcePageVO.setWatermark(resourcePage.getWatermark());
+            resourcePageVO.setWatermarkStyle(resourcePage.getWatermarkStyle());
+
         }
         return resourcePageVO;
     }

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

@@ -78,4 +78,13 @@ public class ResourcePage extends BaseEntity {
      * 字体颜色
      */
     private String fontColor;
+
+    /**
+     * 图书印章
+     */
+    private String watermark;
+    /**
+     * 图书印章样式
+     */
+    private Integer watermarkStyle;
 }

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

@@ -111,4 +111,13 @@ public class ResourcePageVO extends BaseDto {
      * 字体颜色
      */
     private String fontColor;
+
+    /**
+     * 图书印章
+     */
+    private String watermark;
+    /**
+     * 图书印章样式
+     */
+    private Integer watermarkStyle;
 }

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

@@ -6,6 +6,7 @@ import javax.validation.constraints.NotNull;
 
 import com.pcloud.book.group.entity.ResourcePageBookstore;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.auth.In;
 import lombok.Data;
 
 /**
@@ -66,4 +67,14 @@ public class UpdateResourcePageVO {
      * 字体颜色
      */
     private String fontColor;
+
+    /**
+     * 图书印章
+     */
+    private String watermark;
+
+    /**
+     * 图书印章样式
+     */
+    private Integer watermarkStyle;
 }

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

@@ -22,11 +22,13 @@
         <result property="navigationColor" column="navigation_color" jdbcType="INTEGER"/>
         <result property="navigationFormat" column="navigation_format" jdbcType="INTEGER"/>
         <result property="fontColor" column="font_color" jdbcType="VARCHAR"/>
+        <result property="watermark" column="watermark" jdbcType="VARCHAR"/>
+        <result property="watermarkStyle" column="watermark_style" jdbcType="TINYINT"/>
     </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
+          book_cover, book_id, channel_id, background_img, navigation_color, navigation_format, font_color,watermark, watermark_style
     </sql>
 
     <!--查询单个-->
@@ -41,9 +43,9 @@
     <!--新增所有列-->
     <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)
+         qrcode_url, scene_id, book_cover, book_id, channel_id, background_img, font_color, watermark, watermark_style)
         values (#{bookGroupId}, #{style}, #{showBook}, #{openRays}, IFNULL(#{openFood},0), now(), now(), #{createUser}, #{qrcodeUrl}, #{sceneId}, #{bookCover},
-        #{bookId}, #{channelId}, #{backgroundImg}, #{fontColor})
+        #{bookId}, #{channelId}, #{backgroundImg}, #{fontColor}, #{watermark}, #{watermarkStyle})
     </insert>
 
     <!--通过主键修改数据-->
@@ -81,6 +83,8 @@
                 update_time = NOW(),
                 background_img = #{backgroundImg},
                 font_color = #{fontColor},
+                 watermark =  #{watermark},
+                watermark_style = #{watermarkStyle}
         </set>
         where id = #{id}
     </update>