Merge branch 'feat-rsy-1002856' into 'master'

1002856 小睿优化-即刻权益配置，示意图改为实时变化

See merge request rays/pcloud-book!707

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

@@ -4,6 +4,7 @@ import com.pcloud.book.rightsSetting.dto.FillRightsSettingAppletsDTO;
 import com.pcloud.book.rightsSetting.dto.RightsSettingDto;
 import com.pcloud.book.rightsSetting.entity.BaseTempletClassify;
 import com.pcloud.book.rightsSetting.entity.RightsItemGroup;
+import com.pcloud.book.rightsSetting.entity.RightsNowPic;
 import com.pcloud.book.rightsSetting.entity.RightsSetting;
 import com.pcloud.book.rightsSetting.entity.RightsSettingClassify;
 import com.pcloud.book.rightsSetting.entity.RightsSettingItem;
@@ -103,4 +104,12 @@ public interface RightsSettingBiz {
                                                             Integer top);
 
     List<RightsItemGroup> getRightsItemGroups(Long rightsSettingId, Long adviserId, Long bookId, Long channelId, Boolean removeCanNotBuy);
+
+    List<RightsNowPic> getAllDefaultRightsNowPics();
+
+    void addRightsNowPic(RightsNowPic rightsNowPic);
+
+    PageBeanNew<RightsNowPic> getRightsNowPics(Integer currentPage, Integer numPerPage);
+
+    void deleteRightsNowPic(Long rightsNowPicId);
 }

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

@@ -35,6 +35,7 @@ import com.pcloud.book.rightsSetting.constants.RightsSettingConstant;
 import com.pcloud.book.rightsSetting.dao.RightsCustomRelationDao;
 import com.pcloud.book.rightsSetting.dao.RightsItemGroupDao;
 import com.pcloud.book.rightsSetting.dao.RightsNowItemDao;
+import com.pcloud.book.rightsSetting.dao.RightsNowPicDao;
 import com.pcloud.book.rightsSetting.dao.RightsReadPlanDao;
 import com.pcloud.book.rightsSetting.dao.RightsSettingDAO;
 import com.pcloud.book.rightsSetting.dao.RightsSettingItemDao;
@@ -44,6 +45,7 @@ import com.pcloud.book.rightsSetting.entity.BaseTempletClassify;
 import com.pcloud.book.rightsSetting.entity.RightsCustomRelation;
 import com.pcloud.book.rightsSetting.entity.RightsItemGroup;
 import com.pcloud.book.rightsSetting.entity.RightsNowItem;
+import com.pcloud.book.rightsSetting.entity.RightsNowPic;
 import com.pcloud.book.rightsSetting.entity.RightsReadPlan;
 import com.pcloud.book.rightsSetting.entity.RightsSetting;
 import com.pcloud.book.rightsSetting.entity.RightsSettingClassify;
@@ -145,6 +147,8 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
     private PcloudGroupActivityDao pcloudGroupActivityDao;
     @Autowired
     private ReaderConsr readerConsr;
+    @Autowired
+    private RightsNowPicDao rightsNowPicDao;
 
 
     @Override
@@ -1243,6 +1247,43 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
         return groups;
     }
 
+    @ParamLog("获取即享权益图片库")
+    @Override
+    public List<RightsNowPic> getAllDefaultRightsNowPics() {
+        return rightsNowPicDao.getAllDefaultRightsNowPics();
+    }
+
+    @ParamLog("新增即享权益图片")
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void addRightsNowPic(RightsNowPic rightsNowPic) {
+        if (rightsNowPic==null||StringUtil.isEmpty(rightsNowPic.getPicUrl())){
+            throw new BookBizException(BookBizException.PARAM_IS_ERROR,"参数有误！");
+        }
+        rightsNowPic.setDefaultPic(false);
+        rightsNowPicDao.insert(rightsNowPic);
+    }
+
+    @ParamLog("获取即享权益图片列表")
+    @Override
+    public PageBeanNew<RightsNowPic> getRightsNowPics(Integer currentPage, Integer numPerPage) {
+        if (currentPage==null||numPerPage==null||currentPage<0||numPerPage<=0){
+            throw new BookBizException(BookBizException.PARAM_IS_ERROR,"参数有误！");
+        }
+        PageBeanNew<RightsNowPic> pageNew = rightsNowPicDao.listPageNew(new PageParam(currentPage, numPerPage), new HashMap<>(), "getRightsNowPics");
+        return pageNew;
+    }
+
+    @ParamLog("删除即享权益图片")
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void deleteRightsNowPic(Long rightsNowPicId) {
+        if (rightsNowPicId==null){
+            throw new BookBizException(BookBizException.PARAM_IS_ERROR,"参数有误！");
+        }
+        rightsNowPicDao.deleteById(rightsNowPicId);
+    }
+
     @ParamLog("移除不能购买的应用或作品")
     private void removeCanNotBuy(List<RightsNowItem> nowItems) {
         if (ListUtils.isEmpty(nowItems)) {

pcloud-service-book/src/main/java/com/pcloud/book/rightsSetting/dao/RightsNowPicDao.java

+package com.pcloud.book.rightsSetting.dao;
+
+import com.pcloud.book.rightsSetting.entity.RightsNowPic;
+import com.pcloud.common.core.dao.BaseDao;
+
+import java.util.List;
+
+public interface RightsNowPicDao extends BaseDao<RightsNowPic> {
+    List<RightsNowPic> getAllDefaultRightsNowPics();
+}

pcloud-service-book/src/main/java/com/pcloud/book/rightsSetting/dao/impl/RightsNowPicDaoImpl.java

+package com.pcloud.book.rightsSetting.dao.impl;
+
+import com.pcloud.book.rightsSetting.dao.RightsNowPicDao;
+import com.pcloud.book.rightsSetting.entity.RightsNowPic;
+import com.pcloud.common.core.dao.BaseDaoImpl;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @ClassName com.pcloud.book.rightsSetting.dao.impl.RightsItemPicDaoImpl
+ * @Author ruansiyuan
+ * @Description
+ * @Date 2020/5/6 11:08
+ * @Version 1.0
+ **/
+@Component("rightsNowPicDao")
+public class RightsNowPicDaoImpl extends BaseDaoImpl<RightsNowPic> implements RightsNowPicDao {
+    @Override
+    public List<RightsNowPic> getAllDefaultRightsNowPics() {
+        return super.getSqlSession().selectList(getStatement("getAllDefaultRightsNowPics"));
+    }
+}
\ No newline at end of file

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

+package com.pcloud.book.rightsSetting.entity;
+
+import com.pcloud.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @ClassName com.pcloud.book.rightsSetting.entity.Rights_item_pic
+ * @Author ruansiyuan
+ * @Description 即享权益图片库
+ * @Date 2020/5/6 11:06
+ * @Version 1.0
+ **/
+@ApiModel("即享权益图片库")
+@Data
+public class RightsNowPic extends BaseEntity {
+
+    @ApiModelProperty("图片地址")
+    private String picUrl;
+
+    @ApiModelProperty("是否默认图片")
+    private Boolean defaultPic;
+
+}
\ No newline at end of file

pcloud-service-book/src/main/java/com/pcloud/book/rightsSetting/facade/RightsSettingFacede.java

@@ -3,6 +3,7 @@ package com.pcloud.book.rightsSetting.facade;
 import com.pcloud.book.base.exception.BookBizException;
 import com.pcloud.book.rightsSetting.biz.RightsSettingBiz;
 import com.pcloud.book.rightsSetting.dto.RightsSettingDto;
+import com.pcloud.book.rightsSetting.entity.RightsNowPic;
 import com.pcloud.book.rightsSetting.entity.RightsSetting;
 import com.pcloud.book.rightsSetting.entity.RightsSettingClassify;
 import com.pcloud.book.rightsSetting.entity.RightsSettingItem;
@@ -200,4 +201,47 @@ public class RightsSettingFacede {
         }
         return new ResponseDto<>(rightsSettingBiz.getRightsItemGroups(rightsSettingId, adviserId, bookId, channelId, true));
     }
+
+    @ApiOperation("获取即享权益默认图片库")
+    @GetMapping("getAllDefaultRightsNowPics")
+    public ResponseDto<?> getAllDefaultRightsNowPics(
+            @RequestHeader("token") String token
+    ) throws PermissionException {
+        SessionUtil.getToken4Redis(token);
+        return new ResponseDto<>(rightsSettingBiz.getAllDefaultRightsNowPics());
+    }
+
+    @ApiOperation("新增即享权益图片")
+    @PostMapping("addRightsNowPic")
+    public ResponseDto<?> addRightsNowPic(
+            @RequestHeader("token") String token,
+            @RequestBody RightsNowPic rightsNowPic
+    ) throws PermissionException {
+        SessionUtil.getToken4Redis(token);
+        rightsSettingBiz.addRightsNowPic(rightsNowPic);
+        return new ResponseDto<>();
+    }
+
+    @ApiOperation("获取即享权益图片列表")
+    @GetMapping("getRightsNowPics")
+    public ResponseDto<?> getRightsNowPics(
+            @RequestHeader("token") String token,
+            @RequestParam("currentPage") Integer currentPage,
+            @RequestParam("numPerPage") Integer numPerPage
+    ) throws PermissionException {
+        SessionUtil.getToken4Redis(token);
+        return new ResponseDto<>(rightsSettingBiz.getRightsNowPics(currentPage,numPerPage));
+    }
+
+    @ApiOperation("删除即享权益图片")
+    @GetMapping("deleteRightsNowPic")
+    public ResponseDto<?> deleteRightsNowPic(
+            @RequestHeader("token") String token,
+            @RequestParam("rightsNowPicId") Long rightsNowPicId
+    ) throws PermissionException {
+        SessionUtil.getToken4Redis(token);
+        rightsSettingBiz.deleteRightsNowPic(rightsNowPicId);
+        return new ResponseDto<>();
+    }
+
 }
\ No newline at end of file

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

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "mybatis-3-mapper.dtd" >
+<mapper namespace="com.pcloud.book.rightsSetting.dao.impl.RightsNowPicDaoImpl">
+
+    <resultMap  id="BaseResultMap" type="com.pcloud.book.rightsSetting.entity.RightsNowPic">
+        <id property="id" column="id" jdbcType="BIGINT"/>
+        <result property="picUrl" column="pic_url" jdbcType="VARCHAR"/>
+        <result property="defaultPic" column="default_pic" jdbcType="BOOLEAN"/>
+        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id, pic_url, default_pic, create_time
+    </sql>
+
+    <select id="getById" resultMap="BaseResultMap" parameterType="java.lang.Long">
+        select
+        <include refid="Base_Column_List"/>
+        from rights_now_pic
+        where id = #{id,jdbcType=BIGINT}
+    </select>
+
+    <delete id="deleteById" parameterType="long">
+        delete from rights_now_pic
+        where id = #{id,jdbcType=BIGINT}
+    </delete>
+
+    <insert id="insert" parameterType="com.pcloud.book.rightsSetting.entity.RightsNowPic" useGeneratedKeys="true" keyProperty="id">
+        insert into rights_now_pic
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            pic_url, default_pic, create_time
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            #{picUrl,jdbcType=VARCHAR},
+            #{defaultPic,jdbcType=BOOLEAN},
+            NOW()
+        </trim>
+    </insert>
+
+    <insert id="batchInsert"  parameterType="com.pcloud.book.rightsSetting.entity.RightsNowPic" useGeneratedKeys="true" keyProperty="id">
+        insert into rights_now_pic (
+        pic_url, default_pic, create_time
+        ) values
+        <foreach collection="list" item="item" index="index" separator=",">
+            (
+            #{item.picUrl,jdbcType=VARCHAR},
+            #{item.defaultPic,jdbcType=BOOLEAN},
+            NOW()
+            )
+        </foreach>
+    </insert>
+
+    <select id="getAllDefaultRightsNowPics" resultMap="BaseResultMap">
+        select <include refid="Base_Column_List"/>
+        from rights_now_pic
+        where default_pic=1
+    </select>
+
+    <select id="getRightsNowPics" parameterType="map" resultMap="BaseResultMap">
+        select <include refid="Base_Column_List"/>
+        from rights_now_pic
+        where default_pic=0
+    </select>
+
+</mapper>
\ No newline at end of file