diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/mobilePort/utils/FileCopy.java b/SC-boot/linkage-scm/src/main/java/jnpf/mobilePort/utils/FileCopy.java index ccddd714..0e7683d4 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/mobilePort/utils/FileCopy.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/mobilePort/utils/FileCopy.java @@ -260,7 +260,7 @@ public class FileCopy { String type = url.substring(16, i); // System.out.println("type"+type); // System.out.println("type.toLowerCase()"+type.toLowerCase()); - String fileId = map.get("fileId"); + String fileId = map.get("name"); // 本地文件路径 String filePath = FilePathUtil.getFilePath(type.toLowerCase()) + fileId; // 获得图片的base64码 diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java index 4b723be9..e99d1611 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java @@ -319,6 +319,7 @@ public class PurchaseorderController { List list = UpUtil.getFileAll(); MultipartFile file = list.get(0); if (file.getOriginalFilename().endsWith(".zip")) { + FileUtil.deleteFileAll(new File(configValueUtil.getTemporaryFilePath() +"unzip")); String filePath = configValueUtil.getTemporaryFilePath() + "unzip\\"; // String fileName = RandomUtil.uuId() + "." + UpUtil.getFileType(file); @@ -328,7 +329,7 @@ public class PurchaseorderController { if (!temporaryFile.exists()) { temporaryFile.mkdirs(); } - FileUtil.deleteFileAll(temporaryFile); + @Cleanup InputStream inputStream = file.getInputStream(); File gbk = ZipUtil.unzip(inputStream, temporaryFile, Charset.forName("GBK")); HashMap imgMap = new HashMap<>(); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java index d112c289..dbc633c8 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java @@ -490,9 +490,7 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl> imgList = FileCopy.getImageInfo(String.valueOf(map.get("poundPictures"))); if (imgList != null && imgList.size() > 0) {