Merge branch 'feature/1005150' into 'master'

feat: [1005150] 对标书链编辑端优化

See merge request rays/pcloud-book!1386

pcloud-facade-book/src/main/java/com/pcloud/book/group/dto/AddBookGroupServeDTO.java

@@ -13,5 +13,6 @@ public class AddBookGroupServeDTO {
     private String servePic;
     private String serveName;
     private String typeCode;
+    private Integer columnType;
 
 }

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

@@ -1577,8 +1577,10 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
             resourcePage = this.createDefaultResourcePage(null, adviserId, sceneId, 0);
         }
         Long resourcePageId = resourcePage.getId();
+        // 配置资源支持指定栏目
+        Integer columnType = Optional.ofNullable(addBookGroupServeDTO.getColumnType()).orElse(ResourcePageConstants.ColumnTypeEnum.APP_PRODUCT.getCode());
         //是否有应用栏目
-        List<ResourcePageColumn> columns = resourcePageColumnDao.getByColumnTypeAndPage(resourcePageId, ResourcePageConstants.ColumnTypeEnum.APP_PRODUCT.getCode());
+        List<ResourcePageColumn> columns = resourcePageColumnDao.getByColumnTypeAndPage(resourcePageId, columnType);
         ResourcePageColumn column = null;
         List<ResourcePageItemVO> itemVOS = new ArrayList<>();
         if (!ListUtils.isEmpty(columns)) {
@@ -1592,19 +1594,34 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
         vo.setSeqNum(itemVOS.size() + 1);
         itemVOS.add(vo);
         //更新栏目
-        UpdateResourceColumnVO columnVO = new UpdateResourceColumnVO();
-        columnVO.setColumnFormat(null == column ? 1 : column.getColumnFormat());
-        columnVO.setColumnType(ResourcePageConstants.ColumnTypeEnum.APP_PRODUCT.getCode());
+        UpdateResourceColumnVO columnVO = getColumnVO4ColumnType(columnType);
+        if (Objects.nonNull(column)) {
+            columnVO.setColumnFormat(column.getColumnFormat());
+            columnVO.setColumnName(column.getColumnName());
+            columnVO.setResourcePageColumnId(column.getId());
+            columnVO.setShowMore(column.getShowMore());
+            columnVO.setShowCount(column.getShowCount());
+        }
+        columnVO.setColumnType(columnType);
         columnVO.setCreateUser(adviserId);
-        columnVO.setColumnName(null == column ? "本书配套资源服务" : column.getColumnName());
-        columnVO.setResourcePageColumnId(null == column ? null : column.getId());
         columnVO.setItemVOList(itemVOS);
         columnVO.setResourcePageId(resourcePageId);
-        columnVO.setShowMore(null == column ? false : column.getShowMore());
-        columnVO.setShowCount(null == column ? null : column.getShowCount());
         this.updateResourceColumn(columnVO);
     }
 
+    private UpdateResourceColumnVO getColumnVO4ColumnType(Integer columnType) {
+        UpdateResourceColumnVO columnVO = new UpdateResourceColumnVO();
+        if (columnType == 7) {
+            columnVO.setColumnFormat(2);
+            columnVO.setColumnName("RAYS工具");
+        } else {
+            columnVO.setColumnFormat(1);
+            columnVO.setColumnName("本书配套资源服务");
+        }
+        columnVO.setShowMore(false);
+        return columnVO;
+    }
+
     @Override
     public List<Long> getOpenRaysSceneIds(List<Long> sceneIds) {
         if (ListUtils.isEmpty(sceneIds)) {