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 @@ + +