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 a8e7fe0..d668960 100644 --- a/src/main/java/xyz/playedu/api/controller/backend/CourseController.java +++ b/src/main/java/xyz/playedu/api/controller/backend/CourseController.java @@ -75,7 +75,6 @@ public class CourseController { HashMap data = new HashMap<>(); data.put("data", result.getData()); data.put("total", result.getTotal()); - data.put("category_count", courseService.getCategoryCount()); data.put("pure_total", courseService.total()); return JsonResponse.data(data); diff --git a/src/main/java/xyz/playedu/api/controller/backend/ResourceController.java b/src/main/java/xyz/playedu/api/controller/backend/ResourceController.java index 1fbca5f..8e80093 100644 --- a/src/main/java/xyz/playedu/api/controller/backend/ResourceController.java +++ b/src/main/java/xyz/playedu/api/controller/backend/ResourceController.java @@ -77,7 +77,6 @@ public class ResourceController { HashMap data = new HashMap<>(); data.put("result", result); - data.put("category_count", resourceService.getCategoryCount(type)); data.put("pure_total", resourceService.total(type)); if (type.equals(BackendConstant.RESOURCE_TYPE_VIDEO)) { diff --git a/src/main/java/xyz/playedu/api/mapper/CourseMapper.java b/src/main/java/xyz/playedu/api/mapper/CourseMapper.java index 142c6bf..4c126c2 100644 --- a/src/main/java/xyz/playedu/api/mapper/CourseMapper.java +++ b/src/main/java/xyz/playedu/api/mapper/CourseMapper.java @@ -17,8 +17,6 @@ import java.util.List; @Mapper public interface CourseMapper extends BaseMapper { - List getCategoryCount(); - List paginate(CoursePaginateFiler filer); Long paginateCount(CoursePaginateFiler filer); diff --git a/src/main/java/xyz/playedu/api/mapper/ResourceMapper.java b/src/main/java/xyz/playedu/api/mapper/ResourceMapper.java index 1bc8188..d7c85cc 100644 --- a/src/main/java/xyz/playedu/api/mapper/ResourceMapper.java +++ b/src/main/java/xyz/playedu/api/mapper/ResourceMapper.java @@ -18,10 +18,6 @@ import java.util.Map; @Mapper public interface ResourceMapper extends BaseMapper { - List getCategoryCount(String type); - - Integer getNunCategoryCount(String type); - List paginate(ResourcePaginateFilter filter); Long paginateCount(ResourcePaginateFilter filter); diff --git a/src/main/java/xyz/playedu/api/service/CourseService.java b/src/main/java/xyz/playedu/api/service/CourseService.java index afbc805..6b2b700 100644 --- a/src/main/java/xyz/playedu/api/service/CourseService.java +++ b/src/main/java/xyz/playedu/api/service/CourseService.java @@ -44,8 +44,6 @@ public interface CourseService extends IService { List chunks(List ids); - Map getCategoryCount(); - Integer total(); List openCoursesAndShow(Integer limit); diff --git a/src/main/java/xyz/playedu/api/service/ResourceService.java b/src/main/java/xyz/playedu/api/service/ResourceService.java index 9f1252c..0dbdf08 100644 --- a/src/main/java/xyz/playedu/api/service/ResourceService.java +++ b/src/main/java/xyz/playedu/api/service/ResourceService.java @@ -30,8 +30,6 @@ public interface ResourceService extends IService { List chunks(List ids, List fields); - Map getCategoryCount(String type); - Integer total(String type); Integer duration(Integer id); diff --git a/src/main/java/xyz/playedu/api/service/impl/CourseServiceImpl.java b/src/main/java/xyz/playedu/api/service/impl/CourseServiceImpl.java index 7c22099..6141ce4 100644 --- a/src/main/java/xyz/playedu/api/service/impl/CourseServiceImpl.java +++ b/src/main/java/xyz/playedu/api/service/impl/CourseServiceImpl.java @@ -169,11 +169,6 @@ public class CourseServiceImpl extends ServiceImpl impleme return list(query().getWrapper().in("id", ids)); } - @Override - public Map getCategoryCount() { - return getBaseMapper().getCategoryCount().stream().collect(Collectors.toMap(CourseCategoryCountMapper::getCid, CourseCategoryCountMapper::getTotal)); - } - @Override public Integer total() { return Math.toIntExact(count()); diff --git a/src/main/java/xyz/playedu/api/service/impl/ResourceServiceImpl.java b/src/main/java/xyz/playedu/api/service/impl/ResourceServiceImpl.java index 39a1d8f..d2f7e5b 100644 --- a/src/main/java/xyz/playedu/api/service/impl/ResourceServiceImpl.java +++ b/src/main/java/xyz/playedu/api/service/impl/ResourceServiceImpl.java @@ -112,13 +112,6 @@ public class ResourceServiceImpl extends ServiceImpl i return list(query().getWrapper().in("id", ids).select(fields)); } - @Override - public Map getCategoryCount(String type) { - Map data = getBaseMapper().getCategoryCount(type).stream().collect(Collectors.toMap(ResourceCategoryCountMapper::getCid, ResourceCategoryCountMapper::getTotal)); - data.put(0, getBaseMapper().getNunCategoryCount(type)); - return data; - } - @Override public Integer total(String type) { return Math.toIntExact(count(query().getWrapper().eq("type", type).eq("is_hidden", 0))); diff --git a/src/main/resources/mapper/CourseMapper.xml b/src/main/resources/mapper/CourseMapper.xml index 8b8feee..a6f5e6b 100644 --- a/src/main/resources/mapper/CourseMapper.xml +++ b/src/main/resources/mapper/CourseMapper.xml @@ -8,6 +8,7 @@ + @@ -18,18 +19,12 @@ - id,title,thumb, + id,title,thumb,short_desc, charge,class_hour,is_show, is_required,created_at,updated_at, deleted_at - - - SELECT `resource_category`.`cid` as `cid`, count(*) as `total` - FROM `resources` - INNER JOIN `resource_category` ON `resource_category`.`rid` = `resources`.`id` - WHERE `resources`.`type` = #{type} - AND `resources`.`is_hidden` = 0 - GROUP BY `resource_category`.`cid`; - - - -