fix:修复照片分页不显示问题

src/main/java/com/iflytop/gd/app/controller/PhotoController.java

@@ -6,6 +6,7 @@ import com.iflytop.gd.app.model.vo.PhotoListVO;
 import com.iflytop.gd.app.model.vo.PhotoVO;
 import com.iflytop.gd.app.service.api.PhotosService;
 import com.iflytop.gd.common.base.BasePageQuery;
+import com.iflytop.gd.common.result.PageResult;
 import com.iflytop.gd.common.result.Result;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -29,8 +30,8 @@ public class PhotoController {
 
     @Operation(summary = "照片列表")
     @GetMapping("/list")
-    public Result<List<PhotoListVO>> getList(BasePageQuery pageQuery) {
-        return Result.success(photosService.getList(pageQuery));
+    public PageResult<PhotoListVO> getList(BasePageQuery pageQuery) {
+        return PageResult.success(photosService.getList(pageQuery));
     }
 
     @Operation(summary = "根据id获取照片")

src/main/java/com/iflytop/gd/app/service/api/PhotosService.java

@@ -9,6 +9,7 @@ import com.iflytop.gd.app.model.dto.PhotoSaveDTO;
 import com.iflytop.gd.app.model.dto.PhotoTakeDTO;
 import com.iflytop.gd.app.model.entity.Ores;
 import com.iflytop.gd.app.model.entity.Photos;
+import com.iflytop.gd.app.model.vo.OresCraftsListVO;
 import com.iflytop.gd.app.model.vo.PhotoListVO;
 import com.iflytop.gd.app.model.vo.PhotoVO;
 import com.iflytop.gd.app.service.device.module.SolutionModuleService;
@@ -51,10 +52,11 @@ public class PhotosService extends ServiceImpl<PhotosMapper, Photos> {
     @Value("${photo.path}")
     private String path;
 
-    public List<PhotoListVO> getList(BasePageQuery pageQuery) {
+    public IPage<PhotoListVO> getList(BasePageQuery pageQuery) {
         LambdaQueryWrapper<Photos> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.orderByDesc(Photos::getCreateTime);
         IPage<Photos> result = this.page(new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize()), queryWrapper);
+        long count = this.count();
         List<PhotoListVO> dataList = new ArrayList<>();
         for (Photos photos : result.getRecords()) {
             PhotoListVO photoListVO = new PhotoListVO();
@@ -66,7 +68,10 @@ public class PhotosService extends ServiceImpl<PhotosMapper, Photos> {
             photoListVO.setUpdateTime(photos.getUpdateTime());
             dataList.add(photoListVO);
         }
-        return dataList;
+        Page<PhotoListVO> resultPage = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
+        resultPage.setTotal(count);
+        resultPage.setRecords(dataList);
+        return resultPage;
     }
 
     public PhotoVO get(Long id) {