Merge branch 'feature/1006339' into 'master'

feat:[1006339]图书标准服务

See merge request rays/pcloud-book!1529

pcloud-service-book/src/main/java/com/pcloud/book/consumer/app/AppConsr.java

@@ -318,4 +318,20 @@ public class AppConsr {
 		}
 		return null;
 	}
+
+
+	@ParamLog("RAYS应用")
+	public Map<String, AppRaysDTO> mapRaysAppByType(List<String> typeCodes) {
+		Map<String, AppRaysDTO> map = new HashMap<>();
+		if (ListUtils.isEmpty(typeCodes)) {
+			return map;
+		}
+		try {
+			map = ResponseHandleUtil.parseMapResponse(appService.mapRaysAppByType(typeCodes), String.class, AppRaysDTO.class);
+
+		} catch (Exception e) {
+			LOGGER.error("调用失败" + e.getMessage(), e);
+		}
+		return map;
+	}
 }

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

@@ -382,6 +382,7 @@ public class ResourcePageConstants {
     //小程序默认导航，书友互助、阅读打卡
     public static List<Integer> APPLET_DEFAULT_NAVIGATIONS = Arrays.asList(ResourcePageConstants.NavigationTypeEnum.APPLET_QA.getCode(),
             ResourcePageConstants.NavigationTypeEnum.CLOCK.getCode());
+    public static List<String> APPLET_DEFAULT_TYPECODES = Arrays.asList("APPLET_QA","APPLET_CLOCK");
     /**
      * H5-公众号二维码展示方式
      * @author：zhuyajie

pcloud-service-book/src/main/java/com/pcloud/book/group/dao/ResourcePageModelDao.java

+package com.pcloud.book.group.dao;
+
+import com.pcloud.book.group.entity.ResourcePageModel;
+import com.pcloud.common.core.dao.BaseDao;
+
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
+/**
+ * 图书标准服务(ResourcePageModel)表数据库访问层
+ *
+ * @author 
+ * @since 2022-01-15 15:16:45
+ */
+public interface ResourcePageModelDao extends BaseDao<ResourcePageModel> {
+
+
+    List<ResourcePageModel> getByPaegId(Long resourcePageId);
+
+
+    void deleteByPageId(Long resourcePageId);
+
+    void deleteByPageIdAndTypeCode(Long resourcePageId, List<String> typeCodes);
+}
+

pcloud-service-book/src/main/java/com/pcloud/book/group/dao/impl/ResourcePageModelDaoImpl.java

+package com.pcloud.book.group.dao.impl;
+
+import com.pcloud.book.group.dao.ResourcePageModelDao;
+import com.pcloud.book.group.entity.ResourcePageModel;
+import com.pcloud.common.core.dao.BaseDaoImpl;
+
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName com.pcloud.book.group.dao.impl.ResourcePageModelDaoImpl
+ * @Author zhuyajie
+ * @Description 图书标准服务
+ * @Date 2022/1/15 15:18
+ **/
+@Component
+public class ResourcePageModelDaoImpl extends BaseDaoImpl<ResourcePageModel> implements ResourcePageModelDao {
+    @Override
+    public List<ResourcePageModel> getByPaegId(Long resourcePageId) {
+        return getSessionTemplate().selectList(getStatement("getByPaegId"), resourcePageId);
+    }
+
+    @Override
+    public void deleteByPageId(Long resourcePageId) {
+        getSessionTemplate().delete(getStatement("deleteByPageId"), resourcePageId);
+    }
+
+    @Override
+    public void deleteByPageIdAndTypeCode(Long resourcePageId, List<String> typeCodes) {
+        Map<String,Object> map = new HashMap<>();
+        map.put("resourcePageId", resourcePageId);
+        map.put("typeCodes", typeCodes);
+        getSessionTemplate().delete(getStatement("deleteByPageIdAndTypeCode"), map);
+    }
+}

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

+package com.pcloud.book.group.entity;
+
+import com.pcloud.common.entity.BaseEntity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 图书标准服务(ResourcePageModel)实体类
+ *
+ * @author 
+ * @since 2022-01-15 15:16:45
+ */
+@Data
+public class ResourcePageModel extends BaseEntity {
+    private static final long serialVersionUID = -99572890424146893L;
+    /**
+     * 主键
+     */
+    private Long id;
+    /**
+     * h5页id
+     */
+    private Long resourcePageId;
+    /**
+     * 资源标题
+     */
+    private String serveTitle;
+    /**
+     * 资源图标
+     */
+    private String serveIcon;
+    /**
+     * 资源id
+     */
+    private Long serveId;
+    /**
+     * 资源类型
+     */
+    private String serveType;
+    /**
+     * 链接url
+     */
+    private String linkUrl;
+    /**
+     * 资源类型
+     */
+    private String typeCode;
+    /**
+     * 创建人
+     */
+    private Long createUser;
+    /**
+     * 是否自定义
+     **/
+    private Integer selfSet;
+
+    @ApiModelProperty("应用或作品类型名称")
+    private String typeName;
+
+    @ApiModelProperty("是否第三方链接")
+    private Boolean hasThirdLink;
+
+    @ApiModelProperty("跳转结果链接")
+    private String resultUrl;
+
+
+    @ApiModelProperty("是否配置了公众号工具")
+    private Boolean hasOfficialAccountsTool;
+
+
+    /**
+     * 资源名称
+     */
+    private String serveName;
+    /**
+     * 资源封面
+     */
+    private String servePic;
+}
+

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

 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;
 
@@ -140,4 +141,7 @@ public class ResourcePageVO extends BaseDto {
      * 是否展示价格
      */
     private Integer isShowPrice;
+
+    @ApiModelProperty("图书标准服务")
+    private List<ResourcePageModel> resourcePageModelList;
 }

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

@@ -5,6 +5,8 @@ import java.util.List;
 import javax.validation.constraints.NotNull;
 
 import com.pcloud.book.group.entity.ResourcePageBookstore;
+import com.pcloud.book.group.entity.ResourcePageModel;
+
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.models.auth.In;
 import lombok.Data;
@@ -93,4 +95,7 @@ public class UpdateResourcePageVO {
      * 是否展示价格
      */
     private Integer isShowPrice;
+
+    @ApiModelProperty("图书标准服务")
+    private List<ResourcePageModel> resourcePageModelList;
 }

pcloud-service-book/src/main/resources/mapper/group/ResourcePageModelDao.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.dao.impl.ResourcePageModelDaoImpl">
+
+    <resultMap type="com.pcloud.book.group.entity.ResourcePageModel" id="ResourcePageModelMap">
+        <result property="id" column="id" jdbcType="INTEGER"/>
+        <result property="resourcePageId" column="resource_page_id" jdbcType="INTEGER"/>
+        <result property="serveTitle" column="serve_title" jdbcType="VARCHAR"/>
+        <result property="serveIcon" column="serve_icon" jdbcType="VARCHAR"/>
+        <result property="serveId" column="serve_id" jdbcType="INTEGER"/>
+        <result property="serveType" column="serve_type" jdbcType="VARCHAR"/>
+        <result property="linkUrl" column="link_url" jdbcType="VARCHAR"/>
+        <result property="typeCode" column="type_code" jdbcType="VARCHAR"/>
+        <result property="createUser" column="create_user" jdbcType="INTEGER"/>
+        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+        <result property="selfSet" column="self_set" jdbcType="INTEGER"/>
+    </resultMap>
+
+    <sql id="Base_columnss">
+        id, resource_page_id, serve_title, serve_icon, serve_id, serve_type, link_url, type_code, create_user, create_time,self_set
+    </sql>
+
+    <!--查询单个-->
+    <select id="getById" resultMap="ResourcePageModelMap">
+        select
+        <include refid="Base_columnss"/>
+        from resource_page_model
+        where id = #{id}
+    </select>
+
+
+    <!--新增所有列-->
+    <insert id="insert" keyProperty="id" useGeneratedKeys="true">
+        insert into resource_page_model(resource_page_id, serve_title, serve_icon, serve_id, serve_type, link_url, type_code, create_user, create_time, update_time,self_set)
+        values (#{resourcePageId}, #{serveTitle}, #{serveIcon}, #{serveId}, #{serveType}, #{linkUrl}, #{typeCode}, #{createUser}, now(), now(),ifnull(#{selfSet},0))
+    </insert>
+
+    <insert id="batchInsert" keyProperty="id" useGeneratedKeys="true">
+        insert into resource_page_model(resource_page_id, serve_title, serve_icon, serve_id, serve_type, link_url, type_code, create_user, create_time, update_time,self_set)
+        values
+        <foreach collection="list" item="entity" separator=",">
+        (#{entity.resourcePageId}, #{entity.serveTitle}, #{entity.serveIcon}, #{entity.serveId}, #{entity.serveType}, #{entity.linkUrl}, #{entity.typeCode}, #{entity.createUser}, now(), now(),ifnull(#{entity.selfSet},0))
+        </foreach>
+    </insert>
+
+
+    <!--通过主键修改数据-->
+    <update id="update">
+        update resource_page_model
+        <set>
+            <if test="resourcePageId != null">
+                resource_page_id = #{resourcePageId},
+            </if>
+            <if test="serveTitle != null and serveTitle != ''">
+                serve_title = #{serveTitle},
+            </if>
+            <if test="serveIcon != null and serveIcon != ''">
+                serve_icon = #{serveIcon},
+            </if>
+            <if test="serveId != null">
+                serve_id = #{serveId},
+            </if>
+            <if test="serveType != null and serveType != ''">
+                serve_type = #{serveType},
+            </if>
+            <if test="linkUrl != null and linkUrl != ''">
+                link_url = #{linkUrl},
+            </if>
+            <if test="typeCode != null and typeCode != ''">
+                type_code = #{typeCode},
+            </if>
+                update_time = now(),
+        </set>
+        where id = #{id}
+    </update>
+
+    <!--通过主键删除-->
+    <delete id="deleteById">
+        delete from resource_page_model where id = #{id}
+    </delete>
+
+    <select id="getByPaegId"  parameterType="long" resultMap="ResourcePageModelMap">
+        select
+        <include refid="Base_columnss"/>
+        from resource_page_model
+        where resource_page_id = #{resourcePageId}
+    </select>
+
+    <delete id="deleteByPageId">
+        delete from resource_page_model where resource_page_id = #{resourcePageId}
+    </delete>
+
+    <delete id="deleteByPageIdAndTypeCode" parameterType="map">
+        delete from resource_page_model
+        where resource_page_id = #{resourcePageId}
+        and type_code in
+        <foreach collection="typeCodes" separator="," item="item" index="index" open="(" close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+</mapper>
+