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