From 413de996e81ba2de38f5656afd13fd8e04203572 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E5=87=A4=E5=90=89?= <baifengji@163.com>
Date: Fri, 13 Jun 2025 16:52:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E7=85=A7=E7=89=87?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/iflytop/gd/app/controller/PhotoController.java | 5 +++--
 src/main/java/com/iflytop/gd/app/service/api/PhotosService.java  | 9 +++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/iflytop/gd/app/controller/PhotoController.java b/src/main/java/com/iflytop/gd/app/controller/PhotoController.java
index 4fe9333..6eff9d9 100644
--- a/src/main/java/com/iflytop/gd/app/controller/PhotoController.java
+++ b/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获取照片")
diff --git a/src/main/java/com/iflytop/gd/app/service/api/PhotosService.java b/src/main/java/com/iflytop/gd/app/service/api/PhotosService.java
index 53fd7fe..4ccac4f 100644
--- a/src/main/java/com/iflytop/gd/app/service/api/PhotosService.java
+++ b/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) {