1、添加上传资源的分页查询功能，控制器和服务

徐烜
1 parent 02a8d3de
Showing 5 changed files with 84 additions and 25 deletions
src/main/java/com/bsth/luban_springboot2/controller/UploadController.java
src/main/java/com/bsth/luban_springboot2/dto/PageDto.java
src/main/java/com/bsth/luban_springboot2/dto/request/UploadFileQueryRequest.java
src/main/java/com/bsth/luban_springboot2/service/UploadFileService.java
src/main/java/com/bsth/luban_springboot2/service/impl/UploadFileServiceImpl.java
 package com.bsth.luban_springboot2.controller;
  
+import com.bsth.luban_springboot2.dto.PageDto;
 import com.bsth.luban_springboot2.dto.UploadFileDto;
 import com.bsth.luban_springboot2.dto.request.UploadFileQueryRequest;
 import com.bsth.luban_springboot2.service.UploadFileService;
@@ -68,6 +69,7 @@ public class UploadController {
  
     }
  
+    // 上传文件数量
     class UploadFilesCount {
         private Long count;
  
@@ -79,10 +81,10 @@ public class UploadController {
             this.count = count;
         }
     }
-    // 文件数量
     @RequestMapping(value = "/files/count", method = RequestMethod.GET)
     public UploadFilesCount countFiles() {
         UploadFileDto uploadFileDto = UploadFileDto.builder()
+                .mime("image")
                 .cover(Boolean.FALSE)
                 .build();
         Long count = this.uploadFileService.count(uploadFileDto);
@@ -90,17 +92,29 @@ public class UploadController {
         uploadFilesCount.setCount(count);
         return uploadFilesCount;
     }
-
+    // 当前页上传文件列表
     @RequestMapping(value = "/files", method = RequestMethod.GET)
     public List<UploadFileDto> listFiles(@Valid @ModelAttribute UploadFileQueryRequest request) {
         PageRequest pageRequest = PageRequest.of(
                 request.get_start(), request.get_limit(),
                 Sort.Direction.DESC, "createTime");
         UploadFileDto uploadFileDto = UploadFileDto.builder()
-                .cover(Boolean.FALSE)
-                .mime(request.getMime())
+                .cover(request.get_cover())
+                .mime(request.getMime() == null ? "image" : request.getMime())
                 .build();
-        return this.uploadFileService.listFiles(uploadFileDto, pageRequest);
+        return this.uploadFileService.listFilesPage(uploadFileDto, pageRequest).getDataList();
+    }
  
+    // 分页上传列表
+    @RequestMapping(value = "/getFiles", method = RequestMethod.GET)
+    public PageDto<UploadFileDto> getFiles(@Valid @ModelAttribute UploadFileQueryRequest request) {
+        PageRequest pageRequest = PageRequest.of(
+                request.get_start(), request.get_limit(),
+                Sort.Direction.DESC, "createTime");
+        UploadFileDto uploadFileDto = UploadFileDto.builder()
+                .cover(request.get_cover())
+                .mime(request.getMime())
+                .build();
+        return this.uploadFileService.listFilesPage(uploadFileDto, pageRequest);
     }
 }
+package com.bsth.luban_springboot2.dto;
+
+import lombok.Builder;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 分页数据dto。
+ */
+@Data
+@Builder
+public class PageDto<T> implements Serializable {
+    private static final long serialVersionUID = -1524447529861110365L;
+
+    /** 第几从1开始 */
+    private Integer page;
+    /** 每页几条数据 */
+    private Integer size;
+    /** 当前页有几条记录（等于dataList.size()） */
+    private Integer currentPageSize;
+    /** 一共有多少页 */
+    private Integer totalPages;
+    /** 一共有多少条记录 */
+    private Integer totalDataCount;
+
+
+    /** 当前页数据列表 */
+    private List<T> dataList;
+}
@@ -13,4 +13,6 @@ public class UploadFileQueryRequest {
     private Integer _start;
     /** mime类型 */
     private String mime;
+    /** 是否包含封面图 */
+    private Boolean _cover;
 }
 package com.bsth.luban_springboot2.service;
  
+import com.bsth.luban_springboot2.dto.PageDto;
 import com.bsth.luban_springboot2.dto.UploadFileDto;
 import org.springframework.data.domain.Pageable;
 import org.springframework.web.multipart.MultipartFile;
  
-import java.util.List;
-
 /**
  * 上传文件Service。
  */
@@ -33,10 +32,10 @@ public interface UploadFileService {
     Long count(UploadFileDto uploadFileDto);
  
     /**
-     * 分页查询文件。
+     * 分页查询文件列表。
      * @param uploadFileDto
      * @param pageable
      * @return
      */
-    List<UploadFileDto> listFiles(UploadFileDto uploadFileDto, Pageable pageable);
+    PageDto<UploadFileDto> listFilesPage(UploadFileDto uploadFileDto, Pageable pageable);
 }
 package com.bsth.luban_springboot2.service.impl;
  
+import com.bsth.luban_springboot2.dto.PageDto;
 import com.bsth.luban_springboot2.dto.UploadFileDto;
 import com.bsth.luban_springboot2.entity.UploadFile;
 import com.bsth.luban_springboot2.repo.UploadFileRepo;
@@ -22,7 +23,6 @@ import java.io.File;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.ArrayList;
-import java.util.List;
 import java.util.UUID;
  
 /**
@@ -138,25 +138,29 @@ public class UploadFileServiceImpl implements UploadFileService {
     @Override
     public Long count(UploadFileDto uploadFileDto) {
         // 不包括作品封面图
-        UploadFile uploadFile = new UploadFile();
-        uploadFile.setCover(uploadFileDto.getCover());
-        uploadFile.setCreateTime(null);
-        uploadFile.setUpdateTime(null);
-        Example<UploadFile> example = Example.of(uploadFile);
+        UploadFile uploadFile_query = new UploadFile();
+        uploadFile_query.setMime(uploadFileDto.getMime());
+        uploadFile_query.setCover(uploadFileDto.getCover());
+        uploadFile_query.setCreateTime(null);
+        uploadFile_query.setUpdateTime(null);
+        ExampleMatcher matcher = ExampleMatcher.matching()
+                .withMatcher("mime", ExampleMatcher.GenericPropertyMatchers.startsWith()); // 对mime使用 like {mime}%
+        Example<UploadFile> example = Example.of(uploadFile_query, matcher);
         return this.uploadFileRepo.count(example);
     }
  
     @Override
-    public List<UploadFileDto> listFiles(UploadFileDto uploadFileDto, Pageable pageable) {
-        // 不包括作品封面图
-        UploadFile uploadFile = new UploadFile();
-        uploadFile.setCover(uploadFileDto.getCover());
-        uploadFile.setMime(uploadFileDto.getMime() == null ? "image" : uploadFileDto.getMime());
-        uploadFile.setCreateTime(null);
-        uploadFile.setUpdateTime(null);
+    public PageDto<UploadFileDto> listFilesPage(UploadFileDto uploadFileDto, Pageable pageable) {
+        // 1、创建查询参数
+        UploadFile uploadFile_query = new UploadFile();
+        uploadFile_query.setCover(uploadFileDto.getCover() == null ? Boolean.FALSE : uploadFileDto.getCover());
+        uploadFile_query.setMime(uploadFileDto.getMime() == null ? "image" : uploadFileDto.getMime());
+        uploadFile_query.setCreateTime(null);
+        uploadFile_query.setUpdateTime(null);
         ExampleMatcher matcher = ExampleMatcher.matching()
-                .withMatcher("mime", ExampleMatcher.GenericPropertyMatchers.startsWith()); // like {mime}%
-        Example<UploadFile> example = Example.of(uploadFile, matcher);
+                .withMatcher("mime", ExampleMatcher.GenericPropertyMatchers.startsWith()); // 对mime使用 like {mime}%
+        Example<UploadFile> example = Example.of(uploadFile_query, matcher);
+        // 2、查询
         Page<UploadFile> uploadFilePage = this.uploadFileRepo.findAll(example, pageable);
         Page<UploadFileDto> uploadFileDtoPage = uploadFilePage.map((uploadFile_source) -> {
             UploadFileDto uploadFileDto_covert = UploadFileDto.builder()
@@ -176,7 +180,16 @@ public class UploadFileServiceImpl implements UploadFileService {
                     .build();
             return uploadFileDto_covert;
         });
+        // 3、转换PageDto返回
+        PageDto<UploadFileDto> uploadFileDtoPageDto = PageDto.<UploadFileDto>builder()
+                .page(uploadFileDtoPage.getNumber() + 1)
+                .size(uploadFileDtoPage.getSize())
+                .currentPageSize(uploadFileDtoPage.getNumberOfElements())
+                .totalPages(uploadFileDtoPage.getTotalPages())
+                .totalDataCount(new Long(uploadFileDtoPage.getTotalElements()).intValue())
+                .dataList(uploadFileDtoPage.getContent())
+                .build();
  
-        return uploadFileDtoPage.getContent();
+        return uploadFileDtoPageDto;
     }
 }