From 1f2e2a86fd4d07a102268564b550f1286d4772f7 Mon Sep 17 00:00:00 2001 From: wangchengjun Date: Thu, 26 May 2022 21:08:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8B=86=E5=88=86=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=B8=AD=E6=9F=A5=E8=AF=A2=E5=88=B0=E5=A4=9A=E4=B8=AA=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=86=85=E5=AE=B9=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../split/service/impl/FileSpiltService.java | 78 +++++++++++++++---- 1 file changed, 64 insertions(+), 14 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java index 8ae44d076..4589cf08d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java @@ -112,12 +112,20 @@ public class FileSpiltService { try { //获取文件地址 String connectId = sarFileSplitInfoEO.getConnectId(); - if (StringUtils.isEmpty(connectId)) { + String fileName = sarFileSplitInfoEO.getFileName(); + if (StringUtils.isEmpty(connectId) || StringUtils.isEmpty(fileName)) { throw new JeroBootException("当前文件未找到，请重新选择！"); } LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); queryWrapper.eq(OSSFile::getConnectId, connectId); - OSSFile ossFile = iossFileService.getOne(queryWrapper); + queryWrapper.eq(OSSFile::getFileName, fileName); + queryWrapper.orderByDesc(OSSFile::getCreateTime); + List ossFileList = iossFileService.list(queryWrapper); + if (CollectionUtils.isEmpty(ossFileList)) { + throw new JeroBootException("当前文件未找到，请重新选择！"); + } + OSSFile ossFile = ossFileList.get(0); + String readFilePath = ossFile.getUrl(); if (StringUtils.isEmpty(readFilePath)) { throw new JeroBootException("当前文件未找到，请重新选择！"); @@ -592,12 +600,19 @@ public class FileSpiltService { try { //获取文件地址 String connectId = sarFileSplitInfoEO.getConnectId(); - if (StringUtils.isEmpty(connectId)) { + String fileName = sarFileSplitInfoEO.getFileName(); + if (StringUtils.isEmpty(connectId) || StringUtils.isEmpty(fileName)) { throw new JeroBootException("当前文件未找到，请重新选择！"); } LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); queryWrapper.eq(OSSFile::getConnectId, connectId); - OSSFile ossFile = iossFileService.getOne(queryWrapper); + queryWrapper.eq(OSSFile::getFileName, fileName); + queryWrapper.orderByDesc(OSSFile::getCreateTime); + List ossFileList = iossFileService.list(queryWrapper); + if (CollectionUtils.isEmpty(ossFileList)) { + throw new JeroBootException("当前文件未找到，请重新选择！"); + } + OSSFile ossFile = ossFileList.get(0); String readFilePath = ossFile.getUrl(); if (StringUtils.isEmpty(readFilePath)) { throw new JeroBootException("当前文件未找到，请重新选择！"); @@ -756,12 +771,19 @@ public class FileSpiltService { try { //获取文件地址 String connectId = sarFileSplitInfoEO.getConnectId(); - if (StringUtils.isEmpty(connectId)) { + String fileName = sarFileSplitInfoEO.getFileName(); + if (StringUtils.isEmpty(connectId) || StringUtils.isEmpty(fileName)) { throw new JeroBootException("当前文件未找到，请重新选择！"); } LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); queryWrapper.eq(OSSFile::getConnectId, connectId); - OSSFile ossFile = iossFileService.getOne(queryWrapper); + queryWrapper.eq(OSSFile::getFileName, fileName); + queryWrapper.orderByDesc(OSSFile::getCreateTime); + List ossFileList = iossFileService.list(queryWrapper); + if (CollectionUtils.isEmpty(ossFileList)) { + throw new JeroBootException("当前文件未找到，请重新选择！"); + } + OSSFile ossFile = ossFileList.get(0); String readFilePath = ossFile.getUrl(); if (StringUtils.isEmpty(readFilePath)) { throw new JeroBootException("当前文件未找到，请重新选择！"); @@ -924,12 +946,19 @@ public class FileSpiltService { try { //获取文件地址 String connectId = sarFileSplitInfoEO.getConnectId(); - if (StringUtils.isEmpty(connectId)) { + String fileName = sarFileSplitInfoEO.getFileName(); + if (StringUtils.isEmpty(connectId) || StringUtils.isEmpty(fileName)) { throw new JeroBootException("当前文件未找到，请重新选择！"); } LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); queryWrapper.eq(OSSFile::getConnectId, connectId); - OSSFile ossFile = iossFileService.getOne(queryWrapper); + queryWrapper.eq(OSSFile::getFileName, fileName); + queryWrapper.orderByDesc(OSSFile::getCreateTime); + List ossFileList = iossFileService.list(queryWrapper); + if (CollectionUtils.isEmpty(ossFileList)) { + throw new JeroBootException("当前文件未找到，请重新选择！"); + } + OSSFile ossFile = ossFileList.get(0); String readFilePath = ossFile.getUrl(); if (StringUtils.isEmpty(readFilePath)) { throw new JeroBootException("当前文件未找到，请重新选择！"); @@ -1092,12 +1121,19 @@ public class FileSpiltService { try { //获取文件地址 String connectId = sarFileSplitInfoEO.getConnectId(); - if (StringUtils.isEmpty(connectId)) { + String fileName = sarFileSplitInfoEO.getFileName(); + if (StringUtils.isEmpty(connectId) || StringUtils.isEmpty(fileName)) { throw new JeroBootException("当前文件未找到，请重新选择！"); } LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); queryWrapper.eq(OSSFile::getConnectId, connectId); - OSSFile ossFile = iossFileService.getOne(queryWrapper); + queryWrapper.eq(OSSFile::getFileName, fileName); + queryWrapper.orderByDesc(OSSFile::getCreateTime); + List ossFileList = iossFileService.list(queryWrapper); + if (CollectionUtils.isEmpty(ossFileList)) { + throw new JeroBootException("当前文件未找到，请重新选择！"); + } + OSSFile ossFile = ossFileList.get(0); String readFilePath = ossFile.getUrl(); if (StringUtils.isEmpty(readFilePath)) { throw new JeroBootException("当前文件未找到，请重新选择！"); @@ -1257,12 +1293,19 @@ public class FileSpiltService { try { //获取文件地址 String connectId = sarFileSplitInfoEO.getConnectId(); - if (StringUtils.isEmpty(connectId)) { + String fileName = sarFileSplitInfoEO.getFileName(); + if (StringUtils.isEmpty(connectId) || StringUtils.isEmpty(fileName)) { throw new JeroBootException("当前文件未找到，请重新选择！"); } LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); queryWrapper.eq(OSSFile::getConnectId, connectId); - OSSFile ossFile = iossFileService.getOne(queryWrapper); + queryWrapper.eq(OSSFile::getFileName, fileName); + queryWrapper.orderByDesc(OSSFile::getCreateTime); + List ossFileList = iossFileService.list(queryWrapper); + if (CollectionUtils.isEmpty(ossFileList)) { + throw new JeroBootException("当前文件未找到，请重新选择！"); + } + OSSFile ossFile = ossFileList.get(0); String readFilePath = ossFile.getUrl(); if (StringUtils.isEmpty(readFilePath)) { throw new JeroBootException("当前文件未找到，请重新选择！"); @@ -1427,12 +1470,19 @@ public class FileSpiltService { try { //获取文件地址 String connectId = sarFileSplitInfoEO.getConnectId(); - if (StringUtils.isEmpty(connectId)) { + String fileName = sarFileSplitInfoEO.getFileName(); + if (StringUtils.isEmpty(connectId) || StringUtils.isEmpty(fileName)) { throw new JeroBootException("当前文件未找到，请重新选择！"); } LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); queryWrapper.eq(OSSFile::getConnectId, connectId); - OSSFile ossFile = iossFileService.getOne(queryWrapper); + queryWrapper.eq(OSSFile::getFileName, fileName); + queryWrapper.orderByDesc(OSSFile::getCreateTime); + List ossFileList = iossFileService.list(queryWrapper); + if (CollectionUtils.isEmpty(ossFileList)) { + throw new JeroBootException("当前文件未找到，请重新选择！"); + } + OSSFile ossFile = ossFileList.get(0); String readFilePath = ossFile.getUrl(); if (StringUtils.isEmpty(readFilePath)) { throw new JeroBootException("当前文件未找到，请重新选择！"); From a5a667b1bcb1ee84427dc34e11b722524a9ba58e Mon Sep 17 00:00:00 2001 From: wangchengjun <616865598@qq.com> Date: Thu, 26 May 2022 22:27:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=8B=86=E5=88=86?= =?UTF-8?q?=E9=92=9Flinux=E7=B3=BB=E7=BB=9F=E5=92=8Cwindows=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E4=B8=8D=E5=85=BC=E5=AE=B9=E9=97=AE=E9=A2=98=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E5=85=B6=E4=BB=96=E6=8A=A5=E9=94=99=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/service/impl/SyncDataServiceImpl.java | 4 ++-- .../split/service/impl/FileSpiltService.java | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java index 16d89736f..570c34db2 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java @@ -88,7 +88,7 @@ public class SyncDataServiceImpl implements ISyncDataService{ }else{ sysDepart.setParentCode(ppo.getParent_path()); } - sysDepart.setDepartOrder(Integer.valueOf(ppo.getId())); + sysDepart.setDepartOrder(ppo.getId()); // LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // sysDepart.setCreateBy(sysUser.getRealname()); @@ -119,7 +119,7 @@ public class SyncDataServiceImpl implements ISyncDataService{ sysDepart.setOrgCode(root.getCode()); String parentCode = root.getParent_path().substring(root.getParent_path().lastIndexOf("/")); sysDepart.setParentCode(parentCode); - sysDepart.setDepartOrder(i); + sysDepart.setDepartOrder(String.valueOf(i)); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); sysDepart.setCreateBy(sysUser.getRealname()); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java index 4589cf08d..149065bb2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java @@ -433,7 +433,17 @@ public class FileSpiltService { if (StringUtils.isEmpty(readPdf)) { throw new JeroBootException("未读取到文件内容，请检查后重试！"); } - String[] pdfArrays = readPdf.split("\r\n"); + String[] pdfArrays; + + String os = System.getProperty("os.name"); + //Windows操作系统 + if (os != null && os.toLowerCase().startsWith("windows")) { + pdfArrays = readPdf.split("\r\n"); + } else if (os != null && os.toLowerCase().startsWith("linux")) {//Linux操作系统 + pdfArrays = readPdf.split("\n"); + } else { //其它操作系统 + pdfArrays = readPdf.split("\n"); + } // Pattern ptest ; // Matcher matcher; @@ -487,7 +497,6 @@ public class FileSpiltService { // ptest = Pattern.compile("^[\\d.]*$"); boolean hasGoIf = false; for (int i = 0; i < nowStart.size(); i++) { - System.out.println(nowStart.get(i)); if (paragraphString.startsWith(nowStart.get(i))) { // 判断名称，如果大于10位，取十位， // String itemName = paragraphString.substring(nowStart.get(i).length()).length()>10?paragraphString.substring(nowStart.get(i).length(),nowStart.get(i).length()+10):paragraphString.substring(nowStart.get(i).length()); @@ -540,6 +549,7 @@ public class FileSpiltService { } } catch (JeroBootException e) { + e.printStackTrace(); throw new JeroBootException(e.getMessage()); } catch (Exception e) { e.printStackTrace();