From db1f6fc9c669990a44568166c0df746d410b3bb7 Mon Sep 17 00:00:00 2001 From: none Date: Wed, 8 Mar 2023 19:14:56 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=88=86=E7=B1=BB=E8=BF=87?= =?UTF-8?q?=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../playedu/api/constant/BackendConstant.java | 1 - .../api/service/impl/ResourceServiceImpl.java | 8 ++++++- .../api/service/impl/UploadServiceImpl.java | 2 ++ .../ResourceCategoryRelationServiceImpl.java | 21 +++++++++++++------ .../ResourceCategoryRelationService.java | 4 ++++ src/main/resources/application.yml | 6 +++--- 6 files changed, 31 insertions(+), 11 deletions(-) diff --git a/src/main/java/xyz/playedu/api/constant/BackendConstant.java b/src/main/java/xyz/playedu/api/constant/BackendConstant.java index 7d09477..467e67d 100644 --- a/src/main/java/xyz/playedu/api/constant/BackendConstant.java +++ b/src/main/java/xyz/playedu/api/constant/BackendConstant.java @@ -13,7 +13,6 @@ public class BackendConstant { public final static String RESOURCE_TYPE_WORD = "WORD"; public final static String RESOURCE_TYPE_PPT = "PPT"; - public final static String[] RESOURCE_TYPE_WHITELIST = {RESOURCE_TYPE_IMAGE, RESOURCE_TYPE_PDF, RESOURCE_TYPE_VIDEO, RESOURCE_TYPE_WORD, RESOURCE_TYPE_PPT}; public final static HashMap RESOURCE_EXT_2_CONTENT_TYPE = new HashMap<>() {{ put("png", "image/png"); put("jpg", "image/jpg"); diff --git a/src/main/java/xyz/playedu/api/service/impl/ResourceServiceImpl.java b/src/main/java/xyz/playedu/api/service/impl/ResourceServiceImpl.java index f052f09..e839b06 100644 --- a/src/main/java/xyz/playedu/api/service/impl/ResourceServiceImpl.java +++ b/src/main/java/xyz/playedu/api/service/impl/ResourceServiceImpl.java @@ -54,7 +54,13 @@ public class ResourceServiceImpl extends ServiceImpl i wrapper.eq("type", filter.getType()); } if (filter.getCategoryIds() != null && filter.getCategoryIds().length > 0) { - // todo 资源分类过滤 + List ridArray = relationService.getRidsByCids(Arrays.asList(filter.getCategoryIds())); + if (ridArray == null || ridArray.size() == 0) { + ridArray = new ArrayList<>() {{ + add(0); + }}; + } + wrapper.in("id", ridArray); } String sortFiled = filter.getSortField(); diff --git a/src/main/java/xyz/playedu/api/service/impl/UploadServiceImpl.java b/src/main/java/xyz/playedu/api/service/impl/UploadServiceImpl.java index fe7f804..caf9d8a 100644 --- a/src/main/java/xyz/playedu/api/service/impl/UploadServiceImpl.java +++ b/src/main/java/xyz/playedu/api/service/impl/UploadServiceImpl.java @@ -1,5 +1,6 @@ package xyz.playedu.api.service.impl; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -20,6 +21,7 @@ import java.util.List; * @create 2023/3/8 14:02 */ @Service +@Slf4j public class UploadServiceImpl implements UploadService { @Autowired diff --git a/src/main/java/xyz/playedu/api/service/impl/internal/ResourceCategoryRelationServiceImpl.java b/src/main/java/xyz/playedu/api/service/impl/internal/ResourceCategoryRelationServiceImpl.java index ae4a087..a38f405 100644 --- a/src/main/java/xyz/playedu/api/service/impl/internal/ResourceCategoryRelationServiceImpl.java +++ b/src/main/java/xyz/playedu/api/service/impl/internal/ResourceCategoryRelationServiceImpl.java @@ -6,15 +6,24 @@ import xyz.playedu.api.service.internal.ResourceCategoryRelationService; import xyz.playedu.api.mapper.ResourceCategoryRelationMapper; import org.springframework.stereotype.Service; +import java.util.List; + /** -* @author tengteng -* @description 针对表【resource_category】的数据库操作Service实现 -* @createDate 2023-03-08 16:54:56 -*/ + * @author tengteng + * @description 针对表【resource_category】的数据库操作Service实现 + * @createDate 2023-03-08 16:54:56 + */ @Service public class ResourceCategoryRelationServiceImpl extends ServiceImpl - implements ResourceCategoryRelationService{ - + implements ResourceCategoryRelationService { + @Override + public List getRidsByCids(List categoryIds) { + List relations = list(query().getWrapper().in("cid", categoryIds)); + if (relations == null) { + return null; + } + return relations.stream().map(ResourceCategoryRelation::getRid).toList(); + } } diff --git a/src/main/java/xyz/playedu/api/service/internal/ResourceCategoryRelationService.java b/src/main/java/xyz/playedu/api/service/internal/ResourceCategoryRelationService.java index 36b66b9..c4966b8 100644 --- a/src/main/java/xyz/playedu/api/service/internal/ResourceCategoryRelationService.java +++ b/src/main/java/xyz/playedu/api/service/internal/ResourceCategoryRelationService.java @@ -3,6 +3,8 @@ package xyz.playedu.api.service.internal; import xyz.playedu.api.domain.ResourceCategoryRelation; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + /** * @author tengteng * @description 针对表【resource_category】的数据库操作Service @@ -10,4 +12,6 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface ResourceCategoryRelationService extends IService { + List getRidsByCids(List categoryIds); + } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 22c9783..ea6d00f 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -53,9 +53,9 @@ minio: mybatis: mapper-locations: classpath:mapper/*.xml -mybatis-plus: - configuration: - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl +#mybatis-plus: +# configuration: +# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # PlayEdu playedu: