Merge branch 'fixbug/navigation2' into 'master'

bug:[none]H5导航

See merge request rays/pcloud-book!1391

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

@@ -440,4 +440,12 @@ public interface ResourcePageBiz {
      *  * @param null
      */
     PageBeanNew<ResourcePagePic> listNavigationPic(Long adviserId, Integer currentPage, Integer numPerPage);
+
+    /**
+     * 批量更新栏目排序
+     * @author：zhuyajie
+     * @date：2021/8/27 19:35
+     *  * @param null
+     */
+    void batchUpdateColumnSeq(List<Long> navigationIds);
 }

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

@@ -1175,8 +1175,9 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
         }
         Long resourcePageId = resourcePageColumn.getResourcePageId();
         Integer columnSeq = resourcePageColumn.getColumnSeq();
+        Long navigationId = resourcePageColumn.getNavigationId();
         //获取要调换的栏目
-        ResourcePageColumn column = resourcePageColumnDao.getColumByMoveType(moveType, resourcePageId, columnSeq);
+        ResourcePageColumn column = resourcePageColumnDao.getColumByMoveType(moveType, resourcePageId, columnSeq, navigationId);
         if (null == column) {
             return;
         }
@@ -2359,4 +2360,17 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
         paramMap.put("type", 1);
         return resourcePagePicDao.listPageNew(new PageParam(currentPage,numPerPage), paramMap,"getByType");
     }
+
+    @Override
+    public void batchUpdateColumnSeq(List<Long> navigationIds) {
+        if (ListUtils.isEmpty(navigationIds)) {
+            return;
+        }
+        for (Long navigationId:navigationIds){
+            ResourcePageNavigation navigation = resourcePageNavigationDao.getById(navigationId);
+            if (null != navigation) {
+                this.updateSeq4Batch(navigation.getResourcePageId(), navigationId);
+            }
+        }
+    }
 }

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

@@ -53,7 +53,7 @@ public interface ResourcePageColumnDao extends BaseDao<ResourcePageColumn> {
      * @date：2021/4/2 16:18
      *  * @param null
      */
-    ResourcePageColumn getColumByMoveType(String moveType, Long resourcePageId, Integer columnSeq);
+    ResourcePageColumn getColumByMoveType(String moveType, Long resourcePageId, Integer columnSeq, Long navigationId);
     /**
      * 批量更新序号
      * @author：zhuyajie

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

@@ -53,11 +53,12 @@ public class ResourcePageColumnDaoImpl extends BaseDaoImpl<ResourcePageColumn> i
     }
 
     @Override
-    public ResourcePageColumn getColumByMoveType(String moveType, Long resourcePageId, Integer columnSeq) {
+    public ResourcePageColumn getColumByMoveType(String moveType, Long resourcePageId, Integer columnSeq, Long navigationId) {
         Map<String, Object> map = new HashMap<>();
         map.put("moveType", moveType);
         map.put("resourcePageId", resourcePageId);
         map.put("columnSeq", columnSeq);
+        map.put("navigationId", navigationId);
         return getSessionTemplate().selectOne(getStatement("getColumByMoveType"), map);
     }
 

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

@@ -327,4 +327,11 @@ public class ResourcePageFacade {
         Long partyId = (Long) SessionUtil.getVlaue(token, SessionUtil.PARTY_ID);
         return new ResponseDto<>(resourcePageBiz.listNavigationPic(partyId, currentPage, numPerPage));
     }
+
+    @ApiOperation("栏目重新排序")
+    @PostMapping("batchUpdateColumnSeq")
+    public ResponseDto<?> batchUpdateColumnSeq(@RequestBody List<Long> navigationIds) {
+        resourcePageBiz.batchUpdateColumnSeq(navigationIds);
+        return new ResponseDto<>();
+    }
 }

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

@@ -140,6 +140,7 @@
         book.resource_page_column
         WHERE
         resource_page_id = #{resourcePageId}
+        AND navigation_id = #{navigationId}
         <choose>
             <when test="moveType == 'UP'">
                 AND column_seq &lt; #{columnSeq}

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

@@ -106,7 +106,9 @@
         p.open_rays,
         p.open_food,
         p.scene_id,
-        p.background_img
+        p.background_img,
+        p.navigation_color,
+        p.navigation_format
         FROM
         resource_page p
         LEFT JOIN resource_page_item i ON p.id = i.resource_page_id