From 8df893a5437bd5e362cdba7d2702821f6fbe0306 Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Tue, 26 Mar 2024 18:01:10 +0800 Subject: [PATCH] 1 --- .../master/controller/CourseSociologyController.java | 12 ++++++++++++ .../peanut/modules/master/service/CourseService.java | 3 +++ .../master/service/impl/CourseServiceImpl.java | 11 +++++++++++ 3 files changed, 26 insertions(+) diff --git a/src/main/java/com/peanut/modules/master/controller/CourseSociologyController.java b/src/main/java/com/peanut/modules/master/controller/CourseSociologyController.java index 2034cdd2..b390caab 100644 --- a/src/main/java/com/peanut/modules/master/controller/CourseSociologyController.java +++ b/src/main/java/com/peanut/modules/master/controller/CourseSociologyController.java @@ -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 courseListForSociology = courseService.getCourseListForSociology(param.getId()); + return R.ok().put("courseList",courseListForSociology); + } + } diff --git a/src/main/java/com/peanut/modules/master/service/CourseService.java b/src/main/java/com/peanut/modules/master/service/CourseService.java index b9b0520b..9fc6d47e 100644 --- a/src/main/java/com/peanut/modules/master/service/CourseService.java +++ b/src/main/java/com/peanut/modules/master/service/CourseService.java @@ -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 { @@ -12,4 +13,6 @@ public interface CourseService extends IService { Page getCourseList(Map map); R delCourse(int id); + + List getCourseListForSociology(int sociologyId); } diff --git a/src/main/java/com/peanut/modules/master/service/impl/CourseServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/CourseServiceImpl.java index d117c1ca..5a690a93 100644 --- a/src/main/java/com/peanut/modules/master/service/impl/CourseServiceImpl.java +++ b/src/main/java/com/peanut/modules/master/service/impl/CourseServiceImpl.java @@ -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 impl return R.ok(); } + @Override + public List getCourseListForSociology(int sociologyId) { + MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); + wrapper.selectAll(CourseEntity.class); + wrapper.leftJoin(CourseEntity.class,CourseEntity::getId,CourseToSociologyEntity::getCourseId); + wrapper.eq(CourseToSociologyEntity::getSociologyId,sociologyId); + List courseEntities = courseToSociologyDao.selectJoinList(CourseEntity.class, wrapper); + return courseEntities; + } + private List categoryIds(Integer id){ ArrayList integers = new ArrayList<>(); CourseCategoryEntity courseCategoryEntity = courseCategoryDao.selectById(id);