From 966b2c303caa08a8d8ff56574ae75bf1e874b60a Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Thu, 1 Aug 2024 18:03:01 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86):=20?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA=E5=A2=9E=E5=8A=A0=E9=99=84?= =?UTF-8?q?=E4=BB=B6=E5=B1=82=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ProcessStandardInterpretClauseSublist.java | 2 +- .../standardinterpret/vo/FlowImportExcel.java | 2 +- .../jero/modules/split/common/FileUnZip.java | 3 ++ .../impl/FileSplitItemsEOServiceImpl.java | 28 ++++++++++++------- 4 files changed, 23 insertions(+), 12 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpretClauseSublist.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpretClauseSublist.java index 362cae0c..6b78751c 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpretClauseSublist.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpretClauseSublist.java @@ -50,7 +50,7 @@ public class ProcessStandardInterpretClauseSublist extends BaseEntity { private String interpretPersonId; /**译文*/ @ApiModelProperty(value = "译文") - @Excel(name = "译文", width = 15) +// @Excel(name = "译文", width = 15) private String translation; /**是否与上一版相同（字典：1：是，0：否）*/ @ApiModelProperty(value = "是否与上一版相同（字典：1：是，0：否）") diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/vo/FlowImportExcel.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/vo/FlowImportExcel.java index b5dab8f5..81407faf 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/vo/FlowImportExcel.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/vo/FlowImportExcel.java @@ -31,7 +31,7 @@ public class FlowImportExcel { private String itemContent; /**译文*/ @ApiModelProperty(value = "译文") - @Excel(name = "译文", width = 15) +// @Excel(name = "译文", width = 15) private String translation; /**是否与上一版相同（字典：1：是，0：否）*/ @ApiModelProperty(value = "是否与上一版相同（字典：1：是，0：否）") diff --git a/laws-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java b/laws-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java index b0e04832..26f6447c 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java +++ b/laws-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java @@ -242,6 +242,9 @@ public class FileUnZip { * @return */ public static List readFileByFilename(String path,String filename) { + if (filename.contains("/")){ + filename = filename.substring(filename.lastIndexOf("/") + 1, filename.length()); + } List resultlist = new ArrayList<>(); if (StringUtil.isNotEmpty(path)){ File file = new File(path); diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index b92a2f4c..3782d95d 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -1879,7 +1879,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl message = importSplitItemsData(datasUpdate,menuId,unzipfilepath,infoId,cut,getSheetTableList); //删除原上传文件 FileUnZip.deleteDir(saveDirectory); @@ -3965,16 +3965,20 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl allImgList, String fileNowPath) { for(FileSplitValImgExportDto imgExportDto : allImgList){ - String oldPath = uploadCospath + "/" + imgExportDto.getImgPath(); - String newPath = fileNowPath + File.separator + imgExportDto.getImgName(); - if (MinioUtil.doesObjectExist(oldPath)){ - try (InputStream in = MinioUtil.download(oldPath);) { + String oldPath = "temp\\" + imgExportDto.getImgPath(); + String newPath = fileNowPath + File.separator + "附件" + File.separator + imgExportDto.getImgName(); +// if (MinioUtil.doesObjectExist(oldPath)){ + try (InputStream in = ObsBootUtil.getOssFile(oldPath);) { + File file = new File(fileNowPath + File.separator + "附件"); + if (!file.exists()){ + file.mkdir(); + } copyFile1(in, newPath); } catch (IOException e) { e.printStackTrace(); log.error(e.getMessage(), e); } - } +// } } } @@ -3983,15 +3987,19 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl allRelevFileList, String fileNowPath) { for(OSSFile fileExportDto : allRelevFileList){ String oldPath = fileExportDto.getUrl(); - String newPath = fileNowPath + File.separator + fileExportDto.getFileName(); - if (MinioUtil.doesObjectExist(oldPath)){ - try (InputStream in = MinioUtil.download(oldPath);) { + String newPath = fileNowPath + File.separator + "附件" + File.separator + fileExportDto.getFileName(); +// if (MinioUtil.doesObjectExist(oldPath)){ + try (InputStream in = ObsBootUtil.getOssFile(oldPath)) { + File file = new File(fileNowPath + File.separator + "附件"); + if (!file.exists()){ + file.mkdir(); + } copyFile1(in, newPath); } catch (IOException e) { e.printStackTrace(); log.error(e.getMessage(), e); } - } +// } } }