品类添加树形结构返回接口

kangtian
1 parent 9e93e31a
Showing 8 changed files with 181 additions and 18 deletions
assistant-product/src/main/java/com/diligrp/assistant/product/controller/CategoryOpenApiController.java
assistant-product/src/main/java/com/diligrp/assistant/product/dao/ProductCategoryDao.java
assistant-product/src/main/java/com/diligrp/assistant/product/domain/CategoryNodeVO.java
assistant-product/src/main/java/com/diligrp/assistant/product/domain/CategoryPageQuery.java
assistant-product/src/main/java/com/diligrp/assistant/product/domain/CategoryTreeQuery.java
assistant-product/src/main/java/com/diligrp/assistant/product/service/ProductCategoryService.java
assistant-product/src/main/java/com/diligrp/assistant/product/service/impl/ProductCategoryServiceImpl.java
assistant-product/src/main/resources/com/diligrp/assistant/dao/mapper/ProductCategoryDao.xml
 package com.diligrp.assistant.product.controller;
-import com.diligrp.assistant.product.domain.CategoryVO;
-import com.diligrp.assistant.product.domain.CategoryPageQuery;
-import com.diligrp.assistant.product.domain.ListCategory;
+import com.diligrp.assistant.product.domain.*;
 import com.diligrp.assistant.product.model.Category;
 import com.diligrp.assistant.product.service.ProductCategoryService;
 import com.diligrp.assistant.shared.domain.Message;
@@ -30,21 +28,21 @@ public class CategoryOpenApiController {
     public Message<CategoryVO> findById(@RequestParam("id") Long id) {
         Category category = productCategoryService.findCategoryById(id);
         return Message.success(CategoryVO.of(category.getId(), category.getParentId(),
-            category.getName(), category.getAlias(), category.getLevel(), category.getIcon(), category.getPath()));
+                category.getName(), category.getAlias(), category.getLevel(), category.getIcon(), category.getPath()));
     }
     @RequestMapping(value = "/findParentById.do")
     public Message<CategoryVO> findParentById(@RequestParam("id") Long id) {
         Category category = productCategoryService.findParentCategoryById(id);
         return Message.success(CategoryVO.of(category.getId(), category.getParentId(),
-            category.getName(), category.getAlias(), category.getLevel(), category.getIcon(), category.getPath()));
+                category.getName(), category.getAlias(), category.getLevel(), category.getIcon(), category.getPath()));
     }
     @RequestMapping(value = "/listParentsById.do")
     public Message<List<CategoryVO>> listParentsById(@RequestParam("id") Long id) {
         List<CategoryVO> categories = productCategoryService.listParentsById(id).stream().map(category ->
-            CategoryVO.of(category.getId(), category.getParentId(), category.getName(), category.getAlias(),
-            category.getLevel(), category.getIcon(), category.getPath())).collect(Collectors.toList());
+                CategoryVO.of(category.getId(), category.getParentId(), category.getName(), category.getAlias(),
+                        category.getLevel(), category.getIcon(), category.getPath())).collect(Collectors.toList());
         return Message.success(categories);
     }
@@ -59,8 +57,8 @@ public class CategoryOpenApiController {
         query.from(request.getPageNo(), request.getPageSize());
         List<CategoryVO> categories = productCategoryService.listChildrenById(query).stream().map(category ->
-            CategoryVO.of(category.getId(), category.getParentId(), category.getName(), category.getAlias(),
-            category.getLevel(), category.getIcon(), category.getPath())).collect(Collectors.toList());
+                CategoryVO.of(category.getId(), category.getParentId(), category.getName(), category.getAlias(),
+                        category.getLevel(), category.getIcon(), category.getPath())).collect(Collectors.toList());
         return Message.success(categories);
     }
@@ -75,8 +73,8 @@ public class CategoryOpenApiController {
         query.from(request.getPageNo(), request.getPageSize());
         List<CategoryVO> categories = productCategoryService.listCategoriesByLevel(query).stream().map(category ->
-            CategoryVO.of(category.getId(), category.getParentId(), category.getName(), category.getAlias(),
-            category.getLevel(), category.getIcon(), category.getPath())).collect(Collectors.toList());
+                CategoryVO.of(category.getId(), category.getParentId(), category.getName(), category.getAlias(),
+                        category.getLevel(), category.getIcon(), category.getPath())).collect(Collectors.toList());
         return Message.success(categories);
     }
@@ -89,4 +87,14 @@ public class CategoryOpenApiController {
                         category.getLevel(), category.getIcon(), category.getPath())).collect(Collectors.toList());
         return Message.success(categories);
     }
+
+
+    @RequestMapping(value = "/amis/tree.do")
+    public Message<List<CategoryNodeVO>> findTree(@RequestParam(value = "term", required = false) String term) {
+        CategoryTreeQuery categoryTreeQuery = new CategoryTreeQuery();
+        categoryTreeQuery.setTerm(term);
+        return Message.success(productCategoryService.tree(categoryTreeQuery));
+    }
+
+
 }
 package com.diligrp.assistant.product.dao;
+import com.diligrp.assistant.product.domain.CategoryNodeVO;
 import com.diligrp.assistant.product.domain.CategoryPageQuery;
+import com.diligrp.assistant.product.domain.CategoryTreeQuery;
 import com.diligrp.assistant.product.model.Category;
 import com.diligrp.assistant.shared.mybatis.MybatisMapperSupport;
 import org.springframework.stereotype.Repository;
@@ -27,4 +29,6 @@ public interface ProductCategoryDao extends MybatisMapperSupport {
     List<Category> listCategoriesByLevel(CategoryPageQuery query);
     List<Category> list(CategoryPageQuery query);
+
+    List<CategoryNodeVO> tree(CategoryTreeQuery query);
 }
+package com.diligrp.assistant.product.domain;
+
+import java.util.List;
+
+public class CategoryNodeVO {
+    // ID
+    private Long categoryId;
+    // 父品类ID
+    private Long parentId;
+    // 名称
+    private String categoryName;
+    // 级别
+    private Integer level;
+    // 路径
+    private String path;
+    //子节点
+    private List<CategoryNodeVO> children;
+
+    public Long getCategoryId() {
+        return categoryId;
+    }
+
+    public void setCategoryId(Long categoryId) {
+        this.categoryId = categoryId;
+    }
+
+    public Long getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Long parentId) {
+        this.parentId = parentId;
+    }
+
+    public String getCategoryName() {
+        return categoryName;
+    }
+
+    public void setCategoryName(String categoryName) {
+        this.categoryName = categoryName;
+    }
+
+    public Integer getLevel() {
+        return level;
+    }
+
+    public void setLevel(Integer level) {
+        this.level = level;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public void setPath(String path) {
+        this.path = path;
+    }
+
+    public List<CategoryNodeVO> getChildren() {
+        return children;
+    }
+
+    public void setChildren(List<CategoryNodeVO> children) {
+        this.children = children;
+    }
+}
@@ -8,6 +8,8 @@ public class CategoryPageQuery extends PageQuery {
     // 区域级别
     private Integer level;
+    private String term;
+
     public Long getId() {
         return id;
     }
@@ -23,4 +25,12 @@ public class CategoryPageQuery extends PageQuery {
     public void setLevel(Integer level) {
         this.level = level;
     }
+
+    public String getTerm() {
+        return term;
+    }
+
+    public void setTerm(String term) {
+        this.term = term;
+    }
 }
+package com.diligrp.assistant.product.domain;
+
+import java.io.Serializable;
+
+public class CategoryTreeQuery implements Serializable {
+
+
+    private String term;
+
+
+    public String getTerm() {
+        return term;
+    }
+
+    public void setTerm(String term) {
+        this.term = term;
+    }
+}
 package com.diligrp.assistant.product.service;
 import com.diligrp.assistant.product.domain.CategoryDTO;
+import com.diligrp.assistant.product.domain.CategoryNodeVO;
 import com.diligrp.assistant.product.domain.CategoryPageQuery;
+import com.diligrp.assistant.product.domain.CategoryTreeQuery;
 import com.diligrp.assistant.product.model.Category;
 import java.util.List;
@@ -77,4 +79,13 @@ public interface ProductCategoryService {
      * @return 品类
      */
     List<Category> list(CategoryPageQuery query);
+
+
+    /**
+     * 查询所有品类
+     *
+     * @param query 查询条件
+     * @return 品类
+     */
+    List<CategoryNodeVO> tree(CategoryTreeQuery query);
 }
@@ -2,7 +2,9 @@ package com.diligrp.assistant.product.service.impl;
 import com.diligrp.assistant.product.dao.ProductCategoryDao;
 import com.diligrp.assistant.product.domain.CategoryDTO;
+import com.diligrp.assistant.product.domain.CategoryNodeVO;
 import com.diligrp.assistant.product.domain.CategoryPageQuery;
+import com.diligrp.assistant.product.domain.CategoryTreeQuery;
 import com.diligrp.assistant.product.exception.CategoryServiceException;
 import com.diligrp.assistant.product.model.Category;
 import com.diligrp.assistant.product.service.ProductCategoryService;
@@ -13,6 +15,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.time.LocalDateTime;
 import java.util.*;
+import java.util.stream.Collectors;
 @Service("productCategoryService")
 public class ProductCategoryServiceImpl implements ProductCategoryService {
@@ -26,9 +29,9 @@ public class ProductCategoryServiceImpl implements ProductCategoryService {
         LocalDateTime now = LocalDateTime.now();
         Category parent = findCategoryById(request.getParentId());
         Category category = Category.builder().parentId(request.getParentId()).name(request.getName())
-            .alias(request.getAlias()).level(parent.getLevel() + 1).pyCode(request.getPyCode())
-            .shortCode(request.getShortCode()).path(parent.getPath()).icon(request.getIcon()).state(1).version(0)
-            .createdTime(now).modifiedTime(now).build();
+                .alias(request.getAlias()).level(parent.getLevel() + 1).pyCode(request.getPyCode())
+                .shortCode(request.getShortCode()).path(parent.getPath()).icon(request.getIcon()).state(1).version(0)
+                .createdTime(now).modifiedTime(now).build();
         productCategoryDao.insertCategory(category);
         // 更新路径信息, 将自身ID添加到路径信息中
@@ -45,8 +48,8 @@ public class ProductCategoryServiceImpl implements ProductCategoryService {
     public void updateCategory(CategoryDTO request) {
         LocalDateTime now = LocalDateTime.now();
         Category category = Category.builder().name(request.getName())
-            .alias(request.getAlias()).pyCode(request.getPyCode()).shortCode(request.getShortCode())
-            .icon(request.getIcon()).modifiedTime(now).build();
+                .alias(request.getAlias()).pyCode(request.getPyCode()).shortCode(request.getShortCode())
+                .icon(request.getIcon()).modifiedTime(now).build();
         category.setId(request.getId());
         if (productCategoryDao.updateCategory(category) == 0) {
             throw new CategoryServiceException(ErrorCode.OBJECT_NOT_FOUND, "品类不存在");
@@ -74,13 +77,13 @@ public class ProductCategoryServiceImpl implements ProductCategoryService {
     @Override
     public Category findCategoryById(Long id) {
         return productCategoryDao.findCategoryById(id).orElseThrow(() ->
-            new CategoryServiceException(ErrorCode.OBJECT_NOT_FOUND, "品类不存在"));
+                new CategoryServiceException(ErrorCode.OBJECT_NOT_FOUND, "品类不存在"));
     }
     @Override
     public Category findParentCategoryById(Long id) {
         return productCategoryDao.findParentCategoryById(id).orElseThrow(() ->
-            new CategoryServiceException(ErrorCode.OBJECT_NOT_FOUND, "品类不存在"));
+                new CategoryServiceException(ErrorCode.OBJECT_NOT_FOUND, "品类不存在"));
     }
     @Override
@@ -119,4 +122,23 @@ public class ProductCategoryServiceImpl implements ProductCategoryService {
     public List<Category> list(CategoryPageQuery query) {
         return productCategoryDao.list(query);
     }
+
+    @Override
+    public List<CategoryNodeVO> tree(CategoryTreeQuery query) {
+        List<CategoryNodeVO> categoryNodeList = productCategoryDao.tree(query);
+        List<CategoryNodeVO> categoryTree = streamToTree(categoryNodeList, 0L);
+        return categoryTree;
+    }
+
+    public static List<CategoryNodeVO> streamToTree(List<CategoryNodeVO> treeList, Long parentId) {
+        List<CategoryNodeVO> list = treeList.stream()
+                // 过滤父节点
+                .filter(parent -> parent.getParentId().equals(parentId))
+                // 把父节点children递归赋值成为子节点
+                .map(child -> {
+                    child.setChildren(streamToTree(treeList, child.getCategoryId()));
+                    return child;
+                }).collect(Collectors.toList());
+        return list;
+    }
 }
@@ -90,4 +90,28 @@
     <select id="list" parameterType="com.diligrp.assistant.product.domain.CategoryPageQuery" resultMap="CategoryMap">
         SELECT * FROM product_category ORDER BY ID
     </select>
+
+    <select id="tree" parameterType="com.diligrp.assistant.product.domain.CategoryPageQuery" resultType="com.diligrp.assistant.product.domain.CategoryNodeVO">
+
+        WITH RECURSIVE CategoryPath AS (
+        SELECT
+        id as categoryId,parent_id as parentId,name as categoryName,level as level, path as path
+            FROM
+                product_category
+        <where>
+            state > 0
+            <if test="term != null">
+                AND name like CONCAT('%',#{term},'%')
+            </if>
+        </where>
+
+        UNION ALL
+
+        SELECT
+        c.id as categoryId,c.parent_id as parentId,c.name as categoryName,c.level as level, c.path as path
+        FROM product_category c
+        INNER JOIN CategoryPath cp ON c.id = cp.parentId
+        )
+        SELECT DISTINCT * FROM CategoryPath;
+    </select>
 </mapper>