diff --git a/src/main/java/com/github/javpower/javavision/service/FaceService.java b/src/main/java/com/github/javpower/javavision/service/FaceService.java index ef10dba11cbe4b4a29388c1d391ce28f27b3ea6e..2a756b50e0b90a919a7f84d1c1a8960e591783a7 100644 --- a/src/main/java/com/github/javpower/javavision/service/FaceService.java +++ b/src/main/java/com/github/javpower/javavision/service/FaceService.java @@ -16,6 +16,7 @@ import com.github.javpower.javavision.entity.FaceParam; import com.github.javpower.javavision.entity.PersonObject; import com.github.javpower.javavision.util.FaceDetectUtil; import com.github.javpower.javavision.util.FaceSimilarityCalculator; +import com.github.javpower.javavision.util.FileUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; @@ -39,6 +40,8 @@ public class FaceService { @Autowired private FileProperties fileProperties; + @Autowired + private FileUtil fileUtil; public String addFace(FaceParam param, MultipartFile file, HttpServletRequest request) throws IOException, TranslateException, ModelNotFoundException, MalformedModelException, OrtException { List allJson = getAllJson(); if(CollectionUtil.isNotEmpty(allJson)){ @@ -109,25 +112,26 @@ public class FaceService { return false; } public String getPath(MultipartFile file) throws IOException { - String originalFilename = file.getOriginalFilename(); - log.info("originalFilename:" + originalFilename); - // 获取文件后缀 - String extension = FilenameUtils.getExtension(originalFilename); - String newFileName = DateUtil.format(new Date(), DatePattern.PURE_DATETIME_MS_PATTERN) + RandomStringUtils.randomNumeric(6) + "." + extension; - log.info("newFileName:" + newFileName); - // 本地文件上传路径 - String uploadPath = fileProperties.getUploadPath(); - File uploadDir = new File(uploadPath); - // 上传目录不存在,则直接创建 - if (!uploadDir.exists()) { - uploadDir.mkdirs(); - } - // 上传文件到本地目录 - File uploadFile = new File(uploadDir, newFileName); - log.info("uploadFile:" + uploadFile); - file.transferTo(uploadFile); - String imgPath = uploadPath+newFileName; - return imgPath; +// String originalFilename = file.getOriginalFilename(); +// log.info("originalFilename:" + originalFilename); +// // 获取文件后缀 +// String extension = FilenameUtils.getExtension(originalFilename); +// String newFileName = DateUtil.format(new Date(), DatePattern.PURE_DATETIME_MS_PATTERN) + RandomStringUtils.randomNumeric(6) + "." + extension; +// log.info("newFileName:" + newFileName); +// // 本地文件上传路径 +// String uploadPath = fileProperties.getUploadPath(); +// File uploadDir = new File(uploadPath); +// // 上传目录不存在,则直接创建 +// if (!uploadDir.exists()) { +// uploadDir.mkdirs(); +// } +// // 上传文件到本地目录 +// File uploadFile = new File(uploadDir, newFileName); +// log.info("uploadFile:" + uploadFile); +// file.transferTo(uploadFile); +// String imgPath = uploadPath+newFileName; +// return imgPath; + return fileUtil.getPath(file); } public void addJsonFile(FaceParam param){ diff --git a/src/main/java/com/github/javpower/javavision/util/FileUtil.java b/src/main/java/com/github/javpower/javavision/util/FileUtil.java index cdb41ecdc97e7256e97ab0b1d1e6c1de04abbfcf..5b35f1cfe71ba14906359812a459da00f79eec64 100644 --- a/src/main/java/com/github/javpower/javavision/util/FileUtil.java +++ b/src/main/java/com/github/javpower/javavision/util/FileUtil.java @@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; +import java.io.File; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; @@ -25,6 +26,10 @@ public class FileUtil { // 获取文件后缀 String extension = FilenameUtils.getExtension(originalFileName); String target= UUID.fastUUID().toString().replace("-","")+"."+extension; + File parentFilePath=new File(fileProperties.getUploadPath()); + if(!parentFilePath.exists()){ + parentFilePath.mkdirs(); + } // 构建目标文件路径 Path targetLocation = Paths.get(fileProperties.getUploadPath()).resolve(target); // 将文件保存到目标路径