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 { 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(); + } } }