From 1867d5fa1ae77ec29e551ed15d9b9720fb285da5 Mon Sep 17 00:00:00 2001 From: none Date: Tue, 14 Mar 2023 15:24:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/backend/CourseController.java | 3 +-- .../api/controller/backend/DepartmentController.java | 10 ++-------- .../controller/backend/ResourceCategoryController.java | 10 ++-------- .../xyz/playedu/api/service/DepartmentService.java | 3 +++ .../playedu/api/service/ResourceCategoryService.java | 3 +++ .../api/service/impl/DepartmentServiceImpl.java | 7 +++++++ .../api/service/impl/ResourceCategoryServiceImpl.java | 7 +++++++ 7 files changed, 25 insertions(+), 18 deletions(-) diff --git a/src/main/java/xyz/playedu/api/controller/backend/CourseController.java b/src/main/java/xyz/playedu/api/controller/backend/CourseController.java index 4921245..985e8c1 100644 --- a/src/main/java/xyz/playedu/api/controller/backend/CourseController.java +++ b/src/main/java/xyz/playedu/api/controller/backend/CourseController.java @@ -66,9 +66,8 @@ public class CourseController { @BackendPermissionMiddleware(slug = BPermissionConstant.COURSE) @GetMapping("/create") public JsonResponse create() { - Map> categories = categoryService.all().stream().collect(Collectors.groupingBy(ResourceCategory::getParentId)); HashMap data = new HashMap<>(); - data.put("categories", categories); + data.put("categories", categoryService.groupByParent()); return JsonResponse.data(data); } diff --git a/src/main/java/xyz/playedu/api/controller/backend/DepartmentController.java b/src/main/java/xyz/playedu/api/controller/backend/DepartmentController.java index 4459352..dcc2254 100644 --- a/src/main/java/xyz/playedu/api/controller/backend/DepartmentController.java +++ b/src/main/java/xyz/playedu/api/controller/backend/DepartmentController.java @@ -44,11 +44,8 @@ public class DepartmentController { @GetMapping("/index") public JsonResponse index() { - Map> departments = departmentService.all().stream().collect(Collectors.groupingBy(Department::getParentId)); - HashMap data = new HashMap<>(); - data.put("departments", departments); - + data.put("departments", departmentService.groupByParent()); return JsonResponse.data(data); } @@ -61,11 +58,8 @@ public class DepartmentController { @BackendPermissionMiddleware(slug = BPermissionConstant.DEPARTMENT_CUD) @GetMapping("/create") public JsonResponse create() { - Map> departments = departmentService.all().stream().collect(Collectors.groupingBy(Department::getParentId)); - HashMap data = new HashMap<>(); - data.put("departments", departments); - + data.put("departments", departmentService.groupByParent()); return JsonResponse.data(data); } diff --git a/src/main/java/xyz/playedu/api/controller/backend/ResourceCategoryController.java b/src/main/java/xyz/playedu/api/controller/backend/ResourceCategoryController.java index 835d0db..01b96f2 100644 --- a/src/main/java/xyz/playedu/api/controller/backend/ResourceCategoryController.java +++ b/src/main/java/xyz/playedu/api/controller/backend/ResourceCategoryController.java @@ -45,11 +45,8 @@ public class ResourceCategoryController { @GetMapping("/index") public JsonResponse index() { - Map> categories = categoryService.all().stream().collect(Collectors.groupingBy(ResourceCategory::getParentId)); - HashMap data = new HashMap<>(); - data.put("categories", categories); - + data.put("categories", categoryService.groupByParent()); return JsonResponse.data(data); } @@ -61,11 +58,8 @@ public class ResourceCategoryController { @GetMapping("/create") public JsonResponse create() { - Map> categories = categoryService.all().stream().collect(Collectors.groupingBy(ResourceCategory::getParentId)); - HashMap data = new HashMap<>(); - data.put("categories", categories); - + data.put("categories", categoryService.groupByParent()); return JsonResponse.data(data); } diff --git a/src/main/java/xyz/playedu/api/service/DepartmentService.java b/src/main/java/xyz/playedu/api/service/DepartmentService.java index 1a72e55..162f665 100644 --- a/src/main/java/xyz/playedu/api/service/DepartmentService.java +++ b/src/main/java/xyz/playedu/api/service/DepartmentService.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import xyz.playedu.api.exception.NotFoundException; import java.util.List; +import java.util.Map; /** * @author tengteng @@ -40,4 +41,6 @@ public interface DepartmentService extends IService { void changeParent(Integer id, Integer parentId, List ids) throws NotFoundException; void resetSort(List ids); + + Map> groupByParent(); } diff --git a/src/main/java/xyz/playedu/api/service/ResourceCategoryService.java b/src/main/java/xyz/playedu/api/service/ResourceCategoryService.java index 1fbbfe3..6b57a06 100644 --- a/src/main/java/xyz/playedu/api/service/ResourceCategoryService.java +++ b/src/main/java/xyz/playedu/api/service/ResourceCategoryService.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import xyz.playedu.api.exception.NotFoundException; import java.util.List; +import java.util.Map; /** * @author tengteng @@ -37,4 +38,6 @@ public interface ResourceCategoryService extends IService { void changeParent(Integer id, Integer parentId, List ids) throws NotFoundException; + Map> groupByParent(); + } diff --git a/src/main/java/xyz/playedu/api/service/impl/DepartmentServiceImpl.java b/src/main/java/xyz/playedu/api/service/impl/DepartmentServiceImpl.java index bfd8d4f..a613e17 100644 --- a/src/main/java/xyz/playedu/api/service/impl/DepartmentServiceImpl.java +++ b/src/main/java/xyz/playedu/api/service/impl/DepartmentServiceImpl.java @@ -18,6 +18,8 @@ import xyz.playedu.api.service.internal.UserDepartmentService; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** * @author tengteng @@ -225,6 +227,11 @@ public class DepartmentServiceImpl extends ServiceImpl> groupByParent() { + return list(query().getWrapper().orderByAsc("sort")).stream().collect(Collectors.groupingBy(Department::getParentId)); + } } diff --git a/src/main/java/xyz/playedu/api/service/impl/ResourceCategoryServiceImpl.java b/src/main/java/xyz/playedu/api/service/impl/ResourceCategoryServiceImpl.java index 72d065e..c0f232d 100644 --- a/src/main/java/xyz/playedu/api/service/impl/ResourceCategoryServiceImpl.java +++ b/src/main/java/xyz/playedu/api/service/impl/ResourceCategoryServiceImpl.java @@ -16,6 +16,8 @@ import xyz.playedu.api.service.internal.ResourceCourseCategoryService; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** * @author tengteng @@ -208,6 +210,11 @@ public class ResourceCategoryServiceImpl extends ServiceImpl> groupByParent() { + return list(query().getWrapper().orderByAsc("sort")).stream().collect(Collectors.groupingBy(ResourceCategory::getParentId)); + } }