From 06bc8c639c7bdf54d8f492687dd21fb61a6240c4 Mon Sep 17 00:00:00 2001
From: none <none>
Date: Wed, 15 Mar 2023 11:41:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B5=84=E6=BA=90=E6=97=A0?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../playedu/api/controller/backend/CourseController.java  | 1 -
 .../api/controller/backend/ResourceController.java        | 1 -
 src/main/java/xyz/playedu/api/mapper/CourseMapper.java    | 1 +
 src/main/java/xyz/playedu/api/mapper/ResourceMapper.java  | 2 ++
 .../xyz/playedu/api/service/impl/CourseServiceImpl.java   | 4 +++-
 .../xyz/playedu/api/service/impl/ResourceServiceImpl.java | 4 +++-
 src/main/resources/mapper/CourseMapper.xml                | 7 +++++++
 src/main/resources/mapper/ResourceMapper.xml              | 8 ++++++++
 8 files changed, 24 insertions(+), 4 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 ef3b88f..2488d29 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 {
         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 4e62e4a..d7fb6ed 100644
--- a/src/main/java/xyz/playedu/api/controller/backend/ResourceController.java
+++ b/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());
diff --git a/src/main/java/xyz/playedu/api/mapper/CourseMapper.java b/src/main/java/xyz/playedu/api/mapper/CourseMapper.java
index 6395dbc..ba2d609 100644
--- a/src/main/java/xyz/playedu/api/mapper/CourseMapper.java
+++ b/src/main/java/xyz/playedu/api/mapper/CourseMapper.java
@@ -18,6 +18,7 @@ public interface CourseMapper extends BaseMapper<Course> {
 
     List<CourseCategoryCountMapper> getCategoryCount();
 
+    Integer getNoneCategoryCount();
 }
 
 
diff --git a/src/main/java/xyz/playedu/api/mapper/ResourceMapper.java b/src/main/java/xyz/playedu/api/mapper/ResourceMapper.java
index 39323a1..bf18d8f 100644
--- a/src/main/java/xyz/playedu/api/mapper/ResourceMapper.java
+++ b/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);
+
 }
 
 
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 c4bc6c6..816d5a3 100644
--- a/src/main/java/xyz/playedu/api/service/impl/CourseServiceImpl.java
+++ b/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
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 6d9dfa6..9a34707 100644
--- a/src/main/java/xyz/playedu/api/service/impl/ResourceServiceImpl.java
+++ b/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
diff --git a/src/main/resources/mapper/CourseMapper.xml b/src/main/resources/mapper/CourseMapper.xml
index 87df17e..853820f 100644
--- a/src/main/resources/mapper/CourseMapper.xml
+++ b/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>
diff --git a/src/main/resources/mapper/ResourceMapper.xml b/src/main/resources/mapper/ResourceMapper.xml
index 58da2aa..f373733 100644
--- a/src/main/resources/mapper/ResourceMapper.xml
+++ b/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>