From 71f55260174310b4a5bd21cc9b6d7975b3af5db8 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 09:20:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E7=85=A7=E7=89=87=E6=8E=A5=E5=8F=A3=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iflytop/gd/app/controller/PhotoController.java  |  3 ++-
 .../com/iflytop/gd/app/model/dto/PhotoSaveDTO.java  | 21 +++++++++++++++++++++
 .../iflytop/gd/app/service/api/PhotosService.java   | 13 ++++++++-----
 3 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 src/main/java/com/iflytop/gd/app/model/dto/PhotoSaveDTO.java

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 6714f78..c8178af 100644
--- a/src/main/java/com/iflytop/gd/app/controller/PhotoController.java
+++ b/src/main/java/com/iflytop/gd/app/controller/PhotoController.java
@@ -3,6 +3,7 @@ package com.iflytop.gd.app.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.iflytop.gd.app.model.dto.PhotoSaveDTO;
 import com.iflytop.gd.app.model.entity.Photos;
 import com.iflytop.gd.app.service.api.PhotosService;
 import com.iflytop.gd.common.base.BasePageQuery;
@@ -46,7 +47,7 @@ public class PhotoController {
 
     @Operation(summary = "保存照片")
     @GetMapping("/save")
-    public Result<?> save(Photos photos) {
+    public Result<?> save(PhotoSaveDTO photoSaveDTO) {
         return Result.success();
     }
 
diff --git a/src/main/java/com/iflytop/gd/app/model/dto/PhotoSaveDTO.java b/src/main/java/com/iflytop/gd/app/model/dto/PhotoSaveDTO.java
new file mode 100644
index 0000000..dd7feb0
--- /dev/null
+++ b/src/main/java/com/iflytop/gd/app/model/dto/PhotoSaveDTO.java
@@ -0,0 +1,21 @@
+package com.iflytop.gd.app.model.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class PhotoSaveDTO {
+    private Long id;
+
+    @Schema(description = "矿石ID")
+    private Long oreId;
+
+    @Schema(description = "图片问题数据")
+    private String problem;
+
+    @Schema(description = "文件名称", example = "123.png")
+    private String fileName;
+
+    @Schema(description = "备注")
+    private String remarks;
+}
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 dd8f751..89363f5 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
@@ -23,10 +23,13 @@ public class PhotosService extends ServiceImpl<PhotosMapper, Photos> {
 
 
     public String take() {
-        String filePath = path + "/temp/" + System.currentTimeMillis() + ".png";
-        driver.enable();
-        driver.saveColorImg(filePath);
-        driver.disable();
-        return url + filePath;
+        try {
+            String filePath = path + "/temp/" + System.currentTimeMillis() + ".png";
+            driver.enable();
+            driver.saveColorImg(filePath);
+            return url + filePath;
+        } finally {
+            driver.disable();
+        }
     }
 }