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 { List batchUploadDefectImage(String partId, String imageSource, ImageCollectReq collectReq, MultipartFile[] files); - List uploadProjectBatch(String projectId, String imageSource, MultipartFile[] files); + List uploadProjectBatch(String projectId, String imageSource, ImageCollectReq collectReq, MultipartFile[] files); List 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 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 impl @SneakyThrows @Override - public List uploadProjectBatch(String projectId, String imageSource, MultipartFile[] files) { + public List 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 impl List list = new ArrayList<>(files.length); List 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> uploadProjectBatch(@PathVariable String projectId, @PathVariable String imageSource, @RequestParam("files") MultipartFile[] files) { - return Result.ok(imageService.uploadProjectBatch(projectId, imageSource, files)); + public Result> 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")