From 212501db9f04a9c568e8b85350550dcafa6c44fd Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 13 Sep 2024 16:15:47 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=AF=BC=E5=85=A5=E6=8B=86=E5=88=86?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E6=97=B6=E5=A2=9E=E5=8A=A0=E8=AF=86=E5=88=AB?= =?UTF-8?q?=E7=88=B6=E5=AD=90=E5=85=B3=E7=B3=BB=E5=AD=97=E6=AE=B5=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E6=98=AF=E5=90=A6=E6=8C=89=E7=85=A7=E5=BA=8F=E5=8F=B7?= =?UTF-8?q?=E7=88=B6=E5=AD=90=E5=85=B3=E7=B3=BB=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FileSplitItemsEOController.java | 3 +- .../split/entity/SarFileSplitInfoEO.java | 7 ++ .../impl/FileSplitItemsEOServiceImpl.java | 69 ++++++++++++------- 3 files changed, 51 insertions(+), 28 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java b/laws-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java index ad0aa7a5..0cc9758f 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java +++ b/laws-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java @@ -92,9 +92,8 @@ public class FileSplitItemsEOController extends JeroController importSplitResult(@ApiParam("标准拆分条id") String splitFileId, - @ApiParam("国际化") String cut, SarFileSplitInfoEO splitInfoEO) throws IOException { - cut = CutUtils.getCurrentCut(); + String cut = CutUtils.getCurrentCut(); return fileSplitItemsEOService.importSplitResult(splitFileId, cut,splitInfoEO); } diff --git a/laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitInfoEO.java b/laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitInfoEO.java index 7b9bd629..cbe999fa 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitInfoEO.java +++ b/laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitInfoEO.java @@ -8,6 +8,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -156,4 +157,10 @@ public class SarFileSplitInfoEO implements Serializable { @ApiModelProperty(value = "标准类别") @TableField(exist = false) private String standardClass; + /** + * 识别父子关系 + */ + @ApiModelProperty(value = "识别父子关系") + @TableField(exist = false) + private String childParentLink; } 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 f7a2b88b..66d02c5c 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 @@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.api.vo.Result; import com.jero.common.api.vo.ResultCommon; +import com.jero.common.constant.CommonConstant; import com.jero.common.constant.enums.IsMustEnum; import com.jero.common.constant.enums.LanguageEnum; import com.jero.common.constant.enums.ModuleEnum; @@ -1990,7 +1991,10 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl buildTree(List> addItemsEOList, Long treeListDisplay, String menuId){ + private List buildTree(List> addItemsEOList, Long treeListDisplay, String menuId, String childParentLink){ //排序 // addItemsEOList.sort(new DirectoryComparator()); @@ -3540,32 +3545,44 @@ 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(CommonConstant.STATUS_1.equals(childParentLink)){ + 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{ - treeNode.setParentId(menuId); - parentId = treeNode.getId(); + treeNode.setParentId(parentId); + } + else{ + treeNode.setParentId(menuId); + parentId = treeNode.getId(); + } + }else { + if (StringUtils.isBlank(itemTitle)){ + treeNode.setParentId(parentId); + } + else{ + treeNode.setParentId(menuId); + parentId = treeNode.getId(); + } } + + ++treeListDisplay; treeNode.setOrderNum(treeListDisplay); treeNode.setItemName(itemTitle);