From 47fb03122189a6148effc04f90fb790846e35ce2 Mon Sep 17 00:00:00 2001
From: cuizhibin <cuizhibin@kyland.com>
Date: Sat, 2 Aug 2025 17:10:54 +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=A2=9E=E5=8A=A0=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/dite/znpt/service/ImageService.java | 2 +-
 .../java/com/dite/znpt/service/impl/ImageServiceImpl.java | 8 ++++----
 .../com/dite/znpt/web/controller/ImageController.java     | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/com/dite/znpt/service/ImageService.java b/core/src/main/java/com/dite/znpt/service/ImageService.java
index 4bab57b..1e2bb9e 100644
--- a/core/src/main/java/com/dite/znpt/service/ImageService.java
+++ b/core/src/main/java/com/dite/znpt/service/ImageService.java
@@ -25,7 +25,7 @@ public interface ImageService extends IService<ImageEntity> {
 
     List<ImageReq> batchUploadDefectImage(String partId, String imageSource, ImageCollectReq collectReq, MultipartFile[] files);
 
-    List<ImageReq> uploadProjectBatch(String projectId, String imageSource, MultipartFile[] files);
+    List<ImageReq> uploadProjectBatch(String projectId, String imageSource, ImageCollectReq collectReq, MultipartFile[] files);
 
     List<String> batchUploadCommonImage(String imageSource, ImageWorkReq imageWorkReq, MultipartFile[] file) throws IOException;
 
diff --git a/core/src/main/java/com/dite/znpt/service/impl/ImageServiceImpl.java b/core/src/main/java/com/dite/znpt/service/impl/ImageServiceImpl.java
index 9db73da..7e86363 100644
--- a/core/src/main/java/com/dite/znpt/service/impl/ImageServiceImpl.java
+++ b/core/src/main/java/com/dite/znpt/service/impl/ImageServiceImpl.java
@@ -161,7 +161,7 @@ public class ImageServiceImpl extends ServiceImpl<ImageMapper, ImageEntity> impl
             if (!file.isEmpty()) {
                 try {
                     String path = temPathPrefix + file.getOriginalFilename();
-                    FileUtil.writeBytes(file.getBytes(),path);
+                    FileUtil.writeFromStream(file.getInputStream(),path);
                     String fileDownPath = FilePathEnum.IMAGE_TEMP.getFileDownPath(path);
                     ImageReq imageReq = imageRespBuilder(path, fileDownPath);
                     imageReq.setImageId(IdUtil.simpleUUID());
@@ -185,7 +185,7 @@ public class ImageServiceImpl extends ServiceImpl<ImageMapper, ImageEntity> impl
 
     @SneakyThrows
     @Override
-    public List<ImageReq> uploadProjectBatch(String projectId, String imageSource, MultipartFile[] files) {
+    public List<ImageReq> uploadProjectBatch(String projectId, String imageSource, ImageCollectReq collectReq, MultipartFile[] files) {
         if (Objects.isNull(projectService.getById(projectId))) {
             throw new ServiceException(Message.PROJECT_ID_IS_NOT_EXIST);
         }
@@ -202,13 +202,13 @@ public class ImageServiceImpl extends ServiceImpl<ImageMapper, ImageEntity> impl
         List<ImageReq> list = new ArrayList<>(files.length);
         List<ImageEntity> imageList = new ArrayList<>();
 
-        ImageCollectEntity imageCollect = new ImageCollectEntity();
+        ImageCollectEntity imageCollect = Optional.ofNullable(BeanUtil.copyProperties(collectReq, ImageCollectEntity.class)).orElse(new ImageCollectEntity());
         imageCollect.setCollectId(IdUtil.simpleUUID());
         imageCollect.setCollectorId(StpUtil.getLoginIdAsString());
         imageCollect.setCollectorName(userService.getById(StpUtil.getLoginIdAsString()).getName());
         for (MultipartFile multipartFile : files) {
             String absolutePath = path_prefix + multipartFile.getOriginalFilename();
-            FileUtil.writeBytes(multipartFile.getBytes(),absolutePath);
+            FileUtil.writeFromStream(multipartFile.getInputStream(),absolutePath);
             String fileDownPath = FilePathEnum.IMAGE.getFileDownPath(absolutePath);
             ImageEntity imageEntity = new ImageEntity();
             try {
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 518b177..1f28c39 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
@@ -57,8 +57,8 @@ public class ImageController {
 
     @ApiOperation(value = "手动批量上传文件夹图像到项目", httpMethod = "POST")
     @PostMapping("/{projectId}/{imageSource}/upload-batch")
-    public Result<List<ImageReq>> uploadProjectBatch(@PathVariable String projectId, @PathVariable String imageSource, @RequestParam("files") MultipartFile[] files) {
-        return Result.ok(imageService.uploadProjectBatch(projectId, imageSource, files));
+    public Result<List<ImageReq>> uploadProjectBatch(@PathVariable String projectId, @PathVariable String imageSource, ImageCollectReq collectReq, @RequestParam("files") MultipartFile[] files) {
+        return Result.ok(imageService.uploadProjectBatch(projectId, imageSource, collectReq, files));
     }
 
     @ApiOperation(value = "上传图像", httpMethod = "POST")