From ffbf766ceee6b4cf8d7a43efc0405d012a86481c Mon Sep 17 00:00:00 2001
From: cuizhibin <cuizhibin@kyland.com>
Date: Tue, 5 Aug 2025 20:23:46 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=89=8B=E5=8A=A8=E6=89=B9=E9=87=8F=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E6=96=87=E4=BB=B6=E5=A4=B9=E5=9B=BE=E5=83=8F=E5=88=B0?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE(=E5=8D=95=E5=BC=A0)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/dite/znpt/service/impl/PartServiceImpl.java | 2 +-
 .../com/dite/znpt/web/controller/ImageController.java    | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/com/dite/znpt/service/impl/PartServiceImpl.java b/core/src/main/java/com/dite/znpt/service/impl/PartServiceImpl.java
index 43e9b92..4f6ef6a 100644
--- a/core/src/main/java/com/dite/znpt/service/impl/PartServiceImpl.java
+++ b/core/src/main/java/com/dite/znpt/service/impl/PartServiceImpl.java
@@ -99,7 +99,7 @@ public class PartServiceImpl extends ServiceImpl<PartMapper, PartEntity> impleme
                 if(StrUtil.isNotEmpty(turbine.getProjectId())){
                     ProjectEntity project = projectService.getById(turbine.getProjectId());
                     if(null != project){
-                        resp.setProjectId(resp.getProjectId());
+                        resp.setProjectId(project.getProjectId());
                         resp.setProjectName(project.getProjectName());
                     }
                 }
diff --git a/web/src/main/java/com/dite/znpt/web/controller/ImageController.java b/web/src/main/java/com/dite/znpt/web/controller/ImageController.java
index 1f28c39..5a147d1 100644
--- a/web/src/main/java/com/dite/znpt/web/controller/ImageController.java
+++ b/web/src/main/java/com/dite/znpt/web/controller/ImageController.java
@@ -61,11 +61,16 @@ public class ImageController {
         return Result.ok(imageService.uploadProjectBatch(projectId, imageSource, collectReq, files));
     }
 
+    @ApiOperation(value = "手动批量上传文件夹图像到项目(单张)", httpMethod = "POST")
+    @PostMapping("/{projectId}/{imageSource}/upload")
+    public Result<ImageReq> uploadProject(@PathVariable String projectId, @PathVariable String imageSource, ImageCollectReq collectReq, @RequestParam("file") MultipartFile file) {
+        return Result.ok(imageService.uploadProjectBatch(projectId, imageSource, collectReq, new MultipartFile[]{file}).get(0));
+    }
+
     @ApiOperation(value = "上传图像", httpMethod = "POST")
     @PostMapping("/{imageSource}/upload/{partId}")
     public Result<ImageReq> uploadOutWork(@PathVariable String imageSource, @PathVariable String partId, ImageCollectReq collectReq, @RequestParam("file") MultipartFile file) {
-        MultipartFile[] files = {file};
-        return Result.ok(imageService.batchUploadDefectImage(partId, imageSource, collectReq, files).get(0));
+        return Result.ok(imageService.batchUploadDefectImage(partId, imageSource, collectReq, new MultipartFile[]{file}).get(0));
     }
 
     @ApiOperation(value = "设置信息", httpMethod = "POST")