Merge branch 'feature/1005325' into 'master'

feat:[1005325]H5本书服务简化RAYS工具配置

See merge request rays/pcloud-book!1401

pcloud-facade-book/deploy-all.bat

+call mvn -Ptest clean source:jar deploy -Denforcer.skip=true -Dmaven.test.skip=true -U
+
+call mvn -Puat clean source:jar deploy -Denforcer.skip=true -Dmaven.test.skip=true -U -Dreversion=3.1.0-RELEASE
+
+call mvn -Pperf clean source:jar deploy -Denforcer.skip=true -Dmaven.test.skip=true -U -Dreversion=3.1.1-SNAPSHOT
+
+call mvn -Pprod clean source:jar deploy -Denforcer.skip=true -Dmaven.test.skip=true -U -Dreversion=3.1.1-RELEASE
+
+call mvn -Ptsrpd clean source:jar deploy -Denforcer.skip=true -Dmaven.test.skip=true -U -Dreversion=3.1.2-RELEASE
+
+@pause
\ No newline at end of file

pcloud-facade-book/src/main/java/com/pcloud/book/group/service/BookGroupService.java

@@ -287,4 +287,8 @@ public interface BookGroupService {
     @ApiOperation("查资源页信息")
     @GetMapping("getResourcePageById")
     ResponseEntity<ResponseDto<ResourcePageDTO>> getResourcePageById(@RequestParam("resourcePageId") Long resourcePageId);
+
+    @ApiOperation("查询栏目配置的rays工具类型")
+    @GetMapping("getConfiguredRaysAppTypeCode")
+    ResponseEntity<ResponseDto<List<String>>> getConfiguredRaysAppTypeCode(@RequestParam("resourcePageColumnId") Long resourcePageColumnId);
 }

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

@@ -457,4 +457,11 @@ public interface ResourcePageBiz {
      *  * @param null
      */
     ResourcePageDTO getResourcePageById(Long resourcePageId);
+    /**
+     * 查询栏目配置的rays工具类型
+     * @author：zhuyajie
+     * @date：2021/8/30 16:29
+     *  * @param null
+     */
+    List<String> getConfiguredRaysAppTypeCode(Long resourcePageColumnId);
 }

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

@@ -1308,12 +1308,19 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
     @Transactional(rollbackFor = Exception.class)
     public Long updateResourcePageAndColumn(UpdateResourcePageVO updateResourcePageVO) {
         Long resourcePageId = this.updateResourcePage(updateResourcePageVO);
+        //当前所有栏目
+        List<Long> originColumnIds = resourcePageColumnDao.getColumnIdsByPageId(resourcePageId);
         if (!ListUtils.isEmpty(updateResourcePageVO.getColumnVOS())) {
             List<UpdateResourceColumnVO> list = updateResourcePageVO.getColumnVOS();
+            List<Long> columnIds = new ArrayList<>();
             List<ResourcePageItemVO> accountItemVOS = new ArrayList<>();
             for (UpdateResourceColumnVO columnVO : list) {
                 columnVO.setResourcePageId(resourcePageId);
                 columnVO.setCreateUser(updateResourcePageVO.getCreateUser());
+                columnVO.setColumnSeq(list.indexOf(columnVO) + 1);
+                if (null != columnVO.getResourcePageColumnId()) {
+                    columnIds.add(columnVO.getResourcePageColumnId());
+                }
                 //栏目校验
                 this.checkResourceColumn(columnVO);
                 //公众号栏目
@@ -1334,6 +1341,13 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
             for (UpdateResourceColumnVO columnVO : list) {
                 this.updateResourceColumn(columnVO);
             }
+            if (!ListUtils.isEmpty(columnIds)) {
+                originColumnIds.removeAll(columnIds);
+            }
+        }
+        if (!ListUtils.isEmpty(originColumnIds)) {
+            //删除剩余栏目
+            resourcePageColumnDao.deleteByIds(originColumnIds);
         }
 
         // 更新图书封面
@@ -2561,4 +2575,9 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
         return resourcePageDTO;
     }
 
+
+    @Override
+    public List<String> getConfiguredRaysAppTypeCode(Long resourcePageColumnId) {
+        return resourcePageItemDao.getConfiguredRaysAppTypeCode(resourcePageColumnId);
+    }
 }

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

@@ -67,4 +67,8 @@ public interface ResourcePageColumnDao extends BaseDao<ResourcePageColumn> {
     void updateNavigationId(Long navigationId, Long resourcePageId);
 
     List<ResourcePageColumn> getByNavigation(Long navigationId);
+
+    List<Long> getColumnIdsByPageId(Long resourcePageId);
+
+    void deleteByIds(List<Long> ids);
 }
\ No newline at end of file

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

@@ -130,4 +130,12 @@ public interface ResourcePageItemDao extends BaseDao<ResourcePageItem>{
      *  * @param null
      */
     ResourcePageItemVO getPopupQrcodeItem(Long resourcePageId);
+
+    /**
+     * 栏目配置的RAYS工具类型
+     * @author：zhuyajie
+     * @date：2021/8/30 16:34
+     *  * @param null
+     */
+    List<String> getConfiguredRaysAppTypeCode(Long resourcePageColumnId);
 }
\ No newline at end of file

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

@@ -4,6 +4,7 @@ import com.pcloud.book.group.dao.ResourcePageColumnDao;
 import com.pcloud.book.group.entity.ResourcePageColumn;
 import com.pcloud.book.group.vo.ResourceColumnAndServeVO;
 import com.pcloud.common.core.dao.BaseDaoImpl;
+import com.pcloud.common.utils.ListUtils;
 
 import org.springframework.stereotype.Component;
 
@@ -84,4 +85,17 @@ public class ResourcePageColumnDaoImpl extends BaseDaoImpl<ResourcePageColumn> i
     public List<ResourcePageColumn> getByNavigation(Long navigationId) {
         return getSessionTemplate().selectList(getStatement("getByNavigation"), navigationId);
     }
+
+    @Override
+    public List<Long> getColumnIdsByPageId(Long resourcePageId) {
+        return getSessionTemplate().selectList(getStatement("getColumnIdsByPageId"), resourcePageId);
+    }
+
+    @Override
+    public void deleteByIds(List<Long> ids) {
+        if (ListUtils.isEmpty(ids)) {
+            return;
+        }
+        getSessionTemplate().delete(getStatement("deleteByIds"), ids);
+    }
 }

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

@@ -127,4 +127,9 @@ public class ResourcePageItemDaoImpl extends BaseDaoImpl<ResourcePageItem> imple
     public ResourcePageItemVO getPopupQrcodeItem(Long resourcePageId) {
         return getSessionTemplate().selectOne(getStatement("getPopupQrcodeItem"), resourcePageId);
     }
+
+    @Override
+    public List<String> getConfiguredRaysAppTypeCode(Long resourcePageColumnId) {
+        return getSessionTemplate().selectList(getStatement("getConfiguredRaysAppTypeCode"), resourcePageColumnId);
+    }
 }

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

@@ -490,4 +490,10 @@ public class BookGroupServiceImpl implements BookGroupService {
     public ResponseEntity<ResponseDto<ResourcePageDTO>> getResourcePageById(@RequestParam("resourcePageId") Long resourcePageId) {
         return ResponseHandleUtil.toResponse(resourcePageBiz.getResourcePageById(resourcePageId));
     }
+
+    @Override
+    @GetMapping("getConfiguredRaysAppTypeCode")
+    public ResponseEntity<ResponseDto<List<String>>> getConfiguredRaysAppTypeCode(@RequestParam("resourcePageColumnId") Long resourcePageColumnId) {
+        return ResponseHandleUtil.toResponse(resourcePageBiz.getConfiguredRaysAppTypeCode(resourcePageColumnId));
+    }
 }

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

@@ -184,4 +184,21 @@
         where navigation_id = #{navigationId}
     </select>
 
+    <select id="getColumnIdsByPageId" resultType="long" parameterType="long">
+        SELECT
+            id
+        FROM
+            resource_page_column
+        WHERE
+            resource_page_id = #{resourcePageId}
+    </select>
+
+    <delete id="deleteByIds" parameterType="list">
+        delete from book.resource_page_column
+        where id IN
+        <foreach collection="list" index="index" close=")" open="(" item="item" separator=",">
+            #{item}
+        </foreach>
+    </delete>
+
 </mapper>
\ No newline at end of file

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

@@ -355,4 +355,13 @@
         limit 1
     </select>
 
+
+    <select id="getConfiguredRaysAppTypeCode" resultType="string" parameterType="long">
+        SELECT DISTINCT
+            type_code
+        FROM
+            resource_page_item
+        WHERE
+            resource_page_column_id = #{resourcePageColumnId}
+    </select>
 </mapper>
\ No newline at end of file