QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 文档拆分导入只按excel中的顺序导入，不判断序号 UN,EU也不需要判断

Browse Source
This commit is contained in:
lijiarao
2024-09-11 16:53:57 +08:00
parent f10fef8bce
commit 1d52208d80
2 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
+20 -19
View File
@@ -3540,25 +3540,26 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
SarFileSplitMenuTreeNode treeNode = new SarFileSplitMenuTreeNode(); SarFileSplitMenuTreeNode treeNode = new SarFileSplitMenuTreeNode();
treeNode.setId(UUIDUtils.randomUUID20()); treeNode.setId(UUIDUtils.randomUUID20());
treeNode.setName(itemNum); treeNode.setName(itemNum);
if(itemNum.matches(regex)) { //if(itemNum.matches(regex)) {
//父级是 总目录时，不做处理 // //父级是 总目录时，不做处理
if(itemNum.contains(".")) { // if(itemNum.contains(".")) {
String parentName = itemNum.substring(0, itemNum.lastIndexOf(".")); // String parentName = itemNum.substring(0, itemNum.lastIndexOf("."));
treeNode.setParentName(parentName); // treeNode.setParentName(parentName);
//
List<SarFileSplitMenuTreeNode> p = treeNodeList.stream().filter(e -> e.getName().equals(parentName)).collect(Collectors.toList()); // List<SarFileSplitMenuTreeNode> p = treeNodeList.stream().filter(e -> e.getName().equals(parentName)).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(p)) { // if (CollectionUtil.isNotEmpty(p)) {
//其他节点 // //其他节点
treeNode.setParentId(p.get(0).getId()); // treeNode.setParentId(p.get(0).getId());
}else{ // }else{
//一级节点 // //一级节点
treeNode.setParentId(menuId); // treeNode.setParentId(menuId);
} // }
}else{ // }else{
treeNode.setParentId(menuId); // treeNode.setParentId(menuId);
} // }
} //}
else if (StringUtils.isBlank(itemTitle)){ //else
if (StringUtils.isBlank(itemTitle)){
treeNode.setParentId(parentId); treeNode.setParentId(parentId);
} }
else{ else{
laws-single-startup/src/main/resources/application-dev.yml
+2 -2
View File
@@ -147,7 +147,7 @@ spring:
connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000;druid.stat.logSlowSql\=true connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000;druid.stat.logSlowSql\=true
datasource: datasource:
master: 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 username: root
password: hzwlsoft.com password: hzwlsoft.com
driver-class-name: com.p6spy.engine.spy.P6SpyDriver driver-class-name: com.p6spy.engine.spy.P6SpyDriver
@@ -215,7 +215,7 @@ jero:
#公式转换图片url #公式转换图片url
mathToImgUrl: http://localhost:9998/mathToImg mathToImgUrl: http://localhost:9998/mathToImg
# 拆分标准类型 # 拆分标准类型
splitStandardClass: UN,EU splitStandardClass:
path: path:
#文件上传根目录 设置 #文件上传根目录 设置
upload: D://opt//upFiles upload: D://opt//upFiles