bug:[1030717]资源配置

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

@@ -483,6 +483,11 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
                 Integer maxSeq = resourcePageColumnDao.getMaxSeq(updateResourceColumnVO.getResourcePageId(), updateResourceColumnVO.getNavigationId());
                 resourcePageColumn.setColumnSeq(maxSeq + 1);
             }
+            //默认导航
+            if (null == updateResourceColumnVO.getNavigationId()) {
+                ResourcePageNavigation navigation = resourcePageNavigationDao.getByType(updateResourceColumnVO.getResourcePageId(),ResourcePageConstants.NavigationTypeEnum.BOOK_SERVE.getCode());
+                resourcePageColumn.setNavigationId(navigation.getId());
+            }
             resourcePageColumnDao.insert(resourcePageColumn);
         } else {
             resourcePageColumn.setId(updateResourceColumnVO.getResourcePageColumnId());
@@ -1225,6 +1230,8 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
                 //栏目校验
                 this.checkResourceColumn(columnVO);
             }
+            //栏目资源
+            resourcePageItemDao.deleteByPageId(resourcePageId);
             for (UpdateResourceColumnVO columnVO : list) {
                 this.updateResourceColumn(columnVO);
             }
@@ -1646,12 +1653,27 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
         Long resourcePageId = resourcePage.getId();
         // 配置资源支持指定栏目
         Integer columnType = Optional.ofNullable(addBookGroupServeDTO.getColumnType()).orElse(ResourcePageConstants.ColumnTypeEnum.APP_PRODUCT.getCode());
-        //是否有应用栏目
-        List<ResourcePageColumn> columns = resourcePageColumnDao.getByColumnTypeAndPage(resourcePageId, columnType);
+        //第一个可配置资源的导航
+        Long navigationId=null;
+        List<Integer> navigationTypes = Arrays.asList(ResourcePageConstants.NavigationTypeEnum.BOOK_SERVE.getCode(),
+                ResourcePageConstants.NavigationTypeEnum.CUSTOM.getCode());
+        List<ResourcePageNavigation> navigations = resourcePageNavigationDao.getByPageId(resourcePageId);
+        for (ResourcePageNavigation navigation:navigations) {
+            if (navigationTypes.contains(navigation.getNavigationType())) {
+                navigationId = navigation.getId();
+                break;
+            }
+        }
+        if (null == navigationId) {
+            navigationId = this.addDefaultBookServeNavigation(resourcePageId);
+        }
+        //获取该导航最后一个应用作品栏目
+        List<ResourcePageColumn> columnList = resourcePageColumnDao.getByNavigation(navigationId);
+        List<ResourcePageColumn> columns = columnList.stream().filter(s->columnType.equals(s.getColumnType())).collect(Collectors.toList());
         ResourcePageColumn column = null;
         List<ResourcePageItemVO> itemVOS = new ArrayList<>();
         if (!ListUtils.isEmpty(columns)) {
-            column = columns.get(0);
+            column = columns.get(columns.size()-1);
             itemVOS = resourcePageItemDao.getResourcePageItemByColumnId(column.getId());
         }
         //资源
@@ -1673,6 +1695,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
         columnVO.setCreateUser(adviserId);
         columnVO.setItemVOList(itemVOS);
         columnVO.setResourcePageId(resourcePageId);
+        columnVO.setNavigationId(navigationId);
         this.updateResourceColumn(columnVO);
     }