档案模块也需要，转移到公共

blade-service/blade-manager/src/main/java/org/springblade/manager/utils/ForestNodeManagerEx.java → blade-common/src/main/java/org/springblade/common/utils/ForestNodeManagerEx.java

@@ -1,4 +1,4 @@
-package org.springblade.manager.utils;
+package org.springblade.common.utils;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;

blade-service/blade-manager/src/main/java/org/springblade/manager/utils/ForestNodeMergerEx.java → blade-common/src/main/java/org/springblade/common/utils/ForestNodeMergerEx.java

@@ -1,9 +1,6 @@
-package org.springblade.manager.utils;
+package org.springblade.common.utils;
+
 
-import org.springblade.common.utils.SnowFlakeUtil;
-import org.springblade.core.tool.node.INode;
-import org.springblade.common.utils.INodeEx;
-import org.springblade.manager.vo.ArchiveTreeContractVO2;
 import org.springframework.beans.BeanUtils;
 
 import java.lang.reflect.Field;

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ArTreeContractInitServiceImpl.java

@@ -1,23 +1,18 @@
 package org.springblade.manager.service.impl;
 
-import com.alibaba.druid.sql.dialect.blink.parser.BlinkCreateTableParser;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.mixsmart.utils.StringUtils;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import org.springblade.archive.entity.ArchivesAuto;
 import org.springblade.archive.feign.ArchiveAutoClient;
 import org.springblade.common.utils.SnowFlakeUtil;
 import org.springblade.core.secure.utils.AuthUtil;
-import org.springblade.core.tool.utils.Func;
 import org.springblade.manager.entity.*;
 import org.springblade.manager.feign.ProjectClient;
 import org.springblade.manager.mapper.ArchiveTreeContractMapper;
 import org.springblade.manager.service.IContractInfoService;
 import org.springblade.manager.service.IProjectInfoService;
-import org.springblade.manager.service.IWbsTreeService;
 import org.springblade.manager.utils.ForestNodeMerger;
-import org.springblade.manager.utils.ForestNodeMergerEx;
+import org.springblade.common.utils.ForestNodeMergerEx;
 import org.springblade.manager.vo.*;
 import org.springframework.stereotype.Service;
 

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ArchiveAutoRuleSyncImpl.java

@@ -2,9 +2,7 @@ package org.springblade.manager.service.impl;
 
 
 import lombok.AllArgsConstructor;
-import org.springblade.manager.entity.ArchiveTree;
-import org.springblade.manager.entity.ArchiveTreeContract;
-import org.springblade.manager.utils.ForestNodeMergerEx;
+import org.springblade.common.utils.ForestNodeMergerEx;
 import org.springblade.manager.vo.ArchiveTreeContractVO2;
 import org.springblade.manager.vo.ArchiveTreeVO2;
 import org.springframework.stereotype.Service;

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ArchiveTreeContractServiceImpl.java

@@ -21,18 +21,13 @@ import com.mixsmart.utils.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import lombok.AllArgsConstructor;
-import org.springblade.common.utils.SnowFlakeUtil;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
-import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.node.ForestNodeMerger;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.manager.dto.ArchiveTreeContractAutoRuleMapDTO;
 import org.springblade.manager.dto.ArchiveTreeContractDTO;
-import org.springblade.manager.dto.ArchiveTreeDTO;
-import org.springblade.manager.dto.ArchiveTreeSortDTO;
 import org.springblade.manager.entity.ArchiveTree;
 import org.springblade.manager.entity.ArchiveTreeContract;
 import org.springblade.manager.entity.ContractInfo;
@@ -42,15 +37,13 @@ import org.springblade.manager.service.IArchiveTreeService;
 import org.springblade.manager.service.IContractInfoService;
 import org.springblade.manager.service.IProjectInfoService;
 import org.springblade.manager.utils.DiffListUtil;
-import org.springblade.manager.utils.ForestNodeMergerEx;
+import org.springblade.common.utils.ForestNodeMergerEx;
 import org.springblade.manager.vo.*;
 import org.springblade.manager.mapper.ArchiveTreeContractMapper;
 import org.springblade.manager.service.IArchiveTreeContractService;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.manager.wrapper.ArchiveTreeContractWrapper;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.wildfly.common.archive.Archive;
 
 import java.util.*;
 import java.util.stream.Collectors;

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ArchiveTreeContractSyncImpl.java

@@ -2,12 +2,11 @@ package org.springblade.manager.service.impl;
 
 import lombok.AllArgsConstructor;
 import org.springblade.core.secure.utils.AuthUtil;
-import org.springblade.manager.entity.ArchiveTree;
 import org.springblade.manager.entity.ArchiveTreeContract;
 import org.springblade.manager.entity.ContractInfo;
 import org.springblade.manager.mapper.ArchiveTreeContractMapper;
 import org.springblade.manager.service.IProjectInfoService;
-import org.springblade.manager.utils.ForestNodeMergerEx;
+import org.springblade.common.utils.ForestNodeMergerEx;
 import org.springblade.manager.vo.ArchiveTreeContractVO2;
 import org.springblade.manager.vo.ArchiveTreeVO2;
 import org.springframework.stereotype.Service;

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ArchiveTreeServiceImpl.java

@@ -21,7 +21,7 @@ import org.springblade.manager.service.IWbsTreePrivateService;
 import org.springblade.manager.service.IWbsTreeService;
 import org.springblade.manager.utils.DiffListUtil;
 import org.springblade.manager.utils.ForestNodeMerger;
-import org.springblade.manager.utils.ForestNodeMergerEx;
+import org.springblade.common.utils.ForestNodeMergerEx;
 import org.springblade.manager.vo.*;
 import org.springblade.manager.mapper.ArchiveTreeMapper;
 import org.springblade.manager.service.IArchiveTreeService;