课程分类

web/src/main/java/com/ynfy/buss/course/course/controller/CourseController.java

@@ -14,16 +14,13 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.modules.system.service.ISysCategoryService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
-import java.util.Objects;
 
 /**
  * @Description: course
@@ -42,8 +39,6 @@ public class CourseController extends JeecgController<Course, ICourseService> {
     @Autowired
     private ICourseCatalogService courseCatalogService;
 
-    @Autowired
-    private ISysCategoryService sysCategoryService;
 
     /**
      * 分页列表查询
@@ -65,10 +60,7 @@ public class CourseController extends JeecgController<Course, ICourseService> {
         QueryWrapper<Course> queryWrapper = QueryGenerator.initQueryWrapper(course, req.getParameterMap());
         Page<Course> page = new Page<Course>(pageNo, pageSize);
         IPage<Course> pageList = courseService.page(page, queryWrapper);
-        if (!Objects.isNull(pageList) && !CollectionUtils.isEmpty(pageList.getRecords())) {
-            pageList.getRecords().forEach(record -> record.setCategoryName(String.join(",",
-                    sysCategoryService.loadDictItem(record.getCategoryId()))));
-        }
+        courseService.setCategory(pageList);
         return Result.OK(pageList);
     }
 
@@ -177,6 +169,7 @@ public class CourseController extends JeecgController<Course, ICourseService> {
         Result<IPage<Course>> result = new Result<>();
         Page<Course> page = new Page<>(pageNo, pageSize);
         IPage<Course> pageList = courseService.selectCourseList(page, course);
+        courseService.setCategory(pageList);
         result.setSuccess(true);
         result.setResult(pageList);
         return result;

web/src/main/java/com/ynfy/buss/course/course/service/ICourseService.java

@@ -15,4 +15,11 @@ public interface ICourseService extends IService<Course> {
     void saveCourse(Course course);
 
     IPage<Course> selectCourseList(IPage<Course> page, Course course);
+
+    /**
+     * 设置课程分类
+     *
+     * @param pageList
+     */
+    void setCategory(IPage<Course> pageList);
 }

web/src/main/java/com/ynfy/buss/course/course/service/impl/CourseServiceImpl.java

@@ -10,10 +10,12 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.system.entity.SysDepart;
+import org.jeecg.modules.system.service.ISysCategoryService;
 import org.jeecg.modules.system.service.ISysDepartService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import java.util.Objects;
 
@@ -35,6 +37,9 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
     @Autowired
     private ISysDepartService sysDepartService;
 
+    @Autowired
+    private ISysCategoryService sysCategoryService;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void saveCourse(Course course) {
@@ -60,4 +65,18 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
         }
         return courseMapper.selectCourseList(page, course, user);
     }
+
+
+    /**
+     * 设置课程分类
+     *
+     * @param pageList
+     */
+    @Override
+    public void setCategory(IPage<Course> pageList) {
+        if (!Objects.isNull(pageList) && !CollectionUtils.isEmpty(pageList.getRecords())) {
+            pageList.getRecords().forEach(record -> record.setCategoryName(String.join(",",
+                    sysCategoryService.loadDictItem(record.getCategoryId()))));
+        }
+    }
 }