1
This commit is contained in:
@@ -1,14 +1,18 @@
|
||||
package com.peanut.modules.master.controller;
|
||||
|
||||
import com.peanut.common.utils.R;
|
||||
import com.peanut.modules.common.dao.CourseDao;
|
||||
import com.peanut.modules.common.entity.CourseEntity;
|
||||
import com.peanut.modules.common.entity.CourseSociologyEntity;
|
||||
import com.peanut.modules.common.to.ParamTo;
|
||||
import com.peanut.modules.master.service.CourseService;
|
||||
import com.peanut.modules.master.service.CourseSociologyService;
|
||||
import com.peanut.modules.master.service.CourseToSociologyService;
|
||||
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.List;
|
||||
@@ -21,6 +25,8 @@ public class CourseSociologyController {
|
||||
private CourseSociologyService courseSociologyService;
|
||||
@Autowired
|
||||
private CourseToSociologyService courseToSociologyService;
|
||||
@Autowired
|
||||
private CourseService courseService;
|
||||
|
||||
@RequestMapping("/getCourseSociologyList")
|
||||
public R getCourseSociologyList(){
|
||||
@@ -45,4 +51,10 @@ public class CourseSociologyController {
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@RequestMapping("/getCourseListForSociology")
|
||||
public R getCourseListForSociology(@RequestBody ParamTo param){
|
||||
List<CourseEntity> courseListForSociology = courseService.getCourseListForSociology(param.getId());
|
||||
return R.ok().put("courseList",courseListForSociology);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.peanut.common.utils.R;
|
||||
import com.peanut.modules.common.entity.CourseEntity;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public interface CourseService extends IService<CourseEntity> {
|
||||
@@ -12,4 +13,6 @@ public interface CourseService extends IService<CourseEntity> {
|
||||
Page getCourseList(Map<String ,Object> map);
|
||||
|
||||
R delCourse(int id);
|
||||
|
||||
List<CourseEntity> getCourseListForSociology(int sociologyId);
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@ package com.peanut.modules.master.service.impl;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
||||
import com.peanut.common.utils.ObjectUtils;
|
||||
import com.peanut.common.utils.R;
|
||||
import com.peanut.modules.common.dao.*;
|
||||
@@ -91,6 +92,16 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<CourseEntity> getCourseListForSociology(int sociologyId) {
|
||||
MPJLambdaWrapper<CourseToSociologyEntity> wrapper = new MPJLambdaWrapper<>();
|
||||
wrapper.selectAll(CourseEntity.class);
|
||||
wrapper.leftJoin(CourseEntity.class,CourseEntity::getId,CourseToSociologyEntity::getCourseId);
|
||||
wrapper.eq(CourseToSociologyEntity::getSociologyId,sociologyId);
|
||||
List<CourseEntity> courseEntities = courseToSociologyDao.selectJoinList(CourseEntity.class, wrapper);
|
||||
return courseEntities;
|
||||
}
|
||||
|
||||
private List<Integer> categoryIds(Integer id){
|
||||
ArrayList<Integer> integers = new ArrayList<>();
|
||||
CourseCategoryEntity courseCategoryEntity = courseCategoryDao.selectById(id);
|
||||
|
||||
Reference in New Issue
Block a user