diff --git a/cas-common/src/main/java/com/inscloudtech/common/utils/file/ExtractCallback.java b/cas-common/src/main/java/com/inscloudtech/common/utils/file/ExtractCallback.java index 55f129b..349b5e8 100644 --- a/cas-common/src/main/java/com/inscloudtech/common/utils/file/ExtractCallback.java +++ b/cas-common/src/main/java/com/inscloudtech/common/utils/file/ExtractCallback.java @@ -33,8 +33,7 @@ public class ExtractCallback implements IArchiveExtractCallback { public int write(byte[] data) throws SevenZipException { try { if (!isFolder) { -// System.out.println(path); - File file = new File(ourDir+"\\" + path); + File file = new File(ourDir+ File.separator + path); if (path.equals(oldPath[0])){ save2File(file, data,true); }else{ diff --git a/cas-common/src/main/java/com/inscloudtech/common/utils/file/RAR5Util.java b/cas-common/src/main/java/com/inscloudtech/common/utils/file/RAR5Util.java index 713e82a..5031f39 100644 --- a/cas-common/src/main/java/com/inscloudtech/common/utils/file/RAR5Util.java +++ b/cas-common/src/main/java/com/inscloudtech/common/utils/file/RAR5Util.java @@ -94,7 +94,7 @@ public class RAR5Util { File tempFile = null; try { File tmpDir = FileUtil.getTmpDir(); - String newDirName = tmpDir + File.separator + RandomUtil.randomString(Constants.RANDOM_STRING_LENGTH); + String newDirName = tmpDir + File.separator +"cas"+ File.separator + RandomUtil.randomString(Constants.RANDOM_STRING_LENGTH); File zipTmpDir = new File(newDirName); if (!zipTmpDir.exists() && !zipTmpDir.mkdirs()) { // 目录创建失败的处理逻辑 @@ -126,9 +126,7 @@ public class RAR5Util { }catch (Exception e){ e.printStackTrace(); } finally { - if (tempFile.exists()) { - tempFile.delete(); // 清理临时文件 - } +// FileUtil.del(tempFile); } return null; } diff --git a/cas-system/src/main/java/com/inscloudtech/analysiscenter/service/impl/AnalysisResultServiceImpl.java b/cas-system/src/main/java/com/inscloudtech/analysiscenter/service/impl/AnalysisResultServiceImpl.java index d082e9f..4a5dcf1 100644 --- a/cas-system/src/main/java/com/inscloudtech/analysiscenter/service/impl/AnalysisResultServiceImpl.java +++ b/cas-system/src/main/java/com/inscloudtech/analysiscenter/service/impl/AnalysisResultServiceImpl.java @@ -64,11 +64,8 @@ public class AnalysisResultServiceImpl implements IAnalysisResultService { @Override public TableDataInfo queryPageList(AnalysisResult bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); - int start = (pageQuery.getPageNum() - 1) * pageQuery.getPageSize(); - lqw.last( "order by create_time desc limit "+start+","+ pageQuery.getPageSize()); Page result = baseMapper.selectPage(pageQuery.build(), lqw); TableDataInfo tableDataInfo = TableDataInfo.build(result); - tableDataInfo.setTotal(baseMapper.selectCount(lqw)); return tableDataInfo; } diff --git a/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/BankServiceImpl.java b/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/BankServiceImpl.java index cbea1c2..cb63459 100644 --- a/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/BankServiceImpl.java +++ b/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/BankServiceImpl.java @@ -1534,22 +1534,23 @@ public class BankServiceImpl implements BankService { if (files == null) { throw new RegularFailureException("压缩文件为空,没有数据"); } - - if (files.length != 1) { - throw new RegularFailureException("银行流水导入模板有误,请重新下载后载入数据."); + File dir = null; + for (File file : files) { + if (file.isDirectory()) { + dir = file; + break; + } } - - File file = files[0]; - if (!file.isDirectory()) { - throw new RegularFailureException(FileUtil.getName(file) + "是文件夹."); + if (dir == null) { + throw new RegularFailureException("未解析到流水文件!"); } // 异步去拆分文件 - File fDir = zipDir; +// File fDir = zipDir; // masterPool.executeAsync(() -> HelperUtil.splitBsAndOaiFiles(fDir)); // 导入数据 - ImportResultPromptVO execVo = analysisBankData(file, caseId); + ImportResultPromptVO execVo = analysisBankData(dir, caseId); // 等待任务完成 sw.stop(); diff --git a/cas-system/src/main/java/com/inscloudtech/system/service/impl/SysOssServiceImpl.java b/cas-system/src/main/java/com/inscloudtech/system/service/impl/SysOssServiceImpl.java index 3cdea4c..d367a4e 100644 --- a/cas-system/src/main/java/com/inscloudtech/system/service/impl/SysOssServiceImpl.java +++ b/cas-system/src/main/java/com/inscloudtech/system/service/impl/SysOssServiceImpl.java @@ -178,7 +178,7 @@ public class SysOssServiceImpl implements ISysOssService { } @Override - @Async +// @Async public void upload2LocalWithBatchId(MultipartFile file, String caseId, String businessModule, String batchId,int uploadResult) { SysOss sysOss = new SysOss(); sysOss.setUploadResult(uploadResult);