From 1805dfc0d86c6f0d767519bc2beb01b528f21790 Mon Sep 17 00:00:00 2001 From: cuizhibin Date: Fri, 25 Jul 2025 11:19:33 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=9B=BE=E7=89=87=E9=9B=86=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ImageCollectServiceImpl.java | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/core/src/main/java/com/dite/znpt/service/impl/ImageCollectServiceImpl.java b/core/src/main/java/com/dite/znpt/service/impl/ImageCollectServiceImpl.java index 39871f2..1aac248 100644 --- a/core/src/main/java/com/dite/znpt/service/impl/ImageCollectServiceImpl.java +++ b/core/src/main/java/com/dite/znpt/service/impl/ImageCollectServiceImpl.java @@ -2,7 +2,6 @@ package com.dite.znpt.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.io.FileUtil; -import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.dite.znpt.constant.Message; import com.dite.znpt.converts.Converts; @@ -53,27 +52,20 @@ public class ImageCollectServiceImpl extends ServiceImpl imageList = Converts.INSTANCE.toImageEntity(req.getImageList()); String permPathPrefix = FilePathEnum.IMAGE.getFileAbsolutePathPrefix().concat(ImageSourceEnum.COLLECT.getCode()).concat(FileUtil.FILE_SEPARATOR).concat(partId).concat(FileUtil.FILE_SEPARATOR).concat(dateStr).concat(FileUtil.FILE_SEPARATOR); - String temPathPrefix = FilePathEnum.IMAGE_TEMP.getFileAbsolutePathPrefix().concat(ImageSourceEnum.COLLECT.getCode()).concat(FileUtil.FILE_SEPARATOR).concat(partId).concat(FileUtil.FILE_SEPARATOR); imageList.forEach(image -> { image.setPartId(partId); image.setCollectId(imageCollect.getCollectId()); image.setImageType(req.getImageType()); image.setImageTypeLabel(req.getImageTypeLabel()); String path = permPathPrefix + image.getImageName(); - File file = new File(temPathPrefix.concat(image.getImageName())); + String fileAbsolutePath = FilePathEnum.IMAGE_TEMP.getFileAbsolutePath(image.getImagePath()); + File file = FileUtil.file(fileAbsolutePath); if (file.exists()) { - byte[] bytes = FileUtil.readBytes(file); - FileUtil.writeBytes(bytes, path); - String url = FilePathEnum.IMAGE.getUrlPath().concat(StrUtil.removePrefix(path,FilePathEnum.IMAGE.getFileAbsolutePathPrefix()).replace(FileUtil.FILE_SEPARATOR, StrUtil.SLASH)); - image.setImagePath(url); + FileUtil.copy(file, FileUtil.file(path), true); + image.setImagePath(FilePathEnum.IMAGE.getFileDownPath(path)); FileUtil.del(file); - }else { - imageList.remove(image); } }); - if(CollUtil.isEmpty(imageList)){ - throw new ServiceException(Message.IMAGE_PATH_IS_NOT_EXIST); - } imageService.saveOrUpdateBatch(imageList); } }