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 a734538b..ad4bb4e6 100644 --- a/src/main/java/com/peanut/modules/medical/controller/HomeController.java +++ b/src/main/java/com/peanut/modules/medical/controller/HomeController.java @@ -43,6 +43,13 @@ public class HomeController { return R.ok().put("labels",labelsTree); } + //获取医学标签树 + @RequestMapping("/getChildCourseMedicalTree") + public R getChildCourseMedicalTree(@RequestBody ParamTo param){ + List labelsTree = medicalService.getChildCourseMedicalTree(param); + return R.ok().put("labels",labelsTree); + } + //获取医学标签下的课程列表 @RequestMapping("/getMedicalCourseList") public R getMedicalCourseList(@RequestBody ParamTo param){ 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 e8c4fd96..3ccf7360 100644 --- a/src/main/java/com/peanut/modules/medical/service/CourseMedicalService.java +++ b/src/main/java/com/peanut/modules/medical/service/CourseMedicalService.java @@ -2,6 +2,7 @@ package com.peanut.modules.medical.service; import com.baomidou.mybatisplus.extension.service.IService; import com.peanut.modules.common.entity.CourseMedicine; +import com.peanut.modules.common.to.ParamTo; import java.util.List; @@ -10,4 +11,6 @@ public interface CourseMedicalService extends IService { List getMedicalLabels(Integer id); List getCourseMedicalTree(); + + List getChildCourseMedicalTree(ParamTo param); } 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 59f6c440..8deffad0 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 @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.peanut.modules.common.dao.CourseMedicineDao; import com.peanut.modules.common.entity.CourseMedicine; +import com.peanut.modules.common.to.ParamTo; import com.peanut.modules.medical.service.CourseMedicalService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -27,8 +28,22 @@ public class CourseMedicalServiceImpl extends ServiceImpl getCourseMedicalTree() { List medicines = this.list(new QueryWrapper<>()); - List medicinesTree = medicines.stream().filter((courseMarketEntity) -> - courseMarketEntity.getPid() == 0 + List medicinesTree = medicines.stream().filter((courseMedicine) -> + courseMedicine.getPid() == 0 + ).map((medicine)->{ + medicine.setChildren(getMedicineChildrens(medicine,medicines)); + return medicine; + }).sorted((sort1,sort2)->{ + return (sort1.getSort() == null? 0 : sort1.getSort()) - (sort2.getSort()==null?0:sort2.getSort()); + }).collect(Collectors.toList()); + return medicinesTree; + } + + @Override + public List getChildCourseMedicalTree(ParamTo param) { + List medicines = this.list(new QueryWrapper<>()); + List medicinesTree = medicines.stream().filter((courseMedicine) -> + courseMedicine.getPid() == param.getId() ).map((medicine)->{ medicine.setChildren(getMedicineChildrens(medicine,medicines)); return medicine;