1

src/main/java/com/peanut/modules/common/entity/CourseEntity.java

@@ -1,11 +1,13 @@
 package com.peanut.modules.common.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 
 @Data
@@ -23,4 +25,7 @@ public class CourseEntity {
 
     @TableLogic
     private Integer delFlag;
+
+    @TableField(exist = false)
+    private List<CourseCatalogueEntity> courseCatalogueEntityList;
 }

src/main/java/com/peanut/modules/master/controller/CourseController.java

@@ -8,6 +8,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Map;
@@ -25,4 +26,24 @@ public class CourseController {
         Page courseList = courseService.getCourseList(map);
         return R.ok().put("page",courseList);
     }
+
+    @RequestMapping("/addCourse")
+    public R addCourse(@RequestBody CourseEntity course){
+        courseService.save(course);
+        return R.ok();
+    }
+
+    @RequestMapping("/delCourse")
+    public R delCourse(int id){
+        return courseService.delCourse(id);
+    }
+
+    @RequestMapping("/editCourse")
+    public R editCourse(@RequestBody CourseEntity course){
+        courseService.updateById(course);
+        return R.ok();
+    }
+
+
+
 }

src/main/java/com/peanut/modules/master/service/CourseService.java

@@ -2,6 +2,7 @@ package com.peanut.modules.master.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.peanut.common.utils.R;
 import com.peanut.modules.common.entity.CourseEntity;
 
 import java.util.Map;
@@ -9,4 +10,6 @@ import java.util.Map;
 public interface CourseService extends IService<CourseEntity> {
 
     Page getCourseList(Map<String ,Object> map);
+
+    R delCourse(int id);
 }

src/main/java/com/peanut/modules/master/service/impl/CourseServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.peanut.common.utils.R;
 import com.peanut.modules.common.dao.*;
 import com.peanut.modules.common.entity.*;
 import com.peanut.modules.master.service.CourseService;
@@ -27,6 +28,8 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
     private CourseSociologyDao courseSociologyDao;
     @Autowired
     private CourseToSociologyDao courseToSociologyDao;
+    @Autowired
+    private CourseCatalogueDao courseCatalogueDao;
 
     @Override
     public Page getCourseList(Map<String,Object> map) {
@@ -66,10 +69,24 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
         }
         wrapper.like(CourseEntity::getTitle,map.get("keywords").toString());
         Page<CourseEntity> courseEntityPage = this.getBaseMapper().selectPage(new Page<>(page, limit), wrapper);
+        for (CourseEntity c:courseEntityPage.getRecords()){
+            List<CourseCatalogueEntity> courseCatalogueEntities = courseCatalogueDao.selectList(new LambdaQueryWrapper<CourseCatalogueEntity>().eq(CourseCatalogueEntity::getCourseId, c.getId()).orderByAsc(CourseCatalogueEntity::getSort));
+            c.setCourseCatalogueEntityList(courseCatalogueEntities);
+        }
 
         return courseEntityPage;
     }
 
+    @Override
+    public R delCourse(int id) {
+        CourseCatalogueEntity courseCatalogueEntity = courseCatalogueDao.selectOne(new LambdaQueryWrapper<CourseCatalogueEntity>().eq(CourseCatalogueEntity::getCourseId, id));
+        if (courseCatalogueEntity!=null){
+            return R.error("请先删除目录后再删除！");
+        }
+        this.removeById(id);
+        return R.ok();
+    }
+
     private List<Integer> categoryIds(Integer id){
         ArrayList<Integer> integers = new ArrayList<>();
         CourseCategoryEntity courseCategoryEntity = courseCategoryDao.selectById(id);