update 导入拆分结果时增加识别父子关系字段判断是否按照序号父子关系排序

laws-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java

@@ -92,9 +92,8 @@ public class FileSplitItemsEOController extends JeroController<SarFileSplitItems
     @PostMapping(value = "/importSplitResult")
     @RequiresPermissions("split:sarFileSplitInfo:splitResult")
     public Result<?> 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);
     }
 

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;
 }

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<FileSplitItemsEOMap
             //if (splitStandardClass.contains(sarFileSplitInfoEO.getStandardClass())){
             //    treeList = buildTree2(itemsEOList, treeListDisplay, menuId);
             //}else {
-                treeList = buildTree(itemsEOList, treeListDisplay, menuId);
+            //识别父子关系
+            String childParentLink = sarFileSplitInfoEO.getChildParentLink();
+
+            treeList = buildTree(itemsEOList, treeListDisplay, menuId, childParentLink);
             //}
             LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
             String userId = sysUser.getId();
@@ -3524,9 +3528,10 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
      * @param addItemsEOList
      * @param treeListDisplay
      * @param menuId
+     * @param childParentLink
      * @return
      */
-    private List<SarFileSplitMenuTreeNode> buildTree(List<Map<String, Object>> addItemsEOList, Long treeListDisplay, String menuId){
+    private List<SarFileSplitMenuTreeNode> buildTree(List<Map<String, Object>> addItemsEOList, Long treeListDisplay, String menuId, String childParentLink){
         //排序
 //        addItemsEOList.sort(new DirectoryComparator());
 
@@ -3540,25 +3545,26 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
             SarFileSplitMenuTreeNode treeNode = new SarFileSplitMenuTreeNode();
             treeNode.setId(UUIDUtils.randomUUID20());
             treeNode.setName(itemNum);
-            //if(itemNum.matches(regex)) {
+            if(CommonConstant.STATUS_1.equals(childParentLink)){
-            //    //父级是 总目录时，不做处理
+                if(itemNum.matches(regex)) {
-            //    if(itemNum.contains(".")) {
+                    //父级是 总目录时，不做处理
-            //        String parentName = itemNum.substring(0, itemNum.lastIndexOf("."));
+                    if(itemNum.contains(".")) {
-            //        treeNode.setParentName(parentName);
+                        String parentName = itemNum.substring(0, itemNum.lastIndexOf("."));
-            //
+                        treeNode.setParentName(parentName);
-            //        List<SarFileSplitMenuTreeNode> p = treeNodeList.stream().filter(e -> e.getName().equals(parentName)).collect(Collectors.toList());
+
-            //        if (CollectionUtil.isNotEmpty(p)) {
+                        List<SarFileSplitMenuTreeNode> 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(p.get(0).getId());
-            //            //一级节点
+                        }else{
-            //            treeNode.setParentId(menuId);
+                            //一级节点
-            //        }
+                            treeNode.setParentId(menuId);
-            //    }else{
+                        }
-            //        treeNode.setParentId(menuId);
+                    }else{
-            //    }
+                        treeNode.setParentId(menuId);
-            //}
+                    }
-            //else
+                }
+                else
                 if (StringUtils.isBlank(itemTitle)){
                     treeNode.setParentId(parentId);
                 }
@@ -3566,6 +3572,17 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                     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);