From 1d52208d80a745feeb33a0494a241aec25f3f200 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 11 Sep 2024 16:53:57 +0800 Subject: [PATCH 1/3] =?UTF-8?q?update=20=E6=96=87=E6=A1=A3=E6=8B=86?= =?UTF-8?q?=E5=88=86=E5=AF=BC=E5=85=A5=E5=8F=AA=E6=8C=89excel=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E9=A1=BA=E5=BA=8F=E5=AF=BC=E5=85=A5=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E5=BA=8F=E5=8F=B7=20UN,EU=E4=B9=9F=E4=B8=8D?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/FileSplitItemsEOServiceImpl.java | 39 ++++++++++--------- .../src/main/resources/application-dev.yml | 4 +- 2 files changed, 22 insertions(+), 21 deletions(-) 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 f3baba3b..af60f343 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 @@ -3540,25 +3540,26 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl p = treeNodeList.stream().filter(e -> e.getName().equals(parentName)).collect(Collectors.toList()); - if (CollectionUtil.isNotEmpty(p)) { - //其他节点 - treeNode.setParentId(p.get(0).getId()); - }else{ - //一级节点 - treeNode.setParentId(menuId); - } - }else{ - treeNode.setParentId(menuId); - } - } - else if (StringUtils.isBlank(itemTitle)){ + //if(itemNum.matches(regex)) { + // //父级是 总目录时，不做处理 + // if(itemNum.contains(".")) { + // String parentName = itemNum.substring(0, itemNum.lastIndexOf(".")); + // treeNode.setParentName(parentName); + // + // List p = treeNodeList.stream().filter(e -> e.getName().equals(parentName)).collect(Collectors.toList()); + // if (CollectionUtil.isNotEmpty(p)) { + // //其他节点 + // treeNode.setParentId(p.get(0).getId()); + // }else{ + // //一级节点 + // treeNode.setParentId(menuId); + // } + // }else{ + // treeNode.setParentId(menuId); + // } + //} + //else + if (StringUtils.isBlank(itemTitle)){ treeNode.setParentId(parentId); } else{ diff --git a/laws-single-startup/src/main/resources/application-dev.yml b/laws-single-startup/src/main/resources/application-dev.yml index bb81ea8e..6c01a724 100644 --- a/laws-single-startup/src/main/resources/application-dev.yml +++ b/laws-single-startup/src/main/resources/application-dev.yml @@ -147,7 +147,7 @@ spring: connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000;druid.stat.logSlowSql\=true datasource: master: - url: jdbc:p6spy:mysql://10.10.10.44:3306/laws_chery_dev?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true + url: jdbc:p6spy:mysql://10.10.10.44:3306/laws_chery_dev_init?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true username: root password: hzwlsoft.com driver-class-name: com.p6spy.engine.spy.P6SpyDriver @@ -215,7 +215,7 @@ jero: #公式转换图片url mathToImgUrl: http://localhost:9998/mathToImg # 拆分标准类型 - splitStandardClass: UN,EU + splitStandardClass: path: #文件上传根目录 设置 upload: D://opt//upFiles From a0c7771151554056e72ae725e4dc4d9dde0c7bb5 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 11 Sep 2024 16:57:13 +0800 Subject: [PATCH 2/3] =?UTF-8?q?rollback=20=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=20=E6=8B=86=E5=88=86=E6=A0=87=E5=87=86=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- laws-single-startup/src/main/resources/application-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/laws-single-startup/src/main/resources/application-dev.yml b/laws-single-startup/src/main/resources/application-dev.yml index 6c01a724..b16a18c3 100644 --- a/laws-single-startup/src/main/resources/application-dev.yml +++ b/laws-single-startup/src/main/resources/application-dev.yml @@ -215,7 +215,7 @@ jero: #公式转换图片url mathToImgUrl: http://localhost:9998/mathToImg # 拆分标准类型 - splitStandardClass: + splitStandardClass: UN,EU path: #文件上传根目录 设置 upload: D://opt//upFiles From d163df17ef0b28d86d39bb0097b59b091d85c4e1 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 11 Sep 2024 16:59:56 +0800 Subject: [PATCH 3/3] =?UTF-8?q?update=20=E5=AF=BC=E5=85=A5=E6=8B=86?= =?UTF-8?q?=E5=88=86=E7=BB=93=E6=9E=9C=E6=97=B6=E4=B8=8D=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E5=8C=BA=E5=88=86=E6=AC=A7=E6=A0=87=E5=92=8C=E5=9B=BD=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../split/service/impl/FileSplitItemsEOServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 af60f343..5b982612 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 @@ -1987,11 +1987,11 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl menuAndItemMap = new HashMap<>(); List treeList = new ArrayList<>(); List> itemsEOList = new ArrayList<>(addItemsEOList); - if (splitStandardClass.contains(sarFileSplitInfoEO.getStandardClass())){ - treeList = buildTree2(itemsEOList, treeListDisplay, menuId); - }else { + //if (splitStandardClass.contains(sarFileSplitInfoEO.getStandardClass())){ + // treeList = buildTree2(itemsEOList, treeListDisplay, menuId); + //}else { treeList = buildTree(itemsEOList, treeListDisplay, menuId); - } + //} LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); String userId = sysUser.getId(); for (SarFileSplitMenuTreeNode treeNode : treeList) {