diff --git a/src/main/java/com/corewing/app/dto/api/TutorialListRequest.java b/src/main/java/com/corewing/app/dto/api/TutorialListRequest.java new file mode 100644 index 0000000..acb57f4 --- /dev/null +++ b/src/main/java/com/corewing/app/dto/api/TutorialListRequest.java @@ -0,0 +1,7 @@ +package com.corewing.app.dto.api; + +import lombok.Data; + +@Data +public class TutorialListRequest { +} diff --git a/src/main/java/com/corewing/app/entity/TutorialCategory.java b/src/main/java/com/corewing/app/entity/TutorialCategory.java index 3c34982..6cf8029 100644 --- a/src/main/java/com/corewing/app/entity/TutorialCategory.java +++ b/src/main/java/com/corewing/app/entity/TutorialCategory.java @@ -7,6 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.time.LocalDateTime; import java.util.Date; +import java.util.List; /** * 教程分类 @@ -76,4 +77,7 @@ public class TutorialCategory implements Serializable { public static final String typeCategory = "category"; public static final String typeTag = "tag"; + @TableField(exist = false) + private List tutorials; + } diff --git a/src/main/java/com/corewing/app/modules/app/AppTutorialController.java b/src/main/java/com/corewing/app/modules/app/AppTutorialController.java index 71ec632..49f091a 100644 --- a/src/main/java/com/corewing/app/modules/app/AppTutorialController.java +++ b/src/main/java/com/corewing/app/modules/app/AppTutorialController.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.corewing.app.common.Result; +import com.corewing.app.dto.api.TutorialListRequest; import com.corewing.app.entity.Tutorial; import com.corewing.app.entity.TutorialCategory; import com.corewing.app.service.TutorialCategoryService; @@ -107,5 +108,4 @@ public class AppTutorialController { } } - } diff --git a/src/main/java/com/corewing/app/service/TutorialService.java b/src/main/java/com/corewing/app/service/TutorialService.java index 25d473c..fd822a7 100644 --- a/src/main/java/com/corewing/app/service/TutorialService.java +++ b/src/main/java/com/corewing/app/service/TutorialService.java @@ -3,9 +3,13 @@ package com.corewing.app.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.corewing.app.dto.api.TutorialListRequest; import com.corewing.app.entity.Tutorial; +import com.corewing.app.entity.TutorialCategory; import org.springframework.web.bind.annotation.RequestBody; +import java.util.List; + public interface TutorialService extends IService { Page pageList(Page page, Long categoryId, String tutorialTitle, String lang); diff --git a/src/main/java/com/corewing/app/service/impl/TutorialServiceImpl.java b/src/main/java/com/corewing/app/service/impl/TutorialServiceImpl.java index 8140cfa..3f96f0b 100644 --- a/src/main/java/com/corewing/app/service/impl/TutorialServiceImpl.java +++ b/src/main/java/com/corewing/app/service/impl/TutorialServiceImpl.java @@ -5,16 +5,20 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.corewing.app.common.page.PageContext; +import com.corewing.app.dto.api.TutorialListRequest; import com.corewing.app.entity.Tutorial; +import com.corewing.app.entity.TutorialCategory; import com.corewing.app.entity.TutorialCategoryRelation; import com.corewing.app.mapper.TutorialMapper; import com.corewing.app.service.TutorialCategoryRelationService; +import com.corewing.app.service.TutorialCategoryService; import com.corewing.app.service.TutorialService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; import javax.annotation.Resource; +import java.util.List; @Service public class TutorialServiceImpl extends ServiceImpl implements TutorialService { @@ -25,6 +29,9 @@ public class TutorialServiceImpl extends ServiceImpl i @Resource private TutorialCategoryRelationService tutorialCategoryRelationService; + @Resource + private TutorialCategoryService tutorialCategoryService; + @Override public Page pageList(Page page, Long categoryId, String tutorialTitle, String lang) { return tutorialMapper.pageList(page, categoryId, tutorialTitle, lang); @@ -64,4 +71,5 @@ public class TutorialServiceImpl extends ServiceImpl i removeById(id); return tutorialCategoryRelationService.remove(new LambdaQueryWrapper().eq(TutorialCategoryRelation::getCategoryId, tutorial.getCategoryId())); } + }