From 4be154181854acf5e8a786ff6ff9f50a83d5c0ed Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Mon, 20 May 2024 16:02:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=BD=E5=90=8D=E9=94=99=E8=AF=AF=EF=BC=8C?= =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=90=A5=E9=94=80=E6=A0=87=E7=AD=BE=E5=88=86?= =?UTF-8?q?=E5=BC=80=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/common/dao/CourseCategoryDao.java | 9 - .../modules/common/dao/CourseMarketDao.java | 9 - ...MedicalDao.java => CourseMedicineDao.java} | 4 +- .../common/dao/CourseMedicineMarketDao.java | 9 + .../common/dao/CourseSociologyMarketDao.java | 9 + .../common/dao/CourseToCategoryDao.java | 9 - .../modules/common/dao/CourseToMarketDao.java | 9 - ...dicalDao.java => CourseToMedicineDao.java} | 4 +- .../common/dao/CourseToMedicineMarketDao.java | 9 + .../dao/CourseToSociologyMarketDao.java | 9 + ...CourseMedical.java => CourseMedicine.java} | 6 +- ...y.java => CourseMedicineMarketEntity.java} | 6 +- ....java => CourseSociologyMarketEntity.java} | 14 +- ...seToMedical.java => CourseToMedicine.java} | 4 +- ...java => CourseToMedicineMarketEntity.java} | 6 +- ...ava => CourseToSociologyMarketEntity.java} | 7 +- ...ler.java => CourseMedicineController.java} | 26 +-- .../CourseMedicineMarketController.java | 179 ++++++++++++++++++ ...a => CourseSociologyMarketController.java} | 67 ++++--- .../master/service/CourseMarketService.java | 12 -- .../master/service/CourseMedicalService.java | 8 +- .../service/CourseMedicineMarketService.java | 12 ++ .../service/CourseSociologyMarketService.java | 13 ++ .../master/service/CourseToMarketService.java | 7 - .../service/CourseToMedicalService.java | 6 +- .../CourseToMedicineMarketService.java | 7 + .../CourseToSociologyMarketService.java | 8 + ...a => CourseMedicineMarketServiceImpl.java} | 20 +- ...pl.java => CourseMedicineServiceImpl.java} | 42 ++-- .../service/impl/CourseServiceImpl.java | 68 +------ .../CourseSociologyMarketServiceImpl.java | 52 +++++ .../impl/CourseToMarketServiceImpl.java | 13 -- .../CourseToMedicineMarketServiceImpl.java | 13 ++ ....java => CourseToMedicineServiceImpl.java} | 10 +- .../CourseToSociologyMarketServiceImpl.java | 16 ++ .../medical/controller/HomeController.java | 8 +- .../medical/service/CourseMarketService.java | 6 +- .../medical/service/CourseMedicalService.java | 6 +- .../service/impl/CourseMarketServiceImpl.java | 18 +- .../impl/CourseMedicalServiceImpl.java | 16 +- .../service/impl/CourseServiceImpl.java | 14 +- .../service/impl/CourseServiceImpl.java | 4 +- .../sys/service/impl/ShiroServiceImpl.java | 2 +- .../mapper/book/BookListeningDao.xml | 22 --- 44 files changed, 498 insertions(+), 300 deletions(-) delete mode 100644 src/main/java/com/peanut/modules/common/dao/CourseCategoryDao.java delete mode 100644 src/main/java/com/peanut/modules/common/dao/CourseMarketDao.java rename src/main/java/com/peanut/modules/common/dao/{CourseMedicalDao.java => CourseMedicineDao.java} (52%) create mode 100644 src/main/java/com/peanut/modules/common/dao/CourseMedicineMarketDao.java create mode 100644 src/main/java/com/peanut/modules/common/dao/CourseSociologyMarketDao.java delete mode 100644 src/main/java/com/peanut/modules/common/dao/CourseToCategoryDao.java delete mode 100644 src/main/java/com/peanut/modules/common/dao/CourseToMarketDao.java rename src/main/java/com/peanut/modules/common/dao/{CourseToMedicalDao.java => CourseToMedicineDao.java} (51%) create mode 100644 src/main/java/com/peanut/modules/common/dao/CourseToMedicineMarketDao.java create mode 100644 src/main/java/com/peanut/modules/common/dao/CourseToSociologyMarketDao.java rename src/main/java/com/peanut/modules/common/entity/{CourseMedical.java => CourseMedicine.java} (84%) rename src/main/java/com/peanut/modules/common/entity/{CourseMarketEntity.java => CourseMedicineMarketEntity.java} (81%) rename src/main/java/com/peanut/modules/common/entity/{CourseCategoryEntity.java => CourseSociologyMarketEntity.java} (66%) rename src/main/java/com/peanut/modules/common/entity/{CourseToMedical.java => CourseToMedicine.java} (87%) rename src/main/java/com/peanut/modules/common/entity/{CourseToMarketEntity.java => CourseToMedicineMarketEntity.java} (76%) rename src/main/java/com/peanut/modules/common/entity/{CourseToCategoryEntity.java => CourseToSociologyMarketEntity.java} (76%) rename src/main/java/com/peanut/modules/master/controller/{CourseMedicalController.java => CourseMedicineController.java} (75%) create mode 100644 src/main/java/com/peanut/modules/master/controller/CourseMedicineMarketController.java rename src/main/java/com/peanut/modules/master/controller/{CourseMarketController.java => CourseSociologyMarketController.java} (68%) delete mode 100644 src/main/java/com/peanut/modules/master/service/CourseMarketService.java create mode 100644 src/main/java/com/peanut/modules/master/service/CourseMedicineMarketService.java create mode 100644 src/main/java/com/peanut/modules/master/service/CourseSociologyMarketService.java delete mode 100644 src/main/java/com/peanut/modules/master/service/CourseToMarketService.java create mode 100644 src/main/java/com/peanut/modules/master/service/CourseToMedicineMarketService.java create mode 100644 src/main/java/com/peanut/modules/master/service/CourseToSociologyMarketService.java rename src/main/java/com/peanut/modules/master/service/impl/{CourseMarketServiceImpl.java => CourseMedicineMarketServiceImpl.java} (59%) rename src/main/java/com/peanut/modules/master/service/impl/{CourseMedicalServiceImpl.java => CourseMedicineServiceImpl.java} (52%) create mode 100644 src/main/java/com/peanut/modules/master/service/impl/CourseSociologyMarketServiceImpl.java delete mode 100644 src/main/java/com/peanut/modules/master/service/impl/CourseToMarketServiceImpl.java create mode 100644 src/main/java/com/peanut/modules/master/service/impl/CourseToMedicineMarketServiceImpl.java rename src/main/java/com/peanut/modules/master/service/impl/{CourseToMedicalServiceImpl.java => CourseToMedicineServiceImpl.java} (54%) create mode 100644 src/main/java/com/peanut/modules/master/service/impl/CourseToSociologyMarketServiceImpl.java delete mode 100644 src/main/resources/mapper/book/BookListeningDao.xml diff --git a/src/main/java/com/peanut/modules/common/dao/CourseCategoryDao.java b/src/main/java/com/peanut/modules/common/dao/CourseCategoryDao.java deleted file mode 100644 index 9ccd7b43..00000000 --- a/src/main/java/com/peanut/modules/common/dao/CourseCategoryDao.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.peanut.modules.common.dao; - -import com.github.yulichang.base.MPJBaseMapper; -import com.peanut.modules.common.entity.CourseCategoryEntity; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface CourseCategoryDao extends MPJBaseMapper { -} diff --git a/src/main/java/com/peanut/modules/common/dao/CourseMarketDao.java b/src/main/java/com/peanut/modules/common/dao/CourseMarketDao.java deleted file mode 100644 index b0443f02..00000000 --- a/src/main/java/com/peanut/modules/common/dao/CourseMarketDao.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.peanut.modules.common.dao; - -import com.github.yulichang.base.MPJBaseMapper; -import com.peanut.modules.common.entity.CourseMarketEntity; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface CourseMarketDao extends MPJBaseMapper { -} diff --git a/src/main/java/com/peanut/modules/common/dao/CourseMedicalDao.java b/src/main/java/com/peanut/modules/common/dao/CourseMedicineDao.java similarity index 52% rename from src/main/java/com/peanut/modules/common/dao/CourseMedicalDao.java rename to src/main/java/com/peanut/modules/common/dao/CourseMedicineDao.java index d8df260f..a9b19292 100644 --- a/src/main/java/com/peanut/modules/common/dao/CourseMedicalDao.java +++ b/src/main/java/com/peanut/modules/common/dao/CourseMedicineDao.java @@ -1,9 +1,9 @@ package com.peanut.modules.common.dao; import com.github.yulichang.base.MPJBaseMapper; -import com.peanut.modules.common.entity.CourseMedical; +import com.peanut.modules.common.entity.CourseMedicine; import org.apache.ibatis.annotations.Mapper; @Mapper -public interface CourseMedicalDao extends MPJBaseMapper { +public interface CourseMedicineDao extends MPJBaseMapper { } diff --git a/src/main/java/com/peanut/modules/common/dao/CourseMedicineMarketDao.java b/src/main/java/com/peanut/modules/common/dao/CourseMedicineMarketDao.java new file mode 100644 index 00000000..00b4c9e6 --- /dev/null +++ b/src/main/java/com/peanut/modules/common/dao/CourseMedicineMarketDao.java @@ -0,0 +1,9 @@ +package com.peanut.modules.common.dao; + +import com.github.yulichang.base.MPJBaseMapper; +import com.peanut.modules.common.entity.CourseMedicineMarketEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CourseMedicineMarketDao extends MPJBaseMapper { +} diff --git a/src/main/java/com/peanut/modules/common/dao/CourseSociologyMarketDao.java b/src/main/java/com/peanut/modules/common/dao/CourseSociologyMarketDao.java new file mode 100644 index 00000000..225692c4 --- /dev/null +++ b/src/main/java/com/peanut/modules/common/dao/CourseSociologyMarketDao.java @@ -0,0 +1,9 @@ +package com.peanut.modules.common.dao; + +import com.github.yulichang.base.MPJBaseMapper; +import com.peanut.modules.common.entity.CourseSociologyMarketEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CourseSociologyMarketDao extends MPJBaseMapper { +} diff --git a/src/main/java/com/peanut/modules/common/dao/CourseToCategoryDao.java b/src/main/java/com/peanut/modules/common/dao/CourseToCategoryDao.java deleted file mode 100644 index dcbb88f1..00000000 --- a/src/main/java/com/peanut/modules/common/dao/CourseToCategoryDao.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.peanut.modules.common.dao; - -import com.github.yulichang.base.MPJBaseMapper; -import com.peanut.modules.common.entity.CourseToCategoryEntity; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface CourseToCategoryDao extends MPJBaseMapper { - } diff --git a/src/main/java/com/peanut/modules/common/dao/CourseToMarketDao.java b/src/main/java/com/peanut/modules/common/dao/CourseToMarketDao.java deleted file mode 100644 index f08c4659..00000000 --- a/src/main/java/com/peanut/modules/common/dao/CourseToMarketDao.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.peanut.modules.common.dao; - -import com.github.yulichang.base.MPJBaseMapper; -import com.peanut.modules.common.entity.CourseToMarketEntity; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface CourseToMarketDao extends MPJBaseMapper { -} diff --git a/src/main/java/com/peanut/modules/common/dao/CourseToMedicalDao.java b/src/main/java/com/peanut/modules/common/dao/CourseToMedicineDao.java similarity index 51% rename from src/main/java/com/peanut/modules/common/dao/CourseToMedicalDao.java rename to src/main/java/com/peanut/modules/common/dao/CourseToMedicineDao.java index ee29802a..3400ed96 100644 --- a/src/main/java/com/peanut/modules/common/dao/CourseToMedicalDao.java +++ b/src/main/java/com/peanut/modules/common/dao/CourseToMedicineDao.java @@ -1,9 +1,9 @@ package com.peanut.modules.common.dao; import com.github.yulichang.base.MPJBaseMapper; -import com.peanut.modules.common.entity.CourseToMedical; +import com.peanut.modules.common.entity.CourseToMedicine; import org.apache.ibatis.annotations.Mapper; @Mapper -public interface CourseToMedicalDao extends MPJBaseMapper { +public interface CourseToMedicineDao extends MPJBaseMapper { } diff --git a/src/main/java/com/peanut/modules/common/dao/CourseToMedicineMarketDao.java b/src/main/java/com/peanut/modules/common/dao/CourseToMedicineMarketDao.java new file mode 100644 index 00000000..0e2d47b4 --- /dev/null +++ b/src/main/java/com/peanut/modules/common/dao/CourseToMedicineMarketDao.java @@ -0,0 +1,9 @@ +package com.peanut.modules.common.dao; + +import com.github.yulichang.base.MPJBaseMapper; +import com.peanut.modules.common.entity.CourseToMedicineMarketEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CourseToMedicineMarketDao extends MPJBaseMapper { +} diff --git a/src/main/java/com/peanut/modules/common/dao/CourseToSociologyMarketDao.java b/src/main/java/com/peanut/modules/common/dao/CourseToSociologyMarketDao.java new file mode 100644 index 00000000..5eb8f3e7 --- /dev/null +++ b/src/main/java/com/peanut/modules/common/dao/CourseToSociologyMarketDao.java @@ -0,0 +1,9 @@ +package com.peanut.modules.common.dao; + +import com.github.yulichang.base.MPJBaseMapper; +import com.peanut.modules.common.entity.CourseToSociologyMarketEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CourseToSociologyMarketDao extends MPJBaseMapper { +} diff --git a/src/main/java/com/peanut/modules/common/entity/CourseMedical.java b/src/main/java/com/peanut/modules/common/entity/CourseMedicine.java similarity index 84% rename from src/main/java/com/peanut/modules/common/entity/CourseMedical.java rename to src/main/java/com/peanut/modules/common/entity/CourseMedicine.java index 16a7d132..7e2138da 100644 --- a/src/main/java/com/peanut/modules/common/entity/CourseMedical.java +++ b/src/main/java/com/peanut/modules/common/entity/CourseMedicine.java @@ -9,8 +9,8 @@ import java.util.Date; import java.util.List; @Data -@TableName("course_medical") -public class CourseMedical { +@TableName("course_medicine") +public class CourseMedicine { @TableId private Integer id; @@ -29,5 +29,5 @@ public class CourseMedical { private Integer delFlag; @TableField(exist = false) - private List children; + private List children; } \ No newline at end of file diff --git a/src/main/java/com/peanut/modules/common/entity/CourseMarketEntity.java b/src/main/java/com/peanut/modules/common/entity/CourseMedicineMarketEntity.java similarity index 81% rename from src/main/java/com/peanut/modules/common/entity/CourseMarketEntity.java rename to src/main/java/com/peanut/modules/common/entity/CourseMedicineMarketEntity.java index c0674a40..70016e6a 100644 --- a/src/main/java/com/peanut/modules/common/entity/CourseMarketEntity.java +++ b/src/main/java/com/peanut/modules/common/entity/CourseMedicineMarketEntity.java @@ -10,8 +10,8 @@ import java.util.Date; import java.util.List; @Data -@TableName("course_market") -public class CourseMarketEntity { +@TableName("course_medicine_market") +public class CourseMedicineMarketEntity { @TableId private Integer id; @@ -29,5 +29,5 @@ public class CourseMarketEntity { private Integer delFlag; @TableField(exist = false) - private List children; + private List children; } diff --git a/src/main/java/com/peanut/modules/common/entity/CourseCategoryEntity.java b/src/main/java/com/peanut/modules/common/entity/CourseSociologyMarketEntity.java similarity index 66% rename from src/main/java/com/peanut/modules/common/entity/CourseCategoryEntity.java rename to src/main/java/com/peanut/modules/common/entity/CourseSociologyMarketEntity.java index 78114dee..1cc5cd9e 100644 --- a/src/main/java/com/peanut/modules/common/entity/CourseCategoryEntity.java +++ b/src/main/java/com/peanut/modules/common/entity/CourseSociologyMarketEntity.java @@ -1,31 +1,33 @@ 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 -@TableName("course_category") -public class CourseCategoryEntity { - +@TableName("course_sociology_market") +public class CourseSociologyMarketEntity { @TableId private Integer id; private Integer pid; - private String uid; + private Integer isLast; private String title; - private Integer isLast; - private Integer sort; private Date createTime; @TableLogic private Integer delFlag; + + @TableField(exist = false) + private List children; } diff --git a/src/main/java/com/peanut/modules/common/entity/CourseToMedical.java b/src/main/java/com/peanut/modules/common/entity/CourseToMedicine.java similarity index 87% rename from src/main/java/com/peanut/modules/common/entity/CourseToMedical.java rename to src/main/java/com/peanut/modules/common/entity/CourseToMedicine.java index f2aa637a..b99f4b66 100644 --- a/src/main/java/com/peanut/modules/common/entity/CourseToMedical.java +++ b/src/main/java/com/peanut/modules/common/entity/CourseToMedicine.java @@ -8,8 +8,8 @@ import lombok.Data; import java.util.Date; @Data -@TableName("course_to_medical") -public class CourseToMedical { +@TableName("course_to_medicine") +public class CourseToMedicine { @TableId private Integer id; diff --git a/src/main/java/com/peanut/modules/common/entity/CourseToMarketEntity.java b/src/main/java/com/peanut/modules/common/entity/CourseToMedicineMarketEntity.java similarity index 76% rename from src/main/java/com/peanut/modules/common/entity/CourseToMarketEntity.java rename to src/main/java/com/peanut/modules/common/entity/CourseToMedicineMarketEntity.java index 87e894fe..6ac03ab7 100644 --- a/src/main/java/com/peanut/modules/common/entity/CourseToMarketEntity.java +++ b/src/main/java/com/peanut/modules/common/entity/CourseToMedicineMarketEntity.java @@ -8,15 +8,15 @@ import lombok.Data; import java.util.Date; @Data -@TableName("course_to_market") -public class CourseToMarketEntity { +@TableName("course_to_medicine_market") +public class CourseToMedicineMarketEntity { @TableId private Integer id; private Integer courseId; - private Integer marketId; + private Integer medicineMarketId; private Date createTime; diff --git a/src/main/java/com/peanut/modules/common/entity/CourseToCategoryEntity.java b/src/main/java/com/peanut/modules/common/entity/CourseToSociologyMarketEntity.java similarity index 76% rename from src/main/java/com/peanut/modules/common/entity/CourseToCategoryEntity.java rename to src/main/java/com/peanut/modules/common/entity/CourseToSociologyMarketEntity.java index 452cddd2..e04925e3 100644 --- a/src/main/java/com/peanut/modules/common/entity/CourseToCategoryEntity.java +++ b/src/main/java/com/peanut/modules/common/entity/CourseToSociologyMarketEntity.java @@ -8,14 +8,15 @@ import lombok.Data; import java.util.Date; @Data -@TableName("course_to_category") -public class CourseToCategoryEntity { +@TableName("course_to_sociology_market") +public class CourseToSociologyMarketEntity { + @TableId private Integer id; private Integer courseId; - private Integer categoryId; + private Integer sociologyMarketId; private Date createTime; diff --git a/src/main/java/com/peanut/modules/master/controller/CourseMedicalController.java b/src/main/java/com/peanut/modules/master/controller/CourseMedicineController.java similarity index 75% rename from src/main/java/com/peanut/modules/master/controller/CourseMedicalController.java rename to src/main/java/com/peanut/modules/master/controller/CourseMedicineController.java index c2ac455a..66260180 100644 --- a/src/main/java/com/peanut/modules/master/controller/CourseMedicalController.java +++ b/src/main/java/com/peanut/modules/master/controller/CourseMedicineController.java @@ -3,8 +3,8 @@ package com.peanut.modules.master.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.peanut.common.utils.R; import com.peanut.modules.common.entity.CourseEntity; -import com.peanut.modules.common.entity.CourseMedical; -import com.peanut.modules.common.entity.CourseToMedical; +import com.peanut.modules.common.entity.CourseMedicine; +import com.peanut.modules.common.entity.CourseToMedicine; import com.peanut.modules.common.to.ParamTo; import com.peanut.modules.master.service.CourseMedicalService; import com.peanut.modules.master.service.CourseService; @@ -20,7 +20,7 @@ import java.util.List; @Slf4j @RestController("masterCourseMedical") @RequestMapping("master/courseMedical") -public class CourseMedicalController { +public class CourseMedicineController { @Autowired private CourseMedicalService medicalService; @Autowired @@ -30,14 +30,14 @@ public class CourseMedicalController { @RequestMapping("/getCourseMedicalList") public R getCourseMedicalList(){ - List courseMedicalList = medicalService.getCourseMedicalList(); - return R.ok().put("Medicals",courseMedicalList); + List courseMedicineList = medicalService.getCourseMedicalList(); + return R.ok().put("Medicals", courseMedicineList); } @RequestMapping("/addCourseMedical") - public R addCourseMedical(@RequestBody CourseMedical courseMedical){ - medicalService.save(courseMedical); - return R.ok().put("Medical",courseMedical); + public R addCourseMedical(@RequestBody CourseMedicine courseMedicine){ + medicalService.save(courseMedicine); + return R.ok().put("Medical", courseMedicine); } @RequestMapping("/delCourseMedical") @@ -46,8 +46,8 @@ public class CourseMedicalController { } @RequestMapping("/editCourseMedical") - public R editCourseMedical(@RequestBody CourseMedical courseMedical){ - return medicalService.editCourseMedical(courseMedical); + public R editCourseMedical(@RequestBody CourseMedicine courseMedicine){ + return medicalService.editCourseMedical(courseMedicine); } @RequestMapping("/getCourseListForMedical") @@ -63,12 +63,12 @@ public class CourseMedicalController { } @RequestMapping("/bindCourseAndMedical") - public R bindCourseAndMedical(@RequestBody CourseToMedical toMedical){ + public R bindCourseAndMedical(@RequestBody CourseToMedicine toMedical){ return toMedicalService.bindCourseAndMedical(toMedical); } @RequestMapping("/unbindCourseAndMedical") - public R unbindCourseAndMedical(@RequestBody CourseToMedical toMedical){ + public R unbindCourseAndMedical(@RequestBody CourseToMedicine toMedical){ boolean b = toMedicalService.removeById(toMedical.getId()); if(b){ return R.ok(); @@ -78,7 +78,7 @@ public class CourseMedicalController { } @RequestMapping("/updateCourseToMedicalSort") - public R updateCourseToMedicalSort(@RequestBody CourseToMedical toMedical){ + public R updateCourseToMedicalSort(@RequestBody CourseToMedicine toMedical){ toMedicalService.updateById(toMedical); return R.ok(); } diff --git a/src/main/java/com/peanut/modules/master/controller/CourseMedicineMarketController.java b/src/main/java/com/peanut/modules/master/controller/CourseMedicineMarketController.java new file mode 100644 index 00000000..7bfeaeac --- /dev/null +++ b/src/main/java/com/peanut/modules/master/controller/CourseMedicineMarketController.java @@ -0,0 +1,179 @@ +package com.peanut.modules.master.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.peanut.common.utils.R; +import com.peanut.modules.common.entity.CourseEntity; +import com.peanut.modules.common.entity.CourseMedicineMarketEntity; +import com.peanut.modules.common.entity.CourseToMedicineMarketEntity; +import com.peanut.modules.master.service.CourseMedicineMarketService; +import com.peanut.modules.master.service.CourseService; +import com.peanut.modules.master.service.CourseToMedicineMarketService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; +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.RestController; +import java.util.List; +import java.util.Map; + +@Slf4j +@RestController("masterCourseMedicineMarket") +@RequestMapping("master/courseMedicineMarket") +public class CourseMedicineMarketController { + + @Autowired + private CourseMedicineMarketService marketService; + @Autowired + private CourseToMedicineMarketService toMarketService; + @Autowired + private CourseService courseService; + + /** + * 营销标签树 + */ + @RequestMapping(path = "/marketTree") + public R marketTree() { + List marketsTree = marketService.marketTree(); + return R.ok().put("result", marketsTree); + } + + /** + * 获取营销标签列表 + */ + @RequestMapping(path = "/getMakertListByPid") + public R getMakertListByPid(String pid) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); + wrapper.eq(CourseMedicineMarketEntity::getPid,pid); + wrapper.orderByAsc(CourseMedicineMarketEntity::getSort); + wrapper.orderByAsc(CourseMedicineMarketEntity::getCreateTime); + List marketTopList = marketService.list(wrapper); + return R.ok().put("result", marketTopList); + } + + @RequestMapping(path = "/getMarketById") + public R getMarketById(String id) { + return R.ok().put("result",marketService.getById(id)); + } + + @RequestMapping(path = "/saveOrUpdateMarket") + public R saveOrUpdateMarket(@RequestBody CourseMedicineMarketEntity market) { + if (market.getId()==null){ + if(market.getPid()==0){ + marketService.save(market); + return R.ok().put("result",market); + }else { + CourseMedicineMarketEntity m = marketService.getById(market.getPid()); + if (m.getIsLast()==1){ + return R.error("请将父标签设置为非最后一集"); + }else { + marketService.save(market); + return R.ok().put("result",market); + } + } + }else { + if (market.getIsLast() == 1){ + List mList = marketService.list(new LambdaQueryWrapper() + .eq(CourseMedicineMarketEntity::getPid,market.getId())); + if (mList.size()>0){ + return R.error("请先删除子集，再设置为最后一集"); + }else { + marketService.saveOrUpdate(market); + return R.ok().put("result",market); + } + }else { + marketService.saveOrUpdate(market); + return R.ok().put("result",market); + } + } + } + + @RequestMapping(path = "/delMarket") + public R delMarket(String id) { + CourseMedicineMarketEntity market = marketService.getById(id); + if (market.getIsLast()==1){ + MPJLambdaWrapper wrapper = new MPJLambdaWrapper(); + wrapper.eq(CourseToMedicineMarketEntity::getMedicineMarketId,id); + List tomarkets = toMarketService.list(wrapper); + if (tomarkets.size()>0){ + return R.error("请先移除课程"); + }else { + marketService.removeById(id); + return R.ok(); + } + }else { + List marketList = marketService.list(new LambdaQueryWrapper().eq(CourseMedicineMarketEntity::getPid,id)); + if (marketList.size() > 0) { + return R.error("请先删除子集"); + }else { + marketService.removeById(id); + return R.ok(); + } + } + } + + /** + * 获取营销标签下课程 + */ + @RequestMapping(path = "/getCourseByMarketId") + public R getCourseByMarket(@RequestBody Map params) { + MPJLambdaWrapper wrapper = new MPJLambdaWrapper(); + wrapper.leftJoin(CourseEntity.class,CourseEntity::getId, CourseToMedicineMarketEntity::getCourseId); + wrapper.selectAll(CourseEntity.class); + wrapper.like(CourseEntity::getTitle,params.get("title")); + wrapper.eq(CourseToMedicineMarketEntity::getMedicineMarketId,params.get("marketId")); + Page res = toMarketService.pageMaps(new Page<>( + Long.parseLong(params.get("current").toString()), Long.parseLong(params.get("limit").toString())), wrapper); + return R.ok().put("result", res); + } + + /** + * 获取未关联课程列表 + */ + @RequestMapping("/getNotToMarketList") + public R getNotToMarketList(@RequestBody Map params){ + LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); + wrapper.like(CourseEntity::getTitle,params.get("title")); + if (params.containsKey("marketId")&&!"".equals(params.get("marketId").toString())){ + String sql = "select course_id from course_to_market where del_flag = 0 and market_id = "+params.get("marketId"); + wrapper.notInSql(CourseEntity::getId,sql); + } + Page page = courseService.page(new Page<>( + Long.parseLong(params.get("current").toString()), Long.parseLong(params.get("limit").toString())),wrapper); + return R.ok().put("result", page); + } + + @RequestMapping(path = "/saveToMarket") + public R saveToMarket(@RequestBody Map params) { + if (!StringUtils.isEmpty(params.get("courseId").toString())){ + String[] ids = params.get("courseId").toString().split(","); + if (ids.length > 0) { + for (String id : ids) { + CourseToMedicineMarketEntity toMarket = new CourseToMedicineMarketEntity(); + toMarket.setMedicineMarketId(Integer.parseInt(params.get("marketId").toString())); + toMarket.setCourseId(Integer.parseInt(id)); + toMarketService.save(toMarket); + } + } + } + return R.ok(); + } + + @RequestMapping(path = "/delToMarket") + public R delToMarket(String marketId,String courseId) { + if(StringUtils.isNotEmpty(courseId)){ + String[] productIds = courseId.split(","); + for(String id : productIds){ + LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); + wrapper.eq(CourseToMedicineMarketEntity::getMedicineMarketId,marketId); + wrapper.eq(CourseToMedicineMarketEntity::getCourseId,id); + toMarketService.remove(wrapper); + } + return R.ok(); + } + return R.error("参数为空"); + } + +} diff --git a/src/main/java/com/peanut/modules/master/controller/CourseMarketController.java b/src/main/java/com/peanut/modules/master/controller/CourseSociologyMarketController.java similarity index 68% rename from src/main/java/com/peanut/modules/master/controller/CourseMarketController.java rename to src/main/java/com/peanut/modules/master/controller/CourseSociologyMarketController.java index bba0d8d0..96be1ee1 100644 --- a/src/main/java/com/peanut/modules/master/controller/CourseMarketController.java +++ b/src/main/java/com/peanut/modules/master/controller/CourseSociologyMarketController.java @@ -4,30 +4,27 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.peanut.common.utils.R; -import com.peanut.modules.common.entity.CourseEntity; -import com.peanut.modules.common.entity.CourseMarketEntity; -import com.peanut.modules.common.entity.CourseToMarketEntity; -import com.peanut.modules.master.service.CourseMarketService; -import com.peanut.modules.master.service.CourseService; -import com.peanut.modules.master.service.CourseToMarketService; +import com.peanut.modules.common.entity.*; +import com.peanut.modules.master.service.*; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; 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.RestController; + import java.util.List; import java.util.Map; @Slf4j -@RestController("masterCourseMarket") -@RequestMapping("master/courseMarket") -public class CourseMarketController { +@RestController("masterCourseSociologyMarket") +@RequestMapping("master/courseSociologyMarket") +public class CourseSociologyMarketController { @Autowired - private CourseMarketService marketService; + private CourseSociologyMarketService marketService; @Autowired - private CourseToMarketService toMarketService; + private CourseToSociologyMarketService toMarketService; @Autowired private CourseService courseService; @@ -36,8 +33,8 @@ public class CourseMarketController { */ @RequestMapping(path = "/marketTree") public R marketTree() { - List marketsTree = marketService.marketTree(); - return R.ok().put("result", marketsTree); + List courseSociologyMarketEntities = marketService.marketTree(); + return R.ok().put("result", courseSociologyMarketEntities); } /** @@ -45,11 +42,11 @@ public class CourseMarketController { */ @RequestMapping(path = "/getMakertListByPid") public R getMakertListByPid(String pid) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); - wrapper.eq(CourseMarketEntity::getPid,pid); - wrapper.orderByAsc(CourseMarketEntity::getSort); - wrapper.orderByAsc(CourseMarketEntity::getCreateTime); - List marketTopList = marketService.list(wrapper); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); + wrapper.eq(CourseSociologyMarketEntity::getPid,pid); + wrapper.orderByAsc(CourseSociologyMarketEntity::getSort); + wrapper.orderByAsc(CourseSociologyMarketEntity::getCreateTime); + List marketTopList = marketService.list(wrapper); return R.ok().put("result", marketTopList); } @@ -59,13 +56,13 @@ public class CourseMarketController { } @RequestMapping(path = "/saveOrUpdateMarket") - public R saveOrUpdateMarket(@RequestBody CourseMarketEntity market) { + public R saveOrUpdateMarket(@RequestBody CourseSociologyMarketEntity market) { if (market.getId()==null){ if(market.getPid()==0){ marketService.save(market); return R.ok().put("result",market); }else { - CourseMarketEntity m = marketService.getById(market.getPid()); + CourseSociologyMarketEntity m = marketService.getById(market.getPid()); if (m.getIsLast()==1){ return R.error("请将父标签设置为非最后一集"); }else { @@ -75,8 +72,8 @@ public class CourseMarketController { } }else { if (market.getIsLast() == 1){ - List mList = marketService.list(new LambdaQueryWrapper() - .eq(CourseMarketEntity::getPid,market.getId())); + List mList = marketService.list(new LambdaQueryWrapper() + .eq(CourseSociologyMarketEntity::getPid,market.getId())); if (mList.size()>0){ return R.error("请先删除子集，再设置为最后一集"); }else { @@ -92,11 +89,11 @@ public class CourseMarketController { @RequestMapping(path = "/delMarket") public R delMarket(String id) { - CourseMarketEntity market = marketService.getById(id); + CourseSociologyMarketEntity market = marketService.getById(id); if (market.getIsLast()==1){ - MPJLambdaWrapper wrapper = new MPJLambdaWrapper(); - wrapper.eq(CourseToMarketEntity::getMarketId,id); - List tomarkets = toMarketService.list(wrapper); + MPJLambdaWrapper wrapper = new MPJLambdaWrapper(); + wrapper.eq(CourseToSociologyMarketEntity::getSociologyMarketId,id); + List tomarkets = toMarketService.list(wrapper); if (tomarkets.size()>0){ return R.error("请先移除课程"); }else { @@ -104,7 +101,7 @@ public class CourseMarketController { return R.ok(); } }else { - List marketList = marketService.list(new LambdaQueryWrapper().eq(CourseMarketEntity::getPid,id)); + List marketList = marketService.list(new LambdaQueryWrapper().eq(CourseSociologyMarketEntity::getPid,id)); if (marketList.size() > 0) { return R.error("请先删除子集"); }else { @@ -119,11 +116,11 @@ public class CourseMarketController { */ @RequestMapping(path = "/getCourseByMarketId") public R getCourseByMarket(@RequestBody Map params) { - MPJLambdaWrapper wrapper = new MPJLambdaWrapper(); - wrapper.leftJoin(CourseEntity.class,CourseEntity::getId,CourseToMarketEntity::getCourseId); + MPJLambdaWrapper wrapper = new MPJLambdaWrapper(); + wrapper.leftJoin(CourseEntity.class,CourseEntity::getId, CourseToSociologyMarketEntity::getCourseId); wrapper.selectAll(CourseEntity.class); wrapper.like(CourseEntity::getTitle,params.get("title")); - wrapper.eq(CourseToMarketEntity::getMarketId,params.get("marketId")); + wrapper.eq(CourseToSociologyMarketEntity::getSociologyMarketId,params.get("marketId")); Page res = toMarketService.pageMaps(new Page<>( Long.parseLong(params.get("current").toString()), Long.parseLong(params.get("limit").toString())), wrapper); return R.ok().put("result", res); @@ -151,8 +148,8 @@ public class CourseMarketController { String[] ids = params.get("courseId").toString().split(","); if (ids.length > 0) { for (String id : ids) { - CourseToMarketEntity toMarket = new CourseToMarketEntity(); - toMarket.setMarketId(Integer.parseInt(params.get("marketId").toString())); + CourseToSociologyMarketEntity toMarket = new CourseToSociologyMarketEntity(); + toMarket.setSociologyMarketId(Integer.parseInt(params.get("marketId").toString())); toMarket.setCourseId(Integer.parseInt(id)); toMarketService.save(toMarket); } @@ -166,9 +163,9 @@ public class CourseMarketController { if(StringUtils.isNotEmpty(courseId)){ String[] productIds = courseId.split(","); for(String id : productIds){ - LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); - wrapper.eq(CourseToMarketEntity::getMarketId,marketId); - wrapper.eq(CourseToMarketEntity::getCourseId,id); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); + wrapper.eq(CourseToSociologyMarketEntity::getSociologyMarketId,marketId); + wrapper.eq(CourseToSociologyMarketEntity::getCourseId,id); toMarketService.remove(wrapper); } return R.ok(); diff --git a/src/main/java/com/peanut/modules/master/service/CourseMarketService.java b/src/main/java/com/peanut/modules/master/service/CourseMarketService.java deleted file mode 100644 index 004c8a10..00000000 --- a/src/main/java/com/peanut/modules/master/service/CourseMarketService.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.peanut.modules.master.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.peanut.modules.common.entity.CourseMarketEntity; - -import java.util.List; - -public interface CourseMarketService extends IService { - - List marketTree(); - -} diff --git a/src/main/java/com/peanut/modules/master/service/CourseMedicalService.java b/src/main/java/com/peanut/modules/master/service/CourseMedicalService.java index 71f75c28..39096d65 100644 --- a/src/main/java/com/peanut/modules/master/service/CourseMedicalService.java +++ b/src/main/java/com/peanut/modules/master/service/CourseMedicalService.java @@ -2,13 +2,13 @@ package com.peanut.modules.master.service; import com.baomidou.mybatisplus.extension.service.IService; import com.peanut.common.utils.R; -import com.peanut.modules.common.entity.CourseMedical; +import com.peanut.modules.common.entity.CourseMedicine; import java.util.List; -public interface CourseMedicalService extends IService { - List getCourseMedicalList(); +public interface CourseMedicalService extends IService { + List getCourseMedicalList(); R delCourseMedical(int id); - R editCourseMedical(CourseMedical courseMedical); + R editCourseMedical(CourseMedicine courseMedicine); } diff --git a/src/main/java/com/peanut/modules/master/service/CourseMedicineMarketService.java b/src/main/java/com/peanut/modules/master/service/CourseMedicineMarketService.java new file mode 100644 index 00000000..f22fa669 --- /dev/null +++ b/src/main/java/com/peanut/modules/master/service/CourseMedicineMarketService.java @@ -0,0 +1,12 @@ +package com.peanut.modules.master.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.peanut.modules.common.entity.CourseMedicineMarketEntity; + +import java.util.List; + +public interface CourseMedicineMarketService extends IService { + + List marketTree(); + +} diff --git a/src/main/java/com/peanut/modules/master/service/CourseSociologyMarketService.java b/src/main/java/com/peanut/modules/master/service/CourseSociologyMarketService.java new file mode 100644 index 00000000..20360786 --- /dev/null +++ b/src/main/java/com/peanut/modules/master/service/CourseSociologyMarketService.java @@ -0,0 +1,13 @@ +package com.peanut.modules.master.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.peanut.modules.common.entity.CourseMedicineMarketEntity; +import com.peanut.modules.common.entity.CourseSociologyMarketEntity; + +import java.util.List; + +public interface CourseSociologyMarketService extends IService { + + List marketTree(); + +} diff --git a/src/main/java/com/peanut/modules/master/service/CourseToMarketService.java b/src/main/java/com/peanut/modules/master/service/CourseToMarketService.java deleted file mode 100644 index 1688417a..00000000 --- a/src/main/java/com/peanut/modules/master/service/CourseToMarketService.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.peanut.modules.master.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.peanut.modules.common.entity.CourseToMarketEntity; - -public interface CourseToMarketService extends IService { -} diff --git a/src/main/java/com/peanut/modules/master/service/CourseToMedicalService.java b/src/main/java/com/peanut/modules/master/service/CourseToMedicalService.java index 435a2fe2..5cefb732 100644 --- a/src/main/java/com/peanut/modules/master/service/CourseToMedicalService.java +++ b/src/main/java/com/peanut/modules/master/service/CourseToMedicalService.java @@ -2,9 +2,9 @@ package com.peanut.modules.master.service; import com.baomidou.mybatisplus.extension.service.IService; import com.peanut.common.utils.R; -import com.peanut.modules.common.entity.CourseToMedical; +import com.peanut.modules.common.entity.CourseToMedicine; -public interface CourseToMedicalService extends IService { +public interface CourseToMedicalService extends IService { - R bindCourseAndMedical(CourseToMedical toMedical); + R bindCourseAndMedical(CourseToMedicine toMedical); } diff --git a/src/main/java/com/peanut/modules/master/service/CourseToMedicineMarketService.java b/src/main/java/com/peanut/modules/master/service/CourseToMedicineMarketService.java new file mode 100644 index 00000000..988650f4 --- /dev/null +++ b/src/main/java/com/peanut/modules/master/service/CourseToMedicineMarketService.java @@ -0,0 +1,7 @@ +package com.peanut.modules.master.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.peanut.modules.common.entity.CourseToMedicineMarketEntity; + +public interface CourseToMedicineMarketService extends IService { +} diff --git a/src/main/java/com/peanut/modules/master/service/CourseToSociologyMarketService.java b/src/main/java/com/peanut/modules/master/service/CourseToSociologyMarketService.java new file mode 100644 index 00000000..85cb048d --- /dev/null +++ b/src/main/java/com/peanut/modules/master/service/CourseToSociologyMarketService.java @@ -0,0 +1,8 @@ +package com.peanut.modules.master.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.peanut.modules.common.entity.CourseToMedicineMarketEntity; +import com.peanut.modules.common.entity.CourseToSociologyMarketEntity; + +public interface CourseToSociologyMarketService extends IService { +} diff --git a/src/main/java/com/peanut/modules/master/service/impl/CourseMarketServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/CourseMedicineMarketServiceImpl.java similarity index 59% rename from src/main/java/com/peanut/modules/master/service/impl/CourseMarketServiceImpl.java rename to src/main/java/com/peanut/modules/master/service/impl/CourseMedicineMarketServiceImpl.java index ca4957d9..1586a701 100644 --- a/src/main/java/com/peanut/modules/master/service/impl/CourseMarketServiceImpl.java +++ b/src/main/java/com/peanut/modules/master/service/impl/CourseMedicineMarketServiceImpl.java @@ -2,9 +2,9 @@ package com.peanut.modules.master.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.peanut.modules.common.dao.CourseMarketDao; -import com.peanut.modules.common.entity.CourseMarketEntity; -import com.peanut.modules.master.service.CourseMarketService; +import com.peanut.modules.common.dao.CourseMedicineMarketDao; +import com.peanut.modules.common.entity.CourseMedicineMarketEntity; +import com.peanut.modules.master.service.CourseMedicineMarketService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -13,16 +13,16 @@ import java.util.stream.Collectors; @Slf4j @Service("masterCourseMarketService") -public class CourseMarketServiceImpl extends ServiceImpl implements CourseMarketService { +public class CourseMedicineMarketServiceImpl extends ServiceImpl implements CourseMedicineMarketService { @Autowired - private CourseMarketDao marketDao; + private CourseMedicineMarketDao marketDao; @Override - public List marketTree() { - List markets = marketDao.selectList(new QueryWrapper<>()); - List marketsTree = markets.stream().filter((courseMarketEntity) -> + public List marketTree() { + List markets = marketDao.selectList(new QueryWrapper<>()); + List marketsTree = markets.stream().filter((courseMarketEntity) -> courseMarketEntity.getPid() == 0 ).map((market)->{ market.setChildren(getMarketChildrens(market,markets)); @@ -33,8 +33,8 @@ public class CourseMarketServiceImpl extends ServiceImpl getMarketChildrens(CourseMarketEntity root,List all){ - List children = all.stream().filter(courseMarketEntity -> { + private List getMarketChildrens(CourseMedicineMarketEntity root, List all){ + List children = all.stream().filter(courseMarketEntity -> { return root.getId().equals(courseMarketEntity.getPid()); }).map(courseMarketEntity -> { courseMarketEntity.setChildren(getMarketChildrens(courseMarketEntity, all)); diff --git a/src/main/java/com/peanut/modules/master/service/impl/CourseMedicalServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/CourseMedicineServiceImpl.java similarity index 52% rename from src/main/java/com/peanut/modules/master/service/impl/CourseMedicalServiceImpl.java rename to src/main/java/com/peanut/modules/master/service/impl/CourseMedicineServiceImpl.java index 1bff6e88..37344744 100644 --- a/src/main/java/com/peanut/modules/master/service/impl/CourseMedicalServiceImpl.java +++ b/src/main/java/com/peanut/modules/master/service/impl/CourseMedicineServiceImpl.java @@ -3,10 +3,10 @@ package com.peanut.modules.master.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.peanut.common.utils.R; -import com.peanut.modules.common.dao.CourseMedicalDao; -import com.peanut.modules.common.dao.CourseToMedicalDao; -import com.peanut.modules.common.entity.CourseMedical; -import com.peanut.modules.common.entity.CourseToMedical; +import com.peanut.modules.common.dao.CourseMedicineDao; +import com.peanut.modules.common.dao.CourseToMedicineDao; +import com.peanut.modules.common.entity.CourseMedicine; +import com.peanut.modules.common.entity.CourseToMedicine; import com.peanut.modules.master.service.CourseMedicalService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -16,25 +16,25 @@ import java.util.List; @Slf4j @Service("masterCourseMedicalService") -public class CourseMedicalServiceImpl extends ServiceImpl implements CourseMedicalService { +public class CourseMedicineServiceImpl extends ServiceImpl implements CourseMedicalService { @Autowired - private CourseToMedicalDao toMedicalDao; + private CourseToMedicineDao toMedicalDao; @Override - public List getCourseMedicalList() { + public List getCourseMedicalList() { return this.medicals(0); } @Override public R delCourseMedical(int id) { //查看下一级是否存在 - int count = this.count(new LambdaQueryWrapper().eq(CourseMedical::getPid, id)); + int count = this.count(new LambdaQueryWrapper().eq(CourseMedicine::getPid, id)); if(count>0){ return R.error(501,"删除失败，请先删除子项目后再尝试"); } //查看绑定关系是否存在 - Integer integer = toMedicalDao.selectCount(new LambdaQueryWrapper().eq(CourseToMedical::getMedicalId, id)); + Integer integer = toMedicalDao.selectCount(new LambdaQueryWrapper().eq(CourseToMedicine::getMedicalId, id)); if(integer>0){ return R.error(502,"删除失败，请先解绑课程与国学标签的绑定关系"); } @@ -43,29 +43,29 @@ public class CourseMedicalServiceImpl extends ServiceImpl().eq(CourseMedical::getPid, courseMedical.getId())); + public R editCourseMedical(CourseMedicine courseMedicine) { + CourseMedicine old = this.getById(courseMedicine.getId()); + if(old.getIsLast()==0&& courseMedicine.getIsLast()==1){ + CourseMedicine one = this.getOne(new LambdaQueryWrapper().eq(CourseMedicine::getPid, courseMedicine.getId())); if(one!=null){ return R.error(501,"更新失败，请先清空此项的下级标签，才能将此标签变成终极标签"); } } - if(old.getIsLast()==1&&courseMedical.getIsLast()==0){ - CourseToMedical courseToSociologyEntity = toMedicalDao.selectOne(new LambdaQueryWrapper().eq(CourseToMedical::getMedicalId, courseMedical.getId())); + if(old.getIsLast()==1&& courseMedicine.getIsLast()==0){ + CourseToMedicine courseToSociologyEntity = toMedicalDao.selectOne(new LambdaQueryWrapper().eq(CourseToMedicine::getMedicalId, courseMedicine.getId())); if(courseToSociologyEntity!=null){ return R.error(502,"更新失败，请先把此项与课程的关联关系清空后才可把此标签变成普通标签"); } } - this.updateById(courseMedical); - return R.ok().put("sociology",courseMedical); + this.updateById(courseMedicine); + return R.ok().put("sociology", courseMedicine); } - private List medicals(int id){ - List list = this.list(new LambdaQueryWrapper().eq(CourseMedical::getPid, id)); - for (CourseMedical c : list){ + private List medicals(int id){ + List list = this.list(new LambdaQueryWrapper().eq(CourseMedicine::getPid, id)); + for (CourseMedicine c : list){ if(c.getIsLast()!=1){ - List so = this.medicals(c.getId()); + List so = this.medicals(c.getId()); c.setChildren(so); } } 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 0d57c4ff..25ed6d14 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 @@ -23,18 +23,14 @@ import java.util.stream.Collectors; @Slf4j @Service("masterCourseService") public class CourseServiceImpl extends ServiceImpl implements CourseService { - @Autowired - private CourseCategoryDao courseCategoryDao; - @Autowired - private CourseToCategoryDao courseToCategoryDao; @Autowired private CourseSociologyDao courseSociologyDao; @Autowired private CourseToSociologyDao courseToSociologyDao; @Autowired - private CourseMedicalDao medicalDao; + private CourseMedicineDao medicalDao; @Autowired - private CourseToMedicalDao toMedicalDao; + private CourseToMedicineDao toMedicalDao; @Autowired private CourseCatalogueDao courseCatalogueDao; @Autowired @@ -47,37 +43,6 @@ public class CourseServiceImpl extends ServiceImpl impl Integer limit = Integer.valueOf(map.get("limit").toString()); Integer page = Integer.valueOf(map.get("page").toString()); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - if(map.get("type").toString().equals("1")){ - Integer categoryId = Integer.valueOf(map.get("categoryId").toString()); - List collect; - if(categoryId==0){ - LambdaQueryWrapper courseCategoryEntityLambdaQueryWrapper = new LambdaQueryWrapper<>(); - courseCategoryEntityLambdaQueryWrapper.eq(CourseCategoryEntity::getIsLast,1); - collect = courseCategoryDao.selectList(courseCategoryEntityLambdaQueryWrapper).stream().map(CourseCategoryEntity::getId).collect(Collectors.toList()); - }else{ - collect = this.categoryIds(categoryId); - } - if(collect.size()>0){ - List collect1 = courseToCategoryDao.selectList(new LambdaQueryWrapper().in(CourseToCategoryEntity::getCategoryId, collect)).stream().map(CourseToCategoryEntity::getCourseId).collect(Collectors.toList()); - wrapper.in(collect1.size()>0,CourseEntity::getId,collect1); - }else{ - return new Page(); - } - } else if (map.get("type").toString().equals("2")) { - Integer sociologyId = Integer.valueOf(map.get("sociologyId").toString()); - List c; - if(sociologyId==0){ - c = courseSociologyDao.selectList(new LambdaQueryWrapper().eq(CourseSociologyEntity::getIsLast,1)).stream().map(CourseSociologyEntity::getId).collect(Collectors.toList()); - }else{ - c = this.sociologyIds(sociologyId); - } - if(c.size()>0){ - List collect = courseToSociologyDao.selectList(new LambdaQueryWrapper().in(CourseToSociologyEntity::getSociologyId, c)).stream().map(CourseToSociologyEntity::getCourseId).collect(Collectors.toList()); - wrapper.in(collect.size()>0,CourseEntity::getId,collect); - }else{ - return new Page(); - } - } if(ObjectUtils.isNotBlank(map,"keywords")){ wrapper.like(CourseEntity::getTitle,map.get("keywords").toString()); @@ -129,20 +94,20 @@ public class CourseServiceImpl extends ServiceImpl impl @Override public List getCourseListForMedical(int medicalId) { - MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); + MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); wrapper.selectAll(CourseEntity.class); - wrapper.selectAs(CourseToMedical::getId,"bindId"); - wrapper.selectAs(CourseToMedical::getSort,"toSociologySort"); - wrapper.leftJoin(CourseEntity.class,CourseEntity::getId,CourseToMedical::getCourseId); - wrapper.eq(CourseToMedical::getMedicalId,medicalId); - wrapper.orderByAsc(CourseToMedical::getSort); + wrapper.selectAs(CourseToMedicine::getId,"bindId"); + wrapper.selectAs(CourseToMedicine::getSort,"toSociologySort"); + wrapper.leftJoin(CourseEntity.class,CourseEntity::getId, CourseToMedicine::getCourseId); + wrapper.eq(CourseToMedicine::getMedicalId,medicalId); + wrapper.orderByAsc(CourseToMedicine::getSort); List courseEntities = toMedicalDao.selectJoinList(CourseEntity.class, wrapper); return courseEntities; } @Override public Page getCourseListCanMedical(ParamTo param) { - List collect = toMedicalDao.selectList(new LambdaQueryWrapper().eq(CourseToMedical::getMedicalId, param.getId())).stream().map(CourseToMedical::getCourseId).collect(Collectors.toList()); + List collect = toMedicalDao.selectList(new LambdaQueryWrapper().eq(CourseToMedicine::getMedicalId, param.getId())).stream().map(CourseToMedicine::getCourseId).collect(Collectors.toList()); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); if (collect.size() != 0){ wrapper.notIn(CourseEntity::getId,collect); @@ -192,20 +157,7 @@ public class CourseServiceImpl extends ServiceImpl impl } } - private List categoryIds(Integer id){ - ArrayList integers = new ArrayList<>(); - CourseCategoryEntity courseCategoryEntity = courseCategoryDao.selectById(id); - if(courseCategoryEntity.getIsLast()==1){ - integers.add(id); - }else{ - List courseCategoryEntities = courseCategoryDao.selectList(new LambdaQueryWrapper().eq(CourseCategoryEntity::getPid, id)); - for (CourseCategoryEntity c : courseCategoryEntities ){ - List integers1 = this.categoryIds(c.getId()); - integers.addAll(integers1); - } - } - return integers; - } + private List sociologyIds(Integer id){ ArrayList integers = new ArrayList<>(); diff --git a/src/main/java/com/peanut/modules/master/service/impl/CourseSociologyMarketServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/CourseSociologyMarketServiceImpl.java new file mode 100644 index 00000000..f60ef893 --- /dev/null +++ b/src/main/java/com/peanut/modules/master/service/impl/CourseSociologyMarketServiceImpl.java @@ -0,0 +1,52 @@ +package com.peanut.modules.master.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.peanut.modules.common.dao.CourseMedicineMarketDao; +import com.peanut.modules.common.dao.CourseSociologyMarketDao; +import com.peanut.modules.common.entity.CourseMedicineMarketEntity; +import com.peanut.modules.common.entity.CourseSociologyMarketEntity; +import com.peanut.modules.master.service.CourseMedicineMarketService; +import com.peanut.modules.master.service.CourseSociologyMarketService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.stream.Collectors; + +@Slf4j +@Service("masterCourseSociologyMarketService") +public class CourseSociologyMarketServiceImpl extends ServiceImpl implements CourseSociologyMarketService { + + + @Autowired + private CourseSociologyMarketDao marketDao; + + @Override + public List marketTree() { + List markets = marketDao.selectList(new QueryWrapper<>()); + List marketsTree = markets.stream().filter((courseSociologyMarketEntity) -> + courseSociologyMarketEntity.getPid() == 0 + ).map((market)->{ + market.setChildren(getMarketChildrens(market,markets)); + return market; + }).sorted((sort1,sort2)->{ + return (sort1.getSort() == null? 0 : sort1.getSort()) - (sort2.getSort()==null?0:sort2.getSort()); + }).collect(Collectors.toList()); + return marketsTree; + } + + private List getMarketChildrens(CourseSociologyMarketEntity root, List all){ + List children = all.stream().filter(CourseSociologyMarketEntity -> { + return root.getId().equals(CourseSociologyMarketEntity.getPid()); + }).map(courseMarketEntity -> { + courseMarketEntity.setChildren(getMarketChildrens(courseMarketEntity, all)); + return courseMarketEntity; + }).sorted((sort1,sort2)->{ + return (sort1.getSort()==null?0:sort1.getSort()) - (sort2.getSort()==null?0:sort2.getSort()); + }).collect(Collectors.toList()); + return children; + } + +} diff --git a/src/main/java/com/peanut/modules/master/service/impl/CourseToMarketServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/CourseToMarketServiceImpl.java deleted file mode 100644 index 3d9c4eb0..00000000 --- a/src/main/java/com/peanut/modules/master/service/impl/CourseToMarketServiceImpl.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.peanut.modules.master.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.peanut.modules.common.dao.CourseToMarketDao; -import com.peanut.modules.common.entity.CourseToMarketEntity; -import com.peanut.modules.master.service.CourseToMarketService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -@Slf4j -@Service("masterCourseToMarketService") -public class CourseToMarketServiceImpl extends ServiceImpl implements CourseToMarketService { -} diff --git a/src/main/java/com/peanut/modules/master/service/impl/CourseToMedicineMarketServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/CourseToMedicineMarketServiceImpl.java new file mode 100644 index 00000000..5a8d9fcc --- /dev/null +++ b/src/main/java/com/peanut/modules/master/service/impl/CourseToMedicineMarketServiceImpl.java @@ -0,0 +1,13 @@ +package com.peanut.modules.master.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.peanut.modules.common.dao.CourseToMedicineMarketDao; +import com.peanut.modules.common.entity.CourseToMedicineMarketEntity; +import com.peanut.modules.master.service.CourseToMedicineMarketService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Slf4j +@Service("masterCourseToMarketService") +public class CourseToMedicineMarketServiceImpl extends ServiceImpl implements CourseToMedicineMarketService { +} diff --git a/src/main/java/com/peanut/modules/master/service/impl/CourseToMedicalServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/CourseToMedicineServiceImpl.java similarity index 54% rename from src/main/java/com/peanut/modules/master/service/impl/CourseToMedicalServiceImpl.java rename to src/main/java/com/peanut/modules/master/service/impl/CourseToMedicineServiceImpl.java index c9637d90..8a6ccd71 100644 --- a/src/main/java/com/peanut/modules/master/service/impl/CourseToMedicalServiceImpl.java +++ b/src/main/java/com/peanut/modules/master/service/impl/CourseToMedicineServiceImpl.java @@ -3,19 +3,19 @@ package com.peanut.modules.master.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.peanut.common.utils.R; -import com.peanut.modules.common.dao.CourseToMedicalDao; -import com.peanut.modules.common.entity.CourseToMedical; +import com.peanut.modules.common.dao.CourseToMedicineDao; +import com.peanut.modules.common.entity.CourseToMedicine; import com.peanut.modules.master.service.CourseToMedicalService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @Slf4j @Service("masterCourseToMedicalService") -public class CourseToMedicalServiceImpl extends ServiceImpl implements CourseToMedicalService { +public class CourseToMedicineServiceImpl extends ServiceImpl implements CourseToMedicalService { @Override - public R bindCourseAndMedical(CourseToMedical toMedical) { + public R bindCourseAndMedical(CourseToMedicine toMedical) { //去重 - CourseToMedical one = this.getOne(new LambdaQueryWrapper().eq(CourseToMedical::getCourseId, toMedical.getCourseId()).eq(CourseToMedical::getMedicalId, toMedical.getMedicalId())); + CourseToMedicine one = this.getOne(new LambdaQueryWrapper().eq(CourseToMedicine::getCourseId, toMedical.getCourseId()).eq(CourseToMedicine::getMedicalId, toMedical.getMedicalId())); if(one != null){ return R.error(501,"绑定失败，绑定关系已将存在"); } diff --git a/src/main/java/com/peanut/modules/master/service/impl/CourseToSociologyMarketServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/CourseToSociologyMarketServiceImpl.java new file mode 100644 index 00000000..95411c5b --- /dev/null +++ b/src/main/java/com/peanut/modules/master/service/impl/CourseToSociologyMarketServiceImpl.java @@ -0,0 +1,16 @@ +package com.peanut.modules.master.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.peanut.modules.common.dao.CourseToMedicineMarketDao; +import com.peanut.modules.common.dao.CourseToSociologyMarketDao; +import com.peanut.modules.common.entity.CourseToMedicineMarketEntity; +import com.peanut.modules.common.entity.CourseToSociologyMarketEntity; +import com.peanut.modules.master.service.CourseToMedicineMarketService; +import com.peanut.modules.master.service.CourseToSociologyMarketService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Slf4j +@Service("masterCourseToSociologyMarketService") +public class CourseToSociologyMarketServiceImpl extends ServiceImpl implements CourseToSociologyMarketService { +} diff --git a/src/main/java/com/peanut/modules/medical/controller/HomeController.java b/src/main/java/com/peanut/modules/medical/controller/HomeController.java index 1d7dbc80..7106f86a 100644 --- a/src/main/java/com/peanut/modules/medical/controller/HomeController.java +++ b/src/main/java/com/peanut/modules/medical/controller/HomeController.java @@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.peanut.common.utils.R; import com.peanut.common.utils.ShiroUtils; import com.peanut.modules.common.entity.CourseEntity; -import com.peanut.modules.common.entity.CourseMarketEntity; -import com.peanut.modules.common.entity.CourseMedical; +import com.peanut.modules.common.entity.CourseMedicineMarketEntity; +import com.peanut.modules.common.entity.CourseMedicine; import com.peanut.modules.common.to.ParamTo; import com.peanut.modules.medical.service.CourseMarketService; import com.peanut.modules.medical.service.CourseMedicalService; @@ -32,7 +32,7 @@ public class HomeController { //获取医学标签列表 @RequestMapping("/getMedicalLabels") public R getMedicalLabels(@RequestBody ParamTo param){ - List sociologyLabels = medicalService.getMedicalLabels(param.getId()); + List sociologyLabels = medicalService.getMedicalLabels(param.getId()); return R.ok().put("labels",sociologyLabels); } @@ -48,7 +48,7 @@ public class HomeController { */ @RequestMapping(path = "/courseMarketTree") public R courseMarketTree() { - List labelsTree = courseMarketService.courseMarketTree(); + List labelsTree = courseMarketService.courseMarketTree(); return R.ok().put("result", labelsTree); } diff --git a/src/main/java/com/peanut/modules/medical/service/CourseMarketService.java b/src/main/java/com/peanut/modules/medical/service/CourseMarketService.java index 20951bae..d3d7b603 100644 --- a/src/main/java/com/peanut/modules/medical/service/CourseMarketService.java +++ b/src/main/java/com/peanut/modules/medical/service/CourseMarketService.java @@ -1,11 +1,11 @@ package com.peanut.modules.medical.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.peanut.modules.common.entity.CourseMarketEntity; +import com.peanut.modules.common.entity.CourseMedicineMarketEntity; import java.util.List; -public interface CourseMarketService extends IService { +public interface CourseMarketService extends IService { - List courseMarketTree(); + List courseMarketTree(); } diff --git a/src/main/java/com/peanut/modules/medical/service/CourseMedicalService.java b/src/main/java/com/peanut/modules/medical/service/CourseMedicalService.java index 0ae36a0d..eefec004 100644 --- a/src/main/java/com/peanut/modules/medical/service/CourseMedicalService.java +++ b/src/main/java/com/peanut/modules/medical/service/CourseMedicalService.java @@ -1,11 +1,11 @@ package com.peanut.modules.medical.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.peanut.modules.common.entity.CourseMedical; +import com.peanut.modules.common.entity.CourseMedicine; import java.util.List; -public interface CourseMedicalService extends IService { +public interface CourseMedicalService extends IService { - List getMedicalLabels(Integer id); + List getMedicalLabels(Integer id); } diff --git a/src/main/java/com/peanut/modules/medical/service/impl/CourseMarketServiceImpl.java b/src/main/java/com/peanut/modules/medical/service/impl/CourseMarketServiceImpl.java index 4858baf6..926ec9a4 100644 --- a/src/main/java/com/peanut/modules/medical/service/impl/CourseMarketServiceImpl.java +++ b/src/main/java/com/peanut/modules/medical/service/impl/CourseMarketServiceImpl.java @@ -2,8 +2,8 @@ package com.peanut.modules.medical.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.peanut.modules.common.dao.CourseMarketDao; -import com.peanut.modules.common.entity.CourseMarketEntity; +import com.peanut.modules.common.dao.CourseMedicineMarketDao; +import com.peanut.modules.common.entity.CourseMedicineMarketEntity; import com.peanut.modules.medical.service.CourseMarketService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -14,15 +14,15 @@ import java.util.stream.Collectors; @Slf4j @Service("medicalCourseMarketService") -public class CourseMarketServiceImpl extends ServiceImpl implements CourseMarketService { +public class CourseMarketServiceImpl extends ServiceImpl implements CourseMarketService { @Autowired - private CourseMarketDao courseMarketDao; + private CourseMedicineMarketDao courseMedicineMarketDao; @Override - public List courseMarketTree() { - List markets = courseMarketDao.selectList(new QueryWrapper<>()); - List marketsTree = markets.stream().filter((courseMarketEntity) -> + public List courseMarketTree() { + List markets = courseMedicineMarketDao.selectList(new QueryWrapper<>()); + List marketsTree = markets.stream().filter((courseMarketEntity) -> courseMarketEntity.getPid() == 0 ).map((market)->{ market.setChildren(getMarketChildrens(market,markets)); @@ -33,8 +33,8 @@ public class CourseMarketServiceImpl extends ServiceImpl getMarketChildrens(CourseMarketEntity root,List all){ - List children = all.stream().filter(courseMarketEntity -> { + private List getMarketChildrens(CourseMedicineMarketEntity root, List all){ + List children = all.stream().filter(courseMarketEntity -> { return root.getId().equals(courseMarketEntity.getPid()); }).map(courseMarketEntity -> { courseMarketEntity.setChildren(getMarketChildrens(courseMarketEntity, all)); diff --git a/src/main/java/com/peanut/modules/medical/service/impl/CourseMedicalServiceImpl.java b/src/main/java/com/peanut/modules/medical/service/impl/CourseMedicalServiceImpl.java index 34f79fb9..0cd67ee1 100644 --- a/src/main/java/com/peanut/modules/medical/service/impl/CourseMedicalServiceImpl.java +++ b/src/main/java/com/peanut/modules/medical/service/impl/CourseMedicalServiceImpl.java @@ -2,8 +2,8 @@ package com.peanut.modules.medical.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.peanut.modules.common.dao.CourseMedicalDao; -import com.peanut.modules.common.entity.CourseMedical; +import com.peanut.modules.common.dao.CourseMedicineDao; +import com.peanut.modules.common.entity.CourseMedicine; import com.peanut.modules.medical.service.CourseMedicalService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -11,14 +11,14 @@ import java.util.List; @Slf4j @Service("medicineCourseMedicalService") -public class CourseMedicalServiceImpl extends ServiceImpl implements CourseMedicalService { +public class CourseMedicalServiceImpl extends ServiceImpl implements CourseMedicalService { @Override - public List getMedicalLabels(Integer id) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(CourseMedical::getPid,id); - wrapper.orderByAsc(CourseMedical::getSort); - List list = this.list(wrapper); + public List getMedicalLabels(Integer id) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(CourseMedicine::getPid,id); + wrapper.orderByAsc(CourseMedicine::getSort); + List list = this.list(wrapper); return list; } } diff --git a/src/main/java/com/peanut/modules/medical/service/impl/CourseServiceImpl.java b/src/main/java/com/peanut/modules/medical/service/impl/CourseServiceImpl.java index c4bb4496..6bc11bc7 100644 --- a/src/main/java/com/peanut/modules/medical/service/impl/CourseServiceImpl.java +++ b/src/main/java/com/peanut/modules/medical/service/impl/CourseServiceImpl.java @@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.peanut.modules.common.dao.CourseDao; import com.peanut.modules.common.entity.CourseEntity; -import com.peanut.modules.common.entity.CourseToMarketEntity; -import com.peanut.modules.common.entity.CourseToMedical; +import com.peanut.modules.common.entity.CourseToMedicineMarketEntity; +import com.peanut.modules.common.entity.CourseToMedicine; import com.peanut.modules.common.entity.UserToCourseEntity; import com.peanut.modules.common.to.ParamTo; import com.peanut.modules.medical.service.CourseService; @@ -23,8 +23,8 @@ public class CourseServiceImpl extends ServiceImpl impl public Page getMedicalCourseList(ParamTo param) { MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); wrapper.selectAll(CourseEntity.class); - wrapper.leftJoin(CourseToMedical.class,CourseToMedical::getCourseId,CourseEntity::getId); - wrapper.eq(CourseToMedical::getMedicalId,param.getId()); + wrapper.leftJoin(CourseToMedicine.class, CourseToMedicine::getCourseId,CourseEntity::getId); + wrapper.eq(CourseToMedicine::getMedicalId,param.getId()); Page courseEntityPage = this.getBaseMapper().selectJoinPage(new Page<>(param.getPage(), param.getLimit()),CourseEntity.class, wrapper); return courseEntityPage; } @@ -33,8 +33,8 @@ public class CourseServiceImpl extends ServiceImpl impl public Page getMarketCourseList(ParamTo param) { MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); wrapper.selectAll(CourseEntity.class); - wrapper.leftJoin(CourseToMarketEntity.class,CourseToMarketEntity::getCourseId,CourseEntity::getId); - wrapper.eq(CourseToMarketEntity::getMarketId,param.getId()); + wrapper.leftJoin(CourseToMedicineMarketEntity.class, CourseToMedicineMarketEntity::getCourseId,CourseEntity::getId); + wrapper.eq(CourseToMedicineMarketEntity::getMedicineMarketId,param.getId()); Page courseEntityPage = this.getBaseMapper().selectJoinPage(new Page<>(param.getPage(), param.getLimit()), CourseEntity.class, wrapper); return courseEntityPage; } @@ -43,7 +43,7 @@ public class CourseServiceImpl extends ServiceImpl impl public List getUserLateCourseList(ParamTo param) { MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); wrapper.selectAll(CourseEntity.class); - wrapper.rightJoin(CourseToMedical.class,CourseToMedical::getCourseId,CourseEntity::getId); + wrapper.rightJoin(CourseToMedicine.class, CourseToMedicine::getCourseId,CourseEntity::getId); wrapper.leftJoin(UserToCourseEntity.class,UserToCourseEntity::getCourseId,CourseEntity::getId); wrapper.eq(UserToCourseEntity::getUserId,param.getId()); wrapper.orderByDesc(UserToCourseEntity::getUpdateTime); diff --git a/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java b/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java index f586b1d5..b36f9b0f 100644 --- a/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java +++ b/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java @@ -77,8 +77,8 @@ public class CourseServiceImpl extends ServiceImpl impl public Page getMarketCourseList(ParamTo param) { MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); wrapper.selectAll(CourseEntity.class); - wrapper.leftJoin(CourseToMarketEntity.class,CourseToMarketEntity::getCourseId,CourseEntity::getId); - wrapper.eq(CourseToMarketEntity::getMarketId,param.getId()); + wrapper.leftJoin(CourseToMedicineMarketEntity.class, CourseToMedicineMarketEntity::getCourseId,CourseEntity::getId); + wrapper.eq(CourseToMedicineMarketEntity::getMedicineMarketId,param.getId()); wrapper.orderByAsc(CourseToSociologyEntity::getSort); Page courseEntityPage = this.getBaseMapper().selectJoinPage(new Page<>(param.getPage(), param.getLimit()), CourseEntity.class, wrapper); return courseEntityPage; diff --git a/src/main/java/com/peanut/modules/sys/service/impl/ShiroServiceImpl.java b/src/main/java/com/peanut/modules/sys/service/impl/ShiroServiceImpl.java index 90f80186..097c533a 100644 --- a/src/main/java/com/peanut/modules/sys/service/impl/ShiroServiceImpl.java +++ b/src/main/java/com/peanut/modules/sys/service/impl/ShiroServiceImpl.java @@ -25,7 +25,7 @@ import org.springframework.stereotype.Service; import java.util.*; @Slf4j -@Service +@Service("sysShiroService") public class ShiroServiceImpl implements ShiroService { @Autowired private SysMenuDao sysMenuDao; diff --git a/src/main/resources/mapper/book/BookListeningDao.xml b/src/main/resources/mapper/book/BookListeningDao.xml deleted file mode 100644 index 15dc83f3..00000000 --- a/src/main/resources/mapper/book/BookListeningDao.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file