From 3eb78645827af73fd5bfbf0146a62199d2aea694 Mon Sep 17 00:00:00 2001 From: wsw Date: Mon, 24 Jul 2023 11:12:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E9=99=84=E4=BB=B6=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3=EF=BC=8C=E8=BF=94=E5=9B=9E=E5=80=BC?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B7=B2=E6=9C=89=E9=99=84=E4=BB=B6=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../playedu/api/constant/BackendConstant.java | 5 +++ .../backend/ResourceController.java | 5 +++ .../playedu/api/mapper/ResourceMapper.java | 2 + .../playedu/api/service/ResourceService.java | 2 + .../api/service/impl/ResourceServiceImpl.java | 5 +++ src/main/resources/mapper/ResourceMapper.xml | 42 +++++++++++++++++++ 6 files changed, 61 insertions(+) diff --git a/src/main/java/xyz/playedu/api/constant/BackendConstant.java b/src/main/java/xyz/playedu/api/constant/BackendConstant.java index 887c0c3..e496d6e 100644 --- a/src/main/java/xyz/playedu/api/constant/BackendConstant.java +++ b/src/main/java/xyz/playedu/api/constant/BackendConstant.java @@ -40,6 +40,11 @@ public class BackendConstant { public static final String RESOURCE_TYPE_RAR = "RAR"; public static final String RESOURCE_TYPE_TXT = "TXT"; + public static final String RESOURCE_TYPE_ANNEX = + RESOURCE_TYPE_PDF +","+ RESOURCE_TYPE_TXT +","+ + RESOURCE_TYPE_ZIP +","+ RESOURCE_TYPE_RAR +","+ + RESOURCE_TYPE_WORD +","+RESOURCE_TYPE_PPT +","+RESOURCE_TYPE_EXCEL; + public static final HashMap RESOURCE_EXT_2_CONTENT_TYPE = new HashMap<>() { { diff --git a/src/main/java/xyz/playedu/api/controller/backend/ResourceController.java b/src/main/java/xyz/playedu/api/controller/backend/ResourceController.java index 98385b1..3477b6c 100644 --- a/src/main/java/xyz/playedu/api/controller/backend/ResourceController.java +++ b/src/main/java/xyz/playedu/api/controller/backend/ResourceController.java @@ -109,6 +109,11 @@ public class ResourceController { data.put("admin_users", adminUsers); } + if(!type.equals(BackendConstant.RESOURCE_TYPE_VIDEO) && + !type.equals(BackendConstant.RESOURCE_TYPE_IMAGE)){ + filter.setType(BackendConstant.RESOURCE_TYPE_ANNEX); + data.put("existingType",resourceService.paginateType(filter)); + } return JsonResponse.data(data); } diff --git a/src/main/java/xyz/playedu/api/mapper/ResourceMapper.java b/src/main/java/xyz/playedu/api/mapper/ResourceMapper.java index 9755104..1e6f459 100644 --- a/src/main/java/xyz/playedu/api/mapper/ResourceMapper.java +++ b/src/main/java/xyz/playedu/api/mapper/ResourceMapper.java @@ -35,4 +35,6 @@ public interface ResourceMapper extends BaseMapper { List paginate(ResourcePaginateFilter filter); Long paginateCount(ResourcePaginateFilter filter); + + List paginateType(ResourcePaginateFilter filter); } diff --git a/src/main/java/xyz/playedu/api/service/ResourceService.java b/src/main/java/xyz/playedu/api/service/ResourceService.java index a4f42b3..28d4aab 100644 --- a/src/main/java/xyz/playedu/api/service/ResourceService.java +++ b/src/main/java/xyz/playedu/api/service/ResourceService.java @@ -28,6 +28,8 @@ public interface ResourceService extends IService { PaginationResult paginate(int page, int size, ResourcePaginateFilter filter); + List paginateType(ResourcePaginateFilter filter); + Resource create( Integer adminId, String categoryIds, 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 b55d85b..5d64d85 100644 --- a/src/main/java/xyz/playedu/api/service/impl/ResourceServiceImpl.java +++ b/src/main/java/xyz/playedu/api/service/impl/ResourceServiceImpl.java @@ -60,6 +60,11 @@ public class ResourceServiceImpl extends ServiceImpl return pageResult; } + @Override + public List paginateType(ResourcePaginateFilter filter) { + return getBaseMapper().paginateType(filter); + } + @Override @Transactional public Resource create( diff --git a/src/main/resources/mapper/ResourceMapper.xml b/src/main/resources/mapper/ResourceMapper.xml index c7e0cf0..77d0df5 100644 --- a/src/main/resources/mapper/ResourceMapper.xml +++ b/src/main/resources/mapper/ResourceMapper.xml @@ -140,4 +140,46 @@ + +