资源分类可选

This commit is contained in:
none
2023-03-06 10:40:00 +08:00
parent b4db9d67b2
commit 9aa63dba66
8 changed files with 48 additions and 24 deletions

View File

@@ -42,11 +42,17 @@ public class ResourceController {
String sortField = MapUtils.getString(params, "sort_field");
String sortAlgo = MapUtils.getString(params, "sort_algo");
String name = MapUtils.getString(params, "name");
String type = MapUtils.getString(params, "type");
String categoryIdsStr = MapUtils.getString(params, "category_ids");
if (type == null || type.trim().length() == 0) {
return JsonResponse.error("请选择资源类型");
}
ResourcePaginateFilter filter = new ResourcePaginateFilter();
filter.setSortAlgo(sortAlgo);
filter.setSortField(sortField);
filter.setType(type);
if (name != null && name.length() > 0) {
filter.setName(name);
}
@@ -96,7 +102,7 @@ public class ResourceController {
}
}
Resource res = resourceService.create(categoryId, req.getName(), extension, req.getSize(), disk, req.getFileId(), req.getPath(), req.getUrl());
Resource res = resourceService.create(categoryId, type, req.getName(), extension, req.getSize(), disk, req.getFileId(), req.getPath(), req.getUrl());
if (isVideoType) {
resourceVideoService.create(res.getId(), duration);

View File

@@ -53,8 +53,8 @@ public class UploadController {
return JsonResponse.error("格式不支持");
}
Integer categoryId = MapUtils.getInteger(params, "category_id", 0);
if (resourceCategoryService.getById(categoryId) == null) {
Integer categoryId = MapUtils.getInteger(params, "category_id");
if (categoryId != null && !categoryId.equals(0) && resourceCategoryService.getById(categoryId) == null) {
return JsonResponse.error("分类不存在");
}
@@ -80,7 +80,7 @@ public class UploadController {
String url = minioConfig.getDomain() + minioConfig.getBucket() + "/" + savePath;
Resource res = resourceService.create(categoryId, oldFilename, ext, file.getSize(), "minio", "", savePath, url);
Resource res = resourceService.create(categoryId, BackendConstant.RESOURCE_TYPE_IMAGE, oldFilename, ext, file.getSize(), "minio", "", savePath, url);
return JsonResponse.data(res);
} catch (Exception e) {
return JsonResponse.error("系统错误");