增加资源无分类查询

src/main/java/xyz/playedu/api/controller/backend/CourseController.java

@@ -75,7 +75,6 @@ public class CourseController {
         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);
     }

src/main/java/xyz/playedu/api/controller/backend/ResourceController.java

@@ -78,7 +78,6 @@ public class ResourceController {
         HashMap<String, Object> 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)) {
             List<ResourceVideo> resourceVideos = resourceVideoService.chunksByRids(result.getData().stream().map(Resource::getId).toList());

src/main/java/xyz/playedu/api/mapper/CourseMapper.java

@@ -18,6 +18,7 @@ public interface CourseMapper extends BaseMapper<Course> {
 
     List<CourseCategoryCountMapper> getCategoryCount();
 
+    Integer getNoneCategoryCount();
 }
 
 

src/main/java/xyz/playedu/api/mapper/ResourceMapper.java

@@ -19,6 +19,8 @@ public interface ResourceMapper extends BaseMapper<Resource> {
 
     List<ResourceCategoryCountMapper> getCategoryCount(String type);
 
+    Integer getNoneCategoryCount(String type);
+
 }
 
 

src/main/java/xyz/playedu/api/service/impl/CourseServiceImpl.java

@@ -210,7 +210,9 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
 
     @Override
     public Map<Integer, Integer> getCategoryCount() {
-        return getBaseMapper().getCategoryCount().stream().collect(Collectors.toMap(CourseCategoryCountMapper::getCid, CourseCategoryCountMapper::getTotal));
+        Map<Integer, Integer> data = getBaseMapper().getCategoryCount().stream().collect(Collectors.toMap(CourseCategoryCountMapper::getCid, CourseCategoryCountMapper::getTotal));
+        data.put(0, getBaseMapper().getNoneCategoryCount());
+        return data;
     }
 
     @Override

src/main/java/xyz/playedu/api/service/impl/ResourceServiceImpl.java

@@ -157,7 +157,9 @@ public class ResourceServiceImpl extends ServiceImpl<ResourceMapper, Resource> i
 
     @Override
     public Map<Integer, Integer> getCategoryCount(String type) {
-        return getBaseMapper().getCategoryCount(type).stream().collect(Collectors.toMap(ResourceCategoryCountMapper::getCid, ResourceCategoryCountMapper::getTotal));
+        Map<Integer, Integer> data = getBaseMapper().getCategoryCount(type).stream().collect(Collectors.toMap(ResourceCategoryCountMapper::getCid, ResourceCategoryCountMapper::getTotal));
+        data.put(0, getBaseMapper().getNoneCategoryCount(type));
+        return data;
     }
 
     @Override

src/main/resources/mapper/CourseMapper.xml

@@ -27,4 +27,11 @@
         FROM `resource_course_category`
         GROUP BY `resource_course_category`.`category_id`;
     </select>
+
+    <select id="getNoneCategoryCount" resultType="java.lang.Integer">
+        SELECT count(DISTINCT `courses`.`id`) AS `total`
+        FROM `courses`
+                 LEFT JOIN `resource_course_category` ON `resource_course_category`.`course_id` = `courses`.`id`
+        WHERE `resource_course_category`.`course_id` IS NULL;
+    </select>
 </mapper>

src/main/resources/mapper/ResourceMapper.xml

@@ -36,4 +36,12 @@
         GROUP BY `resource_category`.`cid`;
     </select>
 
+    <select id="getNoneCategoryCount" resultType="java.lang.Integer">
+        SELECT count(DISTINCT `resources`.`id`) AS `total`
+        FROM `resources`
+                 LEFT JOIN `resource_category` ON `resource_category`.`rid` = `resources`.`id`
+        WHERE `resources`.`type` = #{type}
+          AND `resource_category`.`cid` IS NULL;
+    </select>
+
 </mapper>