From e9064b617dbe2cabe327a2359bdb145430a74b96 Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Thu, 11 Apr 2024 11:14:52 +0800 Subject: [PATCH] 1 --- .../common/entity/UserToCourseEntity.java | 2 ++ .../ShopProductMedicineLabelServiceImpl.java | 2 +- .../ShopProductMedicineMarketServiceImpl.java | 2 +- .../ShopProductSociologyLabelServiceImpl.java | 2 +- ...ShopProductSociologyMarketServiceImpl.java | 2 +- ...ShopProductToMedicineLabelServiceImpl.java | 2 +- ...hopProductToMedicineMarketServiceImpl.java | 2 +- ...hopProductToSociologyLabelServiceImpl.java | 2 +- ...opProductToSociologyMarketServiceImpl.java | 2 +- .../sociology/controller/HomeController.java | 17 +++++++++++++ .../service/CourseSociologyService.java | 11 ++++++++ .../impl/CourseSociologyServiceImpl.java | 25 +++++++++++++++++++ ...lMapper.xml => CourseSociologyService.xml} | 0 ...UserDao.xml => CourseSociologyService.xml} | 0 ...eJobDao.xml => CourseSociologyService.xml} | 0 15 files changed, 63 insertions(+), 8 deletions(-) create mode 100644 src/main/java/com/peanut/modules/sociology/service/CourseSociologyService.java create mode 100644 src/main/java/com/peanut/modules/sociology/service/impl/CourseSociologyServiceImpl.java rename src/main/resources/mapper/{ShopProductLabelMapper.xml => CourseSociologyService.xml} (100%) rename src/main/resources/mapper/app/{UserDao.xml => CourseSociologyService.xml} (100%) rename src/main/resources/mapper/job/{ScheduleJobDao.xml => CourseSociologyService.xml} (100%) diff --git a/src/main/java/com/peanut/modules/common/entity/UserToCourseEntity.java b/src/main/java/com/peanut/modules/common/entity/UserToCourseEntity.java index 009b385c..a83f1391 100644 --- a/src/main/java/com/peanut/modules/common/entity/UserToCourseEntity.java +++ b/src/main/java/com/peanut/modules/common/entity/UserToCourseEntity.java @@ -24,6 +24,8 @@ public class UserToCourseEntity { private Integer days; + private Date updateTime; + private Date startTime; private Date endTime; diff --git a/src/main/java/com/peanut/modules/master/service/impl/ShopProductMedicineLabelServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/ShopProductMedicineLabelServiceImpl.java index 670267b4..db7a269d 100644 --- a/src/main/java/com/peanut/modules/master/service/impl/ShopProductMedicineLabelServiceImpl.java +++ b/src/main/java/com/peanut/modules/master/service/impl/ShopProductMedicineLabelServiceImpl.java @@ -8,6 +8,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @Slf4j -@Service("medicineShopProductMedicineLabelService") +@Service("masterShopProductMedicineLabelService") public class ShopProductMedicineLabelServiceImpl extends ServiceImpl implements ShopProductMedicineLabelService { } diff --git a/src/main/java/com/peanut/modules/master/service/impl/ShopProductMedicineMarketServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/ShopProductMedicineMarketServiceImpl.java index d4b06879..ef992311 100644 --- a/src/main/java/com/peanut/modules/master/service/impl/ShopProductMedicineMarketServiceImpl.java +++ b/src/main/java/com/peanut/modules/master/service/impl/ShopProductMedicineMarketServiceImpl.java @@ -8,6 +8,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @Slf4j -@Service("medicineShopProductMedicineMarketService") +@Service("masterShopProductMedicineMarketService") public class ShopProductMedicineMarketServiceImpl extends ServiceImpl implements ShopProductMedicineMarketService { } diff --git a/src/main/java/com/peanut/modules/master/service/impl/ShopProductSociologyLabelServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/ShopProductSociologyLabelServiceImpl.java index 0845315f..98ff0a01 100644 --- a/src/main/java/com/peanut/modules/master/service/impl/ShopProductSociologyLabelServiceImpl.java +++ b/src/main/java/com/peanut/modules/master/service/impl/ShopProductSociologyLabelServiceImpl.java @@ -12,7 +12,7 @@ import java.util.List; import java.util.stream.Collectors; @Slf4j -@Service("sociologyShopProductSociologyLabelService") +@Service("masterShopProductSociologyLabelService") public class ShopProductSociologyLabelServiceImpl extends ServiceImpl implements ShopProductSociologyLabelService { @Autowired diff --git a/src/main/java/com/peanut/modules/master/service/impl/ShopProductSociologyMarketServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/ShopProductSociologyMarketServiceImpl.java index 9a14622c..bebc564b 100644 --- a/src/main/java/com/peanut/modules/master/service/impl/ShopProductSociologyMarketServiceImpl.java +++ b/src/main/java/com/peanut/modules/master/service/impl/ShopProductSociologyMarketServiceImpl.java @@ -12,7 +12,7 @@ import java.util.List; import java.util.stream.Collectors; @Slf4j -@Service("sociologyShopProductSociologyMarketService") +@Service("masterShopProductSociologyMarketService") public class ShopProductSociologyMarketServiceImpl extends ServiceImpl implements ShopProductSociologyMarketService { @Autowired diff --git a/src/main/java/com/peanut/modules/master/service/impl/ShopProductToMedicineLabelServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/ShopProductToMedicineLabelServiceImpl.java index 81e16dc1..206a32ec 100644 --- a/src/main/java/com/peanut/modules/master/service/impl/ShopProductToMedicineLabelServiceImpl.java +++ b/src/main/java/com/peanut/modules/master/service/impl/ShopProductToMedicineLabelServiceImpl.java @@ -8,6 +8,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @Slf4j -@Service("medicineShopProductToMedicineLabelService") +@Service("masterShopProductToMedicineLabelService") public class ShopProductToMedicineLabelServiceImpl extends ServiceImpl implements ShopProductToMedicineLabelService { } diff --git a/src/main/java/com/peanut/modules/master/service/impl/ShopProductToMedicineMarketServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/ShopProductToMedicineMarketServiceImpl.java index 300b8d0d..614b3572 100644 --- a/src/main/java/com/peanut/modules/master/service/impl/ShopProductToMedicineMarketServiceImpl.java +++ b/src/main/java/com/peanut/modules/master/service/impl/ShopProductToMedicineMarketServiceImpl.java @@ -8,6 +8,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @Slf4j -@Service("medicineShopProductToMedicineMarketService") +@Service("masterShopProductToMedicineMarketService") public class ShopProductToMedicineMarketServiceImpl extends ServiceImpl implements ShopProductToMedicineMarketService { } diff --git a/src/main/java/com/peanut/modules/master/service/impl/ShopProductToSociologyLabelServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/ShopProductToSociologyLabelServiceImpl.java index 77df5dff..8640d82b 100644 --- a/src/main/java/com/peanut/modules/master/service/impl/ShopProductToSociologyLabelServiceImpl.java +++ b/src/main/java/com/peanut/modules/master/service/impl/ShopProductToSociologyLabelServiceImpl.java @@ -8,6 +8,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @Slf4j -@Service("sociologyShopProductToSociologyLabelService") +@Service("masterShopProductToSociologyLabelService") public class ShopProductToSociologyLabelServiceImpl extends ServiceImpl implements ShopProductToSociologyLabelService { } diff --git a/src/main/java/com/peanut/modules/master/service/impl/ShopProductToSociologyMarketServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/ShopProductToSociologyMarketServiceImpl.java index 7cda9ba8..89eb4f9d 100644 --- a/src/main/java/com/peanut/modules/master/service/impl/ShopProductToSociologyMarketServiceImpl.java +++ b/src/main/java/com/peanut/modules/master/service/impl/ShopProductToSociologyMarketServiceImpl.java @@ -8,6 +8,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @Slf4j -@Service("sociologyShopProductToSociologyMarketService") +@Service("masterShopProductToSociologyMarketService") public class ShopProductToSociologyMarketServiceImpl extends ServiceImpl implements ShopProductToSociologyMarketService { } diff --git a/src/main/java/com/peanut/modules/sociology/controller/HomeController.java b/src/main/java/com/peanut/modules/sociology/controller/HomeController.java index e4395831..d0bc9b48 100644 --- a/src/main/java/com/peanut/modules/sociology/controller/HomeController.java +++ b/src/main/java/com/peanut/modules/sociology/controller/HomeController.java @@ -2,9 +2,13 @@ package com.peanut.modules.sociology.controller; import com.peanut.common.utils.R; 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.sociology.service.CourseService; +import com.peanut.modules.sociology.service.CourseSociologyService; 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.RestController; import java.util.List; @@ -16,6 +20,10 @@ public class HomeController { @Autowired private CourseService courseService; + @Autowired + private CourseSociologyService courseSociologyService; + + //首页-我的课程 @RequestMapping("/getMyCourse") @@ -24,4 +32,13 @@ public class HomeController { return R.ok().put("myCourse",courseList); } + @RequestMapping("/getSociologyLabels") + public R getSociologyLabels(@RequestBody ParamTo param){ + List sociologyLabels = courseSociologyService.getSociologyLabels(param.getId()); + return R.ok().put("labels",sociologyLabels); + } + + + + } diff --git a/src/main/java/com/peanut/modules/sociology/service/CourseSociologyService.java b/src/main/java/com/peanut/modules/sociology/service/CourseSociologyService.java new file mode 100644 index 00000000..ad49b0be --- /dev/null +++ b/src/main/java/com/peanut/modules/sociology/service/CourseSociologyService.java @@ -0,0 +1,11 @@ +package com.peanut.modules.sociology.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.peanut.modules.common.entity.CourseSociologyEntity; + +import java.util.List; + +public interface CourseSociologyService extends IService { + + List getSociologyLabels(Integer id); +} diff --git a/src/main/java/com/peanut/modules/sociology/service/impl/CourseSociologyServiceImpl.java b/src/main/java/com/peanut/modules/sociology/service/impl/CourseSociologyServiceImpl.java new file mode 100644 index 00000000..aebdcf87 --- /dev/null +++ b/src/main/java/com/peanut/modules/sociology/service/impl/CourseSociologyServiceImpl.java @@ -0,0 +1,25 @@ +package com.peanut.modules.sociology.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.peanut.modules.common.dao.CourseSociologyDao; +import com.peanut.modules.common.entity.CourseSociologyEntity; +import com.peanut.modules.sociology.service.CourseSociologyService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Slf4j +@Service("sociologyCourseSociologyService") +public class CourseSociologyServiceImpl extends ServiceImpl implements CourseSociologyService { + + @Override + public List getSociologyLabels(Integer id) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(CourseSociologyEntity::getPid,id); + wrapper.orderByAsc(CourseSociologyEntity::getSort); + List list = this.list(wrapper); + return list; + } +} diff --git a/src/main/resources/mapper/ShopProductLabelMapper.xml b/src/main/resources/mapper/CourseSociologyService.xml similarity index 100% rename from src/main/resources/mapper/ShopProductLabelMapper.xml rename to src/main/resources/mapper/CourseSociologyService.xml diff --git a/src/main/resources/mapper/app/UserDao.xml b/src/main/resources/mapper/app/CourseSociologyService.xml similarity index 100% rename from src/main/resources/mapper/app/UserDao.xml rename to src/main/resources/mapper/app/CourseSociologyService.xml diff --git a/src/main/resources/mapper/job/ScheduleJobDao.xml b/src/main/resources/mapper/job/CourseSociologyService.xml similarity index 100% rename from src/main/resources/mapper/job/ScheduleJobDao.xml rename to src/main/resources/mapper/job/CourseSociologyService.xml