bug修复

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/PlatformStatusOverviewController.java

@@ -1,5 +1,6 @@
 package vip.xiaonuo.disk.controller;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -11,6 +12,8 @@ import org.springframework.web.bind.annotation.RestController;
 import vip.xiaonuo.common.pojo.CommonResult;
 import vip.xiaonuo.disk.service.PlatformStatusOverviewService;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -44,6 +47,14 @@ public class PlatformStatusOverviewController {
         return CommonResult.data(platformStatusOverviewService.getAllCourses());
     }
 
+    @ApiOperation("所有开课课程-分页版")
+    @GetMapping("/allCoursesPage")
+    public CommonResult<Page<Map<String,Object>>> allCoursesPage(HttpServletRequest req) {
+        Map param =new HashMap();
+        Page<Map<String,Object>> list=platformStatusOverviewService.getAllCoursesPage(param);
+        return CommonResult.data(list);
+    }
+
     @ApiOperation("指定课程近7天访问量趋势")
     @GetMapping("/courseVisitTrend")
     public CommonResult<Map<String, Object>> courseVisitTrend(

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/PlatformStatusOverviewMapper.java

@@ -1,5 +1,6 @@
 package vip.xiaonuo.disk.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import java.util.List;
 import java.util.Map;
@@ -28,6 +29,11 @@ public interface PlatformStatusOverviewMapper {
      */
     List<Map<String, Object>> getAllCourses();
 
+    /**
+     * 平台运行状态总览-获取所有课程
+     */
+    Page<Map<String,Object>> getAllCoursesPage(@Param("param") Map param, @Param("page") Page<Object> page);
+
     /**
      * 获取指定课程近7天访问量趋势(旧)
      * @param courseId 课程ID

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/PlatformStatusOverviewMapper.xml

@@ -162,5 +162,30 @@
             and finalTwo.csbCreateTime=#{day}
         </if>
     </select>
+    <select id="getAllCoursesPage" resultType="java.util.Map">
+        SELECT
+            co.ID,
+            co.COURSE_ID,
+            ci.COURSE_NAME,
+            co.TEACHER_ID,
+            su.NAME TEACHER_NAME,
+            co.START_TIME,
+            ci.VIEW_COUNT,
+            IFNULL( r1.STUDENT_COUNT, 0 ) STUDENT_COUNT
+        FROM COURSE_OPEN co
+        LEFT JOIN COURSE_INFO ci ON co.COURSE_ID = ci.COURSE_ID
+        LEFT JOIN SYS_USER su ON co.TEACHER_ID = su.ID
+        LEFT JOIN (
+            SELECT
+                COUNT( su.ID ) STUDENT_COUNT,
+                su.GRADES_ID
+            FROM SYS_USER su
+            WHERE su.DELETE_FLAG = 'NOT_DELETE'
+            AND su.EDU_IDENTITY = 2
+            GROUP BY su.GRADES_ID
+        ) r1 ON co.GRADES_ID = r1.GRADES_ID
+        WHERE co.DELETE_FLAG = 'NOT_DELETE'
+        AND co.STATUS = 0
+    </select>
 
 </mapper>

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/service/PlatformStatusOverviewService.java

@@ -1,5 +1,7 @@
 package vip.xiaonuo.disk.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
 import java.util.Map;
 
 /**
@@ -26,6 +28,11 @@ public interface PlatformStatusOverviewService {
      */
     Map<String, Object> getAllCourses();
 
+    /**
+     *  平台运行状态总览-获取所有课程
+     */
+    Page<Map<String,Object>> getAllCoursesPage(Map param);
+
     /**
      * 获取指定课程近7天访问量趋势
      * @param courseId 课程ID

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/service/impl/PlatformStatusOverviewServiceImpl.java

@@ -1,7 +1,9 @@
 package vip.xiaonuo.disk.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+import vip.xiaonuo.common.page.CommonPageRequest;
 import vip.xiaonuo.disk.mapper.PlatformStatusOverviewMapper;
 import vip.xiaonuo.disk.service.PlatformStatusOverviewService;
 
@@ -42,6 +44,15 @@ public class PlatformStatusOverviewServiceImpl implements PlatformStatusOverview
         return result;
     }
 
+    /**
+     *  平台运行状态总览-获取所有课程
+     */
+    @Override
+    public Page<Map<String,Object>> getAllCoursesPage(Map param)
+    {
+        return platformStatusOverviewMapper.getAllCoursesPage(param, CommonPageRequest.defaultPage());
+    }
+
     @Override
     public Map<String, Object> getCourseVisitTrend(Long courseId) {
         Map<String, Object> result = new HashMap<>();