Merge branch 'dev' of http://219.151.181.73:3000/zhuwei/bladex into lihb

blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/entity/TaskSplit.java

@@ -69,5 +69,6 @@ public class TaskSplit extends BaseEntity {
 	@ApiModelProperty("完成数量")
 		private Integer finished;
 
-
+	@ApiModelProperty("分解任务名称")
+	private String taskName;
 }

blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/vo/ArchiveDataVo.java

@@ -0,0 +1,58 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.archive.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 任务审核主表视图实体类
+ *
+ * @author BladeX
+ * @since 2022-07-01
+ */
+@Data
+public class ArchiveDataVo {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("节点Id")
+    private String nodeId;
+
+    @ApiModelProperty("文件编号")
+    private String filenNo;
+
+    @ApiModelProperty("文件名称")
+    private String fileNmae;
+
+    @ApiModelProperty("文件路径")
+    private String fileUrl;
+
+    @ApiModelProperty("文件日期")
+    private String fileDate;
+
+    @ApiModelProperty("责任者")
+    private String responsibility;
+
+    @ApiModelProperty("文件来源")
+    private String fileSible;
+
+    @ApiModelProperty("合同段Id")
+    private String contractId;
+
+    @ApiModelProperty("1:签名文件 2:附件")
+    private String sendType;
+}

blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/vo/ArchivesAutoVO.java

@@ -80,6 +80,8 @@ public class ArchivesAutoVO extends ArchivesAuto {
 	 */
 	private List<String> queryList;
 
+    private Integer queryValueSize;
+
 	/**
 	 * 节点查询条件
 	 */

blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/vo/TaskSplitVO.java

@@ -1,24 +1,8 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.archive.vo;
 
-import org.springblade.archive.entity.TaskSplit;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springblade.archive.entity.TaskSplit;
 
 /**
  * 解析主标任务视图实体类

blade-service-api/blade-business-api/src/main/java/org/springblade/business/feign/ArchiveFileClient.java

@@ -161,4 +161,7 @@ public interface ArchiveFileClient {
 
     @PostMapping(API_PREFIX + "/updateFilesEx")
     void updateArchiveFileEx(@RequestBody List<ArchiveFile> files);
+
+    @PostMapping(API_PREFIX + "/saveArchiveFileByBIM")
+    void saveArchiveFileByBIM(@RequestBody ArchiveFile archiveFile);
 }

blade-service-api/blade-business-api/src/main/java/org/springblade/business/feign/MetadataClassificationClient.java

@@ -29,4 +29,7 @@ public interface MetadataClassificationClient {
 
     @PostMapping(API_PREFIX + "/getMetadataClassification")
     List<MetadataClassification> getMetadataClassification();
+
+    @PostMapping(API_PREFIX + "/createMetadataFiles")
+    boolean createMetadataFiles(@RequestBody List<Long> fileId);
 }

blade-service-api/blade-business-api/src/main/java/org/springblade/business/vo/FixedFlowVO.java

@@ -55,6 +55,9 @@ public class FixedFlowVO extends FixedFlow {
     @ApiModelProperty("提示信息")
     private String tips;
 
+    @ApiModelProperty("是否删除")
+    private boolean deletedIs;
+
     private Query query;
 
     public Query getQuery(Integer current, Integer size) {

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/ArchiveTreeContractDTO.java

@@ -39,4 +39,5 @@ public class ArchiveTreeContractDTO extends ArchiveTreeContract {
     private String nodeName;
     private String updateUserName;
     private String updateUserTime;
+    private Integer isSaveChild;
 }

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/ArchiveTreeContract.java

@@ -159,6 +159,12 @@ public class ArchiveTreeContract extends BaseEntity {
      */
     private Long extKeyId;
 
+    /**
+     *
+     * １单位工程２分部工程 ３子分部工程　４分项工程５子分项工程 ６工序
+     */
+    private Integer extNodeType;
+
     /**
      * 自动立卷类型 1最高 2分类并卷 3单独组卷   说明：1规则下可以有2或3；2和3两种规则互斥,2下不能有3,3下不能有2；
      */

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/feign/ArchiveTreeContractClient.java

@@ -78,4 +78,5 @@ public interface ArchiveTreeContractClient {
 
     @PostMapping(API_PREFIX+"/adsArchiveTreeContract")
     public void addArchiveTreeContract(@RequestBody List<ArchiveTreeContract> archiveTreeContracts,@RequestParam Long rootId);
+
 }

blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/vo/InformationQueryBIMVO.java

@@ -0,0 +1,28 @@
+package org.springblade.system.user.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+@Data
+@TableName("u_information_query")
+public class InformationQueryBIMVO {
+
+    @TableField("id")
+    private String id;
+    @TableField("父级id")
+    private String parentId;
+
+    @TableField("名称")
+    private String name;
+
+    @JsonProperty("eVisaPdfUrl")
+    private String fileUrlPath;
+
+    @TableField("nodeType 1节点 2文件")
+    private String nodeType;
+
+    @TableField("文件状态 0未上报，1待审批，2已审批，3已废除")
+    private String status;
+}

blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchiveFileAutoController.java

@@ -341,7 +341,7 @@ ArchiveFileAutoController extends BladeController {
         List<ArchiveFile> result = this.archiveFileClient.getArchiveFileByArchivesId(ids, "");
         List<String> pdfUrls = result.stream().map(archiveFile -> StringUtils.isNotEmpty(archiveFile.getPdfFileUrl()) ? archiveFile.getPdfFileUrl() : archiveFile.getFileUrl()).distinct().collect(Collectors.toList());
 
-//        FileUtils.mergePdfPublicMethods(pdfUrls,"");
+        //FileUtils.mergePdfPublicMethods(pdfUrls,"");
         /**
          * 案卷的只有一个文件，不合并先，需要的时候在把合并方法放出来
          * **/

blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchiveFileController.java

@@ -12,6 +12,7 @@ import lombok.SneakyThrows;
 import org.apache.commons.lang.StringUtils;
 import org.springblade.archive.service.IArchivesAutoService;
 import org.springblade.archive.utils.FileUtils;
+import org.springblade.archive.vo.ArchiveDataVo;
 import org.springblade.business.entity.ArchiveFile;
 import org.springblade.business.feign.ArchiveFileClient;
 import org.springblade.business.feign.MetadataClassificationClient;
@@ -435,4 +436,16 @@ public class ArchiveFileController extends BladeController {
         }
         return R.data(true);
     }
+
+
+    /**
+     * 智慧工地推送文件至电子档案数据规则 接口
+     */
+    @PostMapping("/sendFileToEArchives")
+    @ApiOperationSupport(order = 18)
+    @ApiOperation(value = "智慧工地推送文件至电子档案数据规则接口")
+    public R<Boolean> sendFileToEArchives(@RequestBody ArchiveDataVo vo) {
+        //数据入库
+        return  autoService.sendFileToEArchives(vo);
+    }
 }

blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchivesAutoController.java

@@ -152,6 +152,8 @@ public class ArchivesAutoController extends BladeController {
 		return R.data(pages);
 	}
 
+
+
 	/**
 	 * 档案利用-档案查询
 	 */

blade-service/blade-archive/src/main/java/org/springblade/archive/controller/TaskSplitController.java

@@ -22,6 +22,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
+import org.springblade.archive.vo.TaskSplitVO;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
@@ -30,7 +31,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.archive.entity.TaskSplit;
-import org.springblade.archive.vo.TaskSplitVO;
 import org.springblade.archive.service.ITaskSplitService;
 import org.springblade.core.boot.ctrl.BladeController;
 

blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/ArchivesAutoMapper.java

@@ -224,4 +224,6 @@ public interface ArchivesAutoMapper extends BaseMapper<ArchivesAuto> {
 	 * @return
 	 */
 	Map<String, BigDecimal> getAllArchiveByContractTypeSummary(@Param("projectId") Long projectId,@Param("type") String typ);
+
+	String getArchiveFileByParentId(@Param("nodeId") String nodeId,@Param("contractId") String contractId);
 }

blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/ArchivesAutoMapper.xml

@@ -285,6 +285,22 @@
                 #{nodeId}
             </foreach>
         </if>
+        <if test="vo.queryValueSize != null and vo.queryValueSize != ''">
+            <choose>
+                <when test="vo.queryValueSize == 1">
+                    and CHAR_LENGTH(u.name) <![CDATA[ < ]]> 80
+                </when>
+                <when test="vo.queryValueSize == 2">
+                    and CHAR_LENGTH(u.name) >= 80 and CHAR_LENGTH(u.name) <![CDATA[ < ]]> 120
+                </when>
+                <when test="vo.queryValueSize == 3">
+                    and CHAR_LENGTH(u.name) >= 120 and CHAR_LENGTH(u.name) <![CDATA[ < ]]> 150
+                </when>
+                <when test="vo.queryValueSize == 4">
+                    and CHAR_LENGTH(u.name) >= 150
+                </when>
+            </choose>
+        </if>
         order by m.tree_sort,u.auto_file_sort is null ,u.auto_file_sort,u.file_number is null,
         SUBSTRING_INDEX(u.file_number, '_', 1), SUBSTRING_INDEX(u.file_number, '_', -1) + 0 ,u.create_time asc
         limit #{current}, #{size}
@@ -1396,5 +1412,9 @@
         )a
     </select>
 
+    <select id="getArchiveFileByParentId" resultType="java.lang.String">
+        SELECT b.id from m_archive_tree a ,m_archive_tree_contract b where a.id=b.from_id and a.id=#{nodeId} and contract_id=#{contractId} and a.is_deleted=0 and b.is_deleted=0
+    </select>
+
 
 </mapper>

blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/TaskSplitMapper.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.archive.mapper;
 
+import org.apache.ibatis.annotations.Param;
 import org.springblade.archive.entity.TaskSplit;
 import org.springblade.archive.vo.TaskSplitVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -37,7 +38,11 @@ public interface TaskSplitMapper extends BaseMapper<TaskSplit> {
 	 * @param taskSplit
 	 * @return
 	 */
-	List<TaskSplitVO> selectTaskSplitPage(IPage page, TaskSplitVO taskSplit);
+	List<TaskSplitVO> selectTaskSplitPage(IPage page,@Param("taskSplit") TaskSplitVO taskSplit);
 
+	//获取合同段下 整个文件数
 	Integer getArchiveCount(String contractId);
+
+	// 获取分解任务是否存在
+	Integer getSpliteTaskCount(String contractId);
 }

blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/TaskSplitMapper.xml

@@ -18,15 +18,20 @@
         <result column="type" property="type"/>
         <result column="tool_count" property="toolCount"/>
         <result column="finished" property="finished"/>
+        <result column="task_name" property="taskName"/>
     </resultMap>
 
 
     <select id="selectTaskSplitPage" resultMap="taskSplitResultMap">
-        select * from u_task_split where is_deleted = 0
+        select * from u_task_split where is_deleted = 0 and contract_id = #{taskSplit.contractId}
     </select>
 
     <select id="getArchiveCount" resultType="java.lang.Integer">
         select count(1) from u_archives_auto where contract_id = #{contractId}
     </select>
 
+    <select id="getSpliteTaskCount" resultType="java.lang.Integer">
+        select count(1) from u_task_split where contract_id = #{contractId} and type=2
+    </select>
+
 </mapper>

blade-service/blade-archive/src/main/java/org/springblade/archive/service/IArchiveNameService.java

@@ -0,0 +1,65 @@
+package org.springblade.archive.service;
+
+import org.springblade.manager.entity.ArchiveTreeContract;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+public interface IArchiveNameService {
+
+    /* 节点层级结构（通用静态类）
+     */
+    public class NodeHierarchy {
+        private final Map<Long, List<ArchiveTreeContract>> hierarchyMap;
+        private final Map<Long, ArchiveTreeContract> allNodeMap;
+        private final Map<Long, List<ArchiveTreeContract>> childrenMap; // 新增：父节点到子节点映射
+        private final Map<Long, Integer> totalChildrenCountMap; // 新增：每个父节点的子节点总数
+
+        public NodeHierarchy(
+                Map<Long, List<ArchiveTreeContract>> hierarchyMap,
+                Map<Long, ArchiveTreeContract> allNodeMap,
+                Map<Long, List<ArchiveTreeContract>> childrenMap,
+                Map<Long, Integer> totalChildrenCountMap
+        ) {
+            this.hierarchyMap = hierarchyMap;
+            this.allNodeMap = allNodeMap;
+            this.childrenMap = childrenMap;
+            this.totalChildrenCountMap = totalChildrenCountMap;
+        }
+
+        // 获取某个节点的所有直接子节点
+        public List<ArchiveTreeContract> getChildren(Long parentId) {
+            return childrenMap.getOrDefault(parentId, Collections.emptyList());
+        }
+
+        // 获取某个父节点的子节点总数
+        public int getTotalChildrenCount(Long parentId) {
+            return totalChildrenCountMap.getOrDefault(parentId, 0);
+        }
+
+        // 原始 getters...
+        public Map<Long, List<ArchiveTreeContract>> getHierarchyMap() {
+            return hierarchyMap;
+        }
+
+        public Map<Long, ArchiveTreeContract> getAllNodeMap() {
+            return allNodeMap;
+        }
+    }
+
+    /* 构建节点层级结构映射
+     */
+    NodeHierarchy buildNodeHierarchy(List<ArchiveTreeContract> nodeList);
+
+    /* 获取节点的层级名称
+     */
+    String getLevelName(NodeHierarchy hierarchy, Long nodeId);
+
+    /* 生成完整的层级名称
+     */
+    String generateFullLevelName(
+            List<Long> nodeList,
+            NodeHierarchy hierarchy
+    );
+}

blade-service/blade-archive/src/main/java/org/springblade/archive/service/IArchivesAutoService.java

@@ -154,4 +154,6 @@ public interface IArchivesAutoService extends BaseService<ArchivesAuto> {
 	List<List<Map<String, List<CabinetVO>>>> getUnitAllCabinet(Long projectId, Integer type);
 
     List<JiLinArchiveAutoDto> getArchiveAutoDtoList(Long projId, List<JiLinQueryDto>dtos);
+
+	R sendFileToEArchives(ArchiveDataVo dataInfo);
 }

blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchiveAutoPdfServiceImpl.java

@@ -738,6 +738,8 @@ public class ArchiveAutoPdfServiceImpl implements IArchiveAutoPdfService {
                 }
             }
 
+            file.setFileTime(FileUtils.cleanFileTime(file.getFileTime()));
+
             Map<String, Object> fileMap = new ObjectMapper().convertValue(file, Map.class);
             fileMapList.add(fileMap);
         }

blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchiveNameServiceImpl.java

@@ -0,0 +1,287 @@
+package org.springblade.archive.service.impl;
+
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.archive.service.IArchiveNameService;
+import org.springblade.manager.entity.ArchiveTreeContract;
+import org.springblade.manager.feign.ArchiveTreeContractClient;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Service
+@AllArgsConstructor
+public class ArchiveNameServiceImpl implements IArchiveNameService {
+
+    private final ArchiveTreeContractClient archiveTreeContractClient;
+
+
+    @Override
+    public NodeHierarchy buildNodeHierarchy(List<ArchiveTreeContract> nodeList) {
+        if (nodeList == null || nodeList.isEmpty()) {
+            return new NodeHierarchy(
+                    Collections.emptyMap(),
+                    Collections.emptyMap(),
+                    Collections.emptyMap(),
+                    Collections.emptyMap()
+            );
+        }
+
+        // 1. 创建数据结构容器
+        Map<Long, List<ArchiveTreeContract>> hierarchyMap = new HashMap<>();
+        Map<Long, ArchiveTreeContract> allNodeMap = new HashMap<>();
+        Map<Long, List<ArchiveTreeContract>> childrenMap = new HashMap<>();
+        Map<Long, Integer> totalChildrenCountMap = new HashMap<>();
+
+        // 2. 处理当前节点并加入映射
+        Map<Long, ArchiveTreeContract> tempNodeMap = new HashMap<>();
+        for (ArchiveTreeContract node : nodeList) {
+            Long nodeId = node.getId();
+            tempNodeMap.put(nodeId, node);
+            allNodeMap.put(nodeId, node);
+            childrenMap.putIfAbsent(nodeId, new ArrayList<>());
+        }
+
+        // 3. 收集缺失的祖先节点ID
+        Set<Long> missingAncestorIds = new HashSet<>();
+        for (ArchiveTreeContract node : nodeList) {
+            String ancestors = node.getAncestors();
+            if (ancestors == null || ancestors.isEmpty()) continue;
+
+            Arrays.stream(ancestors.split(","))
+                    .map(String::trim)
+                    .filter(id -> !id.isEmpty())
+                    .map(Long::parseLong)
+                    .filter(ancestorId -> !tempNodeMap.containsKey(ancestorId))
+                    .forEach(missingAncestorIds::add);
+        }
+
+        // 4. 批量获取缺失的祖先节点
+        List<ArchiveTreeContract> missingAncestors = Collections.emptyList();
+        if (!missingAncestorIds.isEmpty()) {
+            String ancestorIdsStr = missingAncestorIds.stream()
+                    .map(String::valueOf)
+                    .collect(Collectors.joining(","));
+
+            missingAncestors = archiveTreeContractClient
+                    .getArchiveTreeContractListByIds(ancestorIdsStr);
+
+            for (ArchiveTreeContract ancestor : missingAncestors) {
+                Long ancestorId = ancestor.getId();
+                tempNodeMap.put(ancestorId, ancestor);
+                allNodeMap.put(ancestorId, ancestor);
+                childrenMap.putIfAbsent(ancestorId, new ArrayList<>());
+            }
+
+            log.debug("成功获取 {} 个祖先节点", missingAncestors.size());
+        }
+
+        // 5. 合并所有节点
+        List<ArchiveTreeContract> allNodes = new ArrayList<>(nodeList);
+        allNodes.addAll(missingAncestors);
+
+        // 6. 为每个节点构建完整的层级路径
+        for (ArchiveTreeContract node : allNodes) {
+            Long nodeId = node.getId();
+            List<ArchiveTreeContract> hierarchyList = new ArrayList<>();
+
+            // 处理祖先路径
+            String ancestors = node.getAncestors();
+            if (ancestors != null && !ancestors.isEmpty()) {
+                String[] pathIds = ancestors.split(",");
+                for (String idStr : pathIds) {
+                    idStr = idStr.trim();
+                    if (!idStr.isEmpty()) {
+                        Long id = Long.parseLong(idStr);
+                        ArchiveTreeContract ancestor = tempNodeMap.get(id);
+                        if (ancestor != null) {
+                            hierarchyList.add(ancestor);
+                        }
+                    }
+                }
+            }
+
+            // 添加当前节点到路径末端
+            hierarchyList.add(node);
+
+            // 存入层级映射
+            hierarchyMap.put(nodeId, hierarchyList);
+
+            // 构建父子关系映射
+            Long parentId = node.getParentId();
+            if (parentId != null) {
+                childrenMap.computeIfAbsent(parentId, k -> new ArrayList<>()).add(node);
+            }
+        }
+
+        // 7. 填充总子节点计数
+        for (Map.Entry<Long, List<ArchiveTreeContract>> entry : childrenMap.entrySet()) {
+            totalChildrenCountMap.put(entry.getKey(), entry.getValue().size());
+        }
+
+        return new NodeHierarchy(hierarchyMap, allNodeMap, childrenMap, totalChildrenCountMap);
+    }
+
+    @Override
+    public String getLevelName(NodeHierarchy hierarchy, Long nodeId) {
+        Map<Long, ArchiveTreeContract> allNodeMap = hierarchy.getAllNodeMap();
+
+        // 1. 获取目标节点
+        ArchiveTreeContract targetNode = allNodeMap.get(nodeId);
+        if (targetNode == null) {
+            log.warn("无法找到节点 {} 的详细信息", nodeId);
+            return "未知节点";
+        }
+
+        // 2. 获取节点的层级路径
+        Map<Long, List<ArchiveTreeContract>> hierarchyMap = hierarchy.getHierarchyMap();
+        List<ArchiveTreeContract> hierarchyList = hierarchyMap.getOrDefault(
+                nodeId, Collections.emptyList()
+        );
+
+        // 3. 提取关键层级的节点
+        ArchiveTreeContract lastUnitNode = null;
+        ArchiveTreeContract lastDivisionNode = null;
+        ArchiveTreeContract lastItemNode = null;
+
+        for (ArchiveTreeContract node : hierarchyList) {
+            // 获取displayHierarchy值
+            Integer extNodeType = node.getExtNodeType();
+
+            // 处理空值或空白值
+            if (extNodeType == null ) {
+                continue;
+            }
+
+            try {
+                // 尝试转换为
+
+                switch (extNodeType) {
+                    case 1:
+                        lastUnitNode = node;
+                        break;
+                    case 2:
+                    case 3:
+                        lastDivisionNode = node;
+                        break;
+                    case 4:
+                    case 5:
+                        lastItemNode = node;
+                        break;
+                    // 其他情况不处理
+                }
+            } catch (NumberFormatException e) {
+                // 记录格式错误但继续处理其他节点
+                log.warn("节点 {} 的displayHierarchy值 '{}' 无法转换为整数",
+                        node.getNodeName(), extNodeType);
+            }
+        }
+
+        // 4. 构建层级名称
+        StringBuilder nameBuilder = new StringBuilder();
+
+        // 依次添加单位工程、分部工程、分项工程的名称
+        if (lastUnitNode != null) {
+            nameBuilder.append(lastUnitNode.getNodeName());
+        }
+        if (lastDivisionNode != null) {
+            nameBuilder.append(lastDivisionNode.getNodeName());
+        }
+        if (lastItemNode != null) {
+            nameBuilder.append(lastItemNode.getNodeName());
+        }
+
+        // 5. 返回结果（如果没有找到任何层级节点，则返回目标节点名称）
+        return nameBuilder.length() > 0 ?
+                nameBuilder.toString() :
+                targetNode.getNodeName();
+    }
+
+
+    @Override
+    public String generateFullLevelName(
+            List<Long> nodeIds,
+            NodeHierarchy hierarchy
+    ) {
+        // 1. 获取输入节点
+        Map<Long, ArchiveTreeContract> allNodeMap = hierarchy.getAllNodeMap();
+        List<ArchiveTreeContract> nodes = new ArrayList<>();
+
+        for (Long nodeId : nodeIds) {
+            ArchiveTreeContract node = allNodeMap.get(nodeId);
+            if (node != null) {
+                nodes.add(node);
+            }
+        }
+
+        if (nodes.isEmpty()) {
+            return "";
+        }
+
+        // 2. 按父节点分组
+        Map<Long, List<ArchiveTreeContract>> parentGroups = new LinkedHashMap<>();
+
+        for (ArchiveTreeContract node : nodes) {
+            Long parentId = node.getParentId();
+
+            // 如果没有父节点，单独处理
+            if (parentId == null) {
+                parentGroups.put(node.getId(), Collections.singletonList(node));
+            } else {
+                parentGroups.computeIfAbsent(parentId, k -> new ArrayList<>()).add(node);
+            }
+        }
+
+        // 3. 构建结果部分
+        List<String> nameParts = new ArrayList<>();
+
+        for (Map.Entry<Long, List<ArchiveTreeContract>> entry : parentGroups.entrySet()) {
+            Long groupId = entry.getKey();
+            List<ArchiveTreeContract> groupNodes = entry.getValue();
+
+            // 处理没有父节点的情况
+            if (groupId == null) {
+                groupId = groupNodes.get(0).getId();
+            }
+
+            // 获取父节点（组代表）
+            ArchiveTreeContract parent = allNodeMap.get(groupId);
+
+            // 父节点不存在（特殊情况处理）
+            if (parent == null) {
+                // 可能是没有父节点的单独节点
+                for (ArchiveTreeContract node : groupNodes) {
+                    nameParts.add(node.getNodeName());
+                }
+                continue;
+            }
+
+            // 获取父节点层级名称
+            String parentLevelName = getLevelName(hierarchy, parent.getId());
+
+            // 获取该父节点下的所有子节点（在hierarchy中）
+            List<ArchiveTreeContract> allChildren = hierarchy.getChildren(parent.getId());
+
+            // 获取该父节点下的所有子节点数量
+            int totalChildrenCount = hierarchy.getTotalChildrenCount(parent.getId());
+
+            // 判断是否涵盖所有子节点
+            if (groupNodes.size() == totalChildrenCount && !allChildren.isEmpty()) {
+                // 涵盖所有子节点，直接使用父节点层级名称
+                nameParts.add(parentLevelName);
+            } else {
+                // 部分子节点，添加节点名称
+                StringBuilder groupName = new StringBuilder(parentLevelName);
+                for (ArchiveTreeContract node : groupNodes) {
+                    groupName.append(node.getNodeName());
+                }
+                nameParts.add(groupName.toString());
+            }
+        }
+
+        // 4. 拼接最终结果
+        return String.join("、", nameParts);
+    }
+}

blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchivesAutoServiceImpl.java

@@ -76,6 +76,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
@@ -89,6 +90,7 @@ import java.time.LocalDateTime;
 import java.util.*;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 /**
@@ -1258,9 +1260,10 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		}
 		archiveFileClient.updateArchiveFileForCreateArchive(waitArchiveFiles);
 		try {
-			for (ArchiveFile saveVo : waitArchiveFiles) {
-				metadataClassificationClient.createMetadataFile(saveVo.getId(), 0);
-			}
+//			for (ArchiveFile saveVo : waitArchiveFiles) {
+//				metadataClassificationClient.createMetadataFile(saveVo.getId(), 0);
+//			}
+			batchCreateMetadataFiles(waitArchiveFiles);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -1332,9 +1335,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		}
 		archiveFileClient.updateArchiveFileForCreateArchive(waitArchiveFiles);
 		try {
-			for (ArchiveFile saveVo : waitArchiveFiles) {
-				metadataClassificationClient.createMetadataFile(saveVo.getId(), 0);
-			}
+			batchCreateMetadataFiles(waitArchiveFiles);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -1381,9 +1382,10 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		}
 		archiveFileClient.updateArchiveFileForCreateArchive(waitArchiveFiles);
 		try {
-			for (ArchiveFile saveVo : waitArchiveFiles) {
-				metadataClassificationClient.createMetadataFile(saveVo.getId(), 0);
-			}
+//			for (ArchiveFile saveVo : waitArchiveFiles) {
+//				metadataClassificationClient.createMetadataFile(saveVo.getId(), 0);
+//			}
+			batchCreateMetadataFiles(waitArchiveFiles);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -1436,9 +1438,10 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		}
 		archiveFileClient.updateArchiveFileForCreateArchive(waitArchiveFiles);
 		try {
-			for (ArchiveFile saveVo : waitArchiveFiles) {
-				metadataClassificationClient.createMetadataFile(saveVo.getId(), 0);
-			}
+//			for (ArchiveFile saveVo : waitArchiveFiles) {
+//				metadataClassificationClient.createMetadataFile(saveVo.getId(), 0);
+//			}
+			batchCreateMetadataFiles(waitArchiveFiles);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -4059,5 +4062,101 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		process.waitFor();
 	}
 
+	/**
+	 * 批量更新
+	 * @param waitArchiveFiles
+	 */
+	public void batchCreateMetadataFiles(List<ArchiveFile> waitArchiveFiles) {
+		if (CollectionUtils.isEmpty(waitArchiveFiles)) {
+			return;
+		}
+
+		// 提取所有文件ID
+		List<Long> fileIds = waitArchiveFiles.stream()
+				.map(ArchiveFile::getId)
+				.collect(Collectors.toList());
+
+		long startTime = System.currentTimeMillis();
+		log.info("[自动组卷-更新元数据前]{}", "");
+
+		// 直接调用批量创建接口
+		boolean success = metadataClassificationClient.createMetadataFiles(fileIds);
+		long endTime = System.currentTimeMillis();
+
+		log.info("[自动组卷-更新元数据后], 耗时: {} 毫秒", endTime-startTime);
+
+	}
+
+
+	private String formatExecutionTime(long millis) {
+		if (millis < 1000) {
+			return millis + "毫秒";
+		} else if (millis < 60000) {
+			return String.format("%.2f秒", millis / 1000.0);
+		} else {
+			long minutes = TimeUnit.MILLISECONDS.toMinutes(millis);
+			long seconds = TimeUnit.MILLISECONDS.toSeconds(millis) % 60;
+			return minutes + "分钟" + seconds + "秒";
+		}
+	}
+
+
+	@Override
+	public R sendFileToEArchives(ArchiveDataVo dataInfo) {
+
+		if(dataInfo==null || Func.isNull(dataInfo)){
+			return R.fail("请根据接口文档上传参数");
+		}
+
+		String nodeId = dataInfo.getNodeId();
+		String contractId = dataInfo.getContractId();
+		String fileUrl = dataInfo.getFileUrl();
+		String fileName = dataInfo.getFileNmae();
+		if(nodeId==null || Func.isNull(nodeId)){
+			return R.fail("请上传nodeId");
+		}
+		if(contractId==null || Func.isNull(contractId)){
+			R.fail("请上传contractId");
+		}
+		if(fileUrl==null || Func.isNull(fileUrl)){
+			R.fail("请上传fileUrl");
+		}
+
+
+		if(fileName==null || Func.isNull(fileName)){
+			R.fail("请上传fileName");
+		}
+
+		ContractInfo contractInfo = contractClient.getContractById(Func.toLong(contractId));
+		if(contractInfo==null){
+			return R.fail("请传输正确的contractId");
+		}
+		//获取文件的父节点Id
+		String treeContractId = baseMapper.getArchiveFileByParentId(nodeId, contractId);
+		if(treeContractId==null || Func.isNull(treeContractId)){
+			R.fail("请校验传输的nodeId和contractId,没有查到父节点Id");
+		}
+
+
+
+		// 将数据插入到 auto表中
+		ArchivesAuto archivesAuto = new ArchivesAuto();
+		long newPkId = SnowFlakeUtil.getId(); //主键Id
+		archivesAuto.setId(newPkId);
+		archivesAuto.setProjectId(Func.toLong(contractInfo.getPId()));
+		archivesAuto.setContractId(Func.toLong(contractId));
+		archivesAuto.setName(fileName);
+		archivesAuto.setIsDeleted(0);
+		this.save(archivesAuto);
+
+		// 保存文件到archive_file表中
+		long arueId = SnowFlakeUtil.getId(); //主键Id
+		ArchiveFile archiveFile = new ArchiveFile();
+		archiveFile.setId(arueId);
+		archiveFile.setArchiveId(newPkId);
+		archiveFile.setFileName(fileName);
+		archiveFileClient.saveArchiveFileByBIM(archiveFile);
+		return R.success("保存成功");
+	}
 
 }

blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/TaskSplitServiceImpl.java

@@ -24,11 +24,17 @@ import org.springblade.archive.service.ITaskSplitService;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Random;
 
 /**
  * 解析主标任务 服务实现类
@@ -51,6 +57,7 @@ public class TaskSplitServiceImpl extends BaseServiceImpl<TaskSplitMapper, TaskS
 	@Override
 	public R saveTaskSplit(TaskSplit taskSplit) {
 		// 数据校验区
+		Map<String,Object> data = new HashMap<>();
 		String contractId = taskSplit.getContractId();
 		String splitIds = taskSplit.getIds();
 		if (contractId=="" || contractId==null || contractId.length()==0 || Func.isEmpty(contractId)){
@@ -60,19 +67,41 @@ public class TaskSplitServiceImpl extends BaseServiceImpl<TaskSplitMapper, TaskS
 		if (splitIds=="" || splitIds==null || splitIds.length()==0 || Func.isEmpty(splitIds)){ // 代表整个合同解析
 			taskSplit.setType(2);
 			// 查询整个合同段下的所有文件
+			Integer spliteTaskCount =baseMapper.getSpliteTaskCount(contractId);
+			if(spliteTaskCount>=1){
+				return R.fail("该合同已经添加任务，无需重复操作");
+			}
+
+			Random random = new Random();
+			int randomNumber = random.nextInt(11) + 10; // 生成10到20之间的随机数
+			int i = (int) Math.ceil(randomNumber * spliteTaskCount/60.0 );
+
 			Integer archiveCount = baseMapper.getArchiveCount(contractId);
 			taskSplit.setToolCount(archiveCount);
 			taskSplit.setFinished(0);
 
+			taskSplit.setTaskName("整个合同段 "+archiveCount+" 条的分解任务");
+			data.put("fileCount",archiveCount);
+			data.put("taskTime",i);
 		}else{ // 指定文件解析
 			taskSplit.setType(3);
 			String[] split = splitIds.split(",");
 			taskSplit.setToolCount(split.length);
 			taskSplit.setFinished(0);
+
+			Random random = new Random();
+			int randomNumber = random.nextInt(11) + 10; // 生成10到20之间的随机数
+			int i = (int) Math.ceil(randomNumber * split.length/60.0 );
+			data.put("fileCount",split.length);
+			data.put("taskTime",i);
+			LocalDateTime now = LocalDateTime.now();
+			DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd HH:mm:ss");
+			String formattedDateTime = now.format(formatter)+"_"+split.length+"条分解任务";
+			taskSplit.setTaskName(formattedDateTime);
 		}
 
 		int insert = baseMapper.insert(taskSplit);
-		return R.success("dddd");
+		return R.data(200,data,"操作成功");
 	}
 
 }

blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/TraceLogServiceImpl.java

@@ -59,7 +59,7 @@ public class TraceLogServiceImpl extends BaseServiceImpl<TraceLogMapper, TraceLo
             TraceLog traceLog = new TraceLog();
             traceLog.setTraceId(traceId);
             traceLog.setContent(content);
-            save(traceLog);
+            //save(traceLog);
 
         } catch (Exception e) {
             // 异常处理逻辑，比如打印日志

blade-service/blade-archive/src/main/java/org/springblade/archive/utils/FileUtils.java

@@ -832,4 +832,10 @@ public class FileUtils {
         return os.toByteArray();
     }
 
+    public static String cleanFileTime(String fileTime) {
+        if (fileTime == null) return "";
+        String cleaned = fileTime.replace(".", "").replace("-", "");
+        return cleaned.length() > 8 ? cleaned.substring(0, 8) : cleaned;
+    }
+
 }

blade-service/blade-business/src/main/java/org/springblade/business/controller/TrialDetectionController.java

@@ -294,12 +294,12 @@ public class TrialDetectionController extends BladeController {
     @ApiOperationSupport(order = 18)
     @ApiOperation(value = "自检多表PDF预览", notes = "传入nodeId=试验记录id、classify、contractId、projectId")
     public R<Object> getPDFs(String nodeId, String classify, String contractId, String projectId) throws FileNotFoundException {
-        String sql = "select pdf_url,e_visa_pdf_url from u_information_query where project_id ='" + projectId + "' and classify='" + classify + "' and  wbs_id='" + nodeId + "' and contract_id ='" + contractId + "'";
+        String sql = "select pdf_url,e_visa_pdf_url from u_information_query where status in(0,1,2) and project_id ='" + projectId + "' and classify='" + classify + "' and  wbs_id='" + nodeId + "' and contract_id ='" + contractId + "'";
         List<Map<String, Object>> maps = jdbcTemplate.queryForList(sql);
         if (maps.size() >= 1) {
             Map<String, Object> stringObjectMap = maps.get(0);
             Object pdfUrl = stringObjectMap.get("pdf_url");
-            if (stringObjectMap.get("e_visa_pdf_url") != null) {
+            if (stringObjectMap.get("e_visa_pdf_url") != null ) {
                 //优先使用电签的pdf
                 pdfUrl = stringObjectMap.get("e_visa_pdf_url");
             }

blade-service/blade-business/src/main/java/org/springblade/business/feignClient/ArchiveFileClientImpl.java

@@ -341,4 +341,9 @@ public class ArchiveFileClientImpl implements ArchiveFileClient {
         }
     }
 
+    @Override
+    public void saveArchiveFileByBIM(ArchiveFile archiveFile) {
+        iArchiveFileService.save(archiveFile);
+    }
+
 }

blade-service/blade-business/src/main/java/org/springblade/business/feignClient/MetadataClassificationClientImpl.java

@@ -5,6 +5,7 @@ import org.springblade.business.entity.MetadataClassification;
 import org.springblade.business.feign.MetadataClassificationClient;
 import org.springblade.business.service.IMetadataClassificationService;
 import org.springblade.business.vo.MetadataClassificationVO;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
@@ -36,4 +37,9 @@ public class MetadataClassificationClientImpl implements MetadataClassificationC
     public List<MetadataClassification> getMetadataClassification() {
         return iMetadataClassificationService.getMetadataClassification();
     }
+
+    @Override
+    public boolean createMetadataFiles(List<Long> fileIds){
+        return iMetadataClassificationService.createMetadataFiles(fileIds, 0);
+    }
 }

blade-service/blade-business/src/main/java/org/springblade/business/mapper/ArchiveFileMapper.xml

@@ -160,6 +160,10 @@
         <if test="vo.rectification != null and vo.rectification != ''">
             and u.rectification = #{vo.rectification}
         </if>
+        <if test="vo.sourceType != null and vo.sourceType != ''">
+            and u.source_type = #{sourceType}
+        </if>
+
         <if test="vo.rectification == null and vo.archiveId == null">
             and (u.is_auto_file is null or u.is_auto_file != 1)
         </if>

blade-service/blade-business/src/main/java/org/springblade/business/mapper/FixedFlowLinkMapper.java

@@ -36,4 +36,5 @@ public interface FixedFlowLinkMapper extends BaseMapper<FixedFlowLink> {
 
     List<FixedFlowLink> selectFixedFlowLink(@Param("fixedFlowId") String fixedFlowId);
 
+    Integer selectIsDeleted(@Param("fixedFlowId") Long fixedFlowId);
 }

blade-service/blade-business/src/main/java/org/springblade/business/mapper/FixedFlowLinkMapper.xml

@@ -37,5 +37,8 @@
           and fixed_flow_id = #{fixedFlowId}
         order by fixed_flow_link_sort ASC
     </select>
+    <select id="selectIsDeleted" resultType="java.lang.Integer">
+        SELECT COUNT(*) FROM u_task WHERE fixed_flow_id = #{fixedFlowId} AND is_deleted = 0 And status !=3
+    </select>
 
 </mapper>

blade-service/blade-business/src/main/java/org/springblade/business/mapper/MetadataClassificationMapper.java

@@ -29,4 +29,5 @@ public interface MetadataClassificationMapper extends BaseMapper<MetadataClassif
 
 
     List<HashMap<String, Object>> getMetadaFileByFileId(@Param("fileId") Long fileId);
+    List<HashMap<String, Object>> getMetadaFileByFileIds(@Param("fileIds") List<Long> fileIds);
 }

blade-service/blade-business/src/main/java/org/springblade/business/mapper/MetadataClassificationMapper.xml

@@ -95,4 +95,13 @@
         where file_id = #{fileId}
         order by create_time desc limit 1
     </select>
+    <select id="getMetadaFileByFileIds" resultType="java.util.Map">
+        SELECT *
+        FROM u_metadata_file
+        WHERE  is_deleted=0 and file_id IN
+        <foreach collection="fileIds" item="fileId" open="(" close=")" separator=",">
+            #{fileId}
+        </foreach>
+        ORDER BY file_id, create_time DESC
+    </select>
 </mapper>

blade-service/blade-business/src/main/java/org/springblade/business/service/IFixedFlowLinkService.java

@@ -35,4 +35,5 @@ public interface IFixedFlowLinkService extends BaseService<FixedFlowLink> {
 
     List<FixedFlowLink> selectFixedFlowLink(String fixedFlowId);
 
+    Integer selectIsDeleted(Long fixedFlowId);
 }

blade-service/blade-business/src/main/java/org/springblade/business/service/IMetadataClassificationService.java

@@ -26,4 +26,6 @@ public interface IMetadataClassificationService extends BaseService<MetadataClas
     boolean updateMetadata(MetadataClassificationVO vo);
 
     List<MetadataClassification> getMetadataClassification();
+
+    boolean createMetadataFiles(List<Long> fileIds, Integer type);
 }

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/FixedFlowLinkServiceImpl.java

@@ -46,4 +46,9 @@ public class FixedFlowLinkServiceImpl extends BaseServiceImpl<FixedFlowLinkMappe
         return this.baseMapper.selectFixedFlowLink(fixedFlowId);
     }
 
+    @Override
+    public Integer selectIsDeleted(Long fixedFlowId) {
+        return this.baseMapper.selectIsDeleted(fixedFlowId);
+    }
+
 }

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/FixedFlowServiceImpl.java

@@ -64,6 +64,12 @@ public class FixedFlowServiceImpl extends BaseServiceImpl<FixedFlowMapper, Fixed
                 vos.setLinkUserJoinString(linkJoin.substring(1));
                 vos.setFixedFlowLinkList(links);
             }
+             Integer size=this.fixedFlowLinkService.selectIsDeleted(vos.getId());
+            if(size>0){
+                vos.setDeletedIs(false);
+            }else {
+                vos.setDeletedIs(true);
+            }
         });
         //设置总数
         iPage.setTotal(count);

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/MetadataClassificationServiceImpl.java

@@ -1,6 +1,8 @@
 package org.springblade.business.service.impl;
 
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
@@ -37,7 +39,9 @@ import org.springframework.dao.DataAccessException;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 
+import java.sql.Statement;
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 @Service
@@ -581,4 +585,591 @@ public class MetadataClassificationServiceImpl
         List<MetadataClassification> metadataClassifications = baseMapper.selectList(metadata);
         return metadataClassifications ;
     }
+
+    /**
+     *  批量操作
+     * @param fileIds
+     * @param type
+     * @return
+     */
+
+    public boolean createMetadataFiles(List<Long> fileIds, Integer type) {
+        if (fileIds == null || fileIds.isEmpty()) return true;
+
+        try {
+            BladeUser user = AuthUtil.getUser();
+            // tenantId 是 String 类型
+            String tenantId = user != null ? String.valueOf(user.getTenantId()) : "-1";
+            Long userId = user != null ? user.getUserId() : -1L;
+            String now = DateUtil.formatDateTime(new Date());
+
+            // 批量获取文件信息
+            List<ArchiveFile> files = iArchiveFileService.listByIds(fileIds);
+            Map<Long, ArchiveFile> fileMap = new HashMap<>();
+            for (ArchiveFile file : files) {
+                fileMap.put(file.getId(), file);
+            }
+
+            // 批量获取元数据文件状态
+            List<HashMap<String, Object>> metadataMapList = baseMapper.getMetadaFileByFileIds(fileIds);
+            Map<Long, Map<String, Object>> metadataFileMap = new HashMap<>();
+            for (HashMap<String, Object> map : metadataMapList) {
+                Long fileId = (Long) map.get("file_id");
+                if (fileId != null) {
+                    metadataFileMap.put(fileId, map);
+                }
+            }
+
+            // 获取元数据字段
+            QueryWrapper<MetadataClassification> metadataWrapper = new QueryWrapper<>();
+            metadataWrapper.lambda().eq(MetadataClassification::getIsDeleted, 0);
+            List<MetadataClassification> metadataClassifications = baseMapper.selectList(metadataWrapper);
+            Map<String, MetadataClassification> mapAll = new HashMap<>();
+            for (MetadataClassification mc : metadataClassifications) {
+                mapAll.put(mc.getContainerName(), mc);
+            }
+
+            // === 优化点1：获取 ArchiveAuto 映射（循环调用）===
+            Map<Long, ArchivesAuto> archiveAutoMap = new HashMap<>();
+            Set<Long> archiveIds = files.stream()
+                    .map(ArchiveFile::getArchiveId)
+                    .filter(Objects::nonNull)
+                    .collect(Collectors.toSet());
+            if (!archiveIds.isEmpty()) {
+                for (Long archiveId : archiveIds) {
+                    try {
+                        ArchivesAuto archivesAuto = archiveAutoClient.saveArchiveAutoById(archiveId);
+                        if (archivesAuto != null) {
+                            archiveAutoMap.put(archiveId, archivesAuto);
+                        }
+                    } catch (Exception e) {
+                    }
+                }
+            }
+
+            // === 优化点2：获取 ContractInfo 映射（循环调用）===
+            Map<String, ContractInfo> contractInfoMap = new HashMap<>();
+            Set<String> contractIds = files.stream()
+                    .map(ArchiveFile::getContractId)
+                    .filter(contractId -> contractId != null && !contractId.isEmpty())
+                    .collect(Collectors.toSet());
+            if (!contractIds.isEmpty()) {
+                for (String contractId : contractIds) {
+                    try {
+                        Long contractIdLong = Long.parseLong(contractId);
+                        ContractInfo contractInfo = contractClient.getContractById(contractIdLong);
+                        if (contractInfo != null) {
+                            contractInfoMap.put(contractId, contractInfo);
+                        }
+                    } catch (Exception e) {
+
+                    }
+                }
+            }
+
+            // === 优化点3：处理所有唯一的 nodeId（循环调用）===
+            // 提取所有不重复的 nodeId
+//            Set<String> uniqueNodeIds = files.stream()
+//                    .map(ArchiveFile::getNodeId)
+//                    .filter(nodeId -> nodeId != null && !nodeId.isEmpty())
+//                    .collect(Collectors.toSet());
+//
+//            Map<String, ArchiveTreeContract> nodeContractMap = new HashMap<>();
+//            Map<String, List<ArchiveTreeContract>> ancestorListMap = new HashMap<>();
+//
+//            // 循环处理每个唯一 nodeId
+//            for (String nodeId : uniqueNodeIds) {
+//                try {
+//                    // 获取当前节点
+//                    ArchiveTreeContract currentNode = archiveTreeContractClient.getArchiveTreeContractById(Long.parseLong(nodeId));
+//                    if (currentNode == null) continue;
+//                    nodeContractMap.put(nodeId, currentNode);
+//
+//                    // 构建祖先层次结构
+//                    String ancestors = currentNode.getAncestors();
+//                    if (ancestors != null && !ancestors.isEmpty()) {
+//                        // 添加当前节点ID
+//                        ancestors = ancestors + "," + currentNode.getId();
+//
+//                        // 获取祖先节点列表
+//                        List<ArchiveTreeContract> ancestorList = archiveTreeContractClient.getArchiveTreeContractListByIds(ancestors);
+//                        ancestorListMap.put(nodeId, ancestorList);
+//                    }
+//                } catch (Exception e) {
+//                }
+//            }
+
+            // === 优化点3：批量获取节点数据并构建祖先映射 ===
+            Set<String> uniqueNodeIds = files.stream()
+                    .map(ArchiveFile::getNodeId)
+                    .filter(nodeId -> nodeId != null && !nodeId.isEmpty())
+                    .collect(Collectors.toSet());
+
+            Map<String, ArchiveTreeContract> nodeContractMap = new HashMap<>();
+            Map<String, List<ArchiveTreeContract>> ancestorListMap = new HashMap<>();
+
+            if (!uniqueNodeIds.isEmpty()) {
+                try {
+                    // 1. 批量获取所有节点
+                    String nodeIdsStr = String.join(",", uniqueNodeIds);
+                    List<ArchiveTreeContract> nodeList = archiveTreeContractClient.getArchiveTreeContractListByIds(nodeIdsStr);
+
+                    // 2. 直接使用nodeList中的节点（避免重复添加当前节点ID）
+                    Map<Long, ArchiveTreeContract> allAncestorsMap = new HashMap<>();
+                    for (ArchiveTreeContract node : nodeList) {
+                        // 所有当前节点直接加入祖先映射
+                        allAncestorsMap.put(node.getId(), node);
+                        nodeContractMap.put(String.valueOf(node.getId()), node);
+                    }
+
+                    // 3. 收集祖先ID（不包括当前节点）
+                    Set<Long> ancestorIdsToFetch = new HashSet<>();
+                    for (ArchiveTreeContract node : nodeList) {
+                        String ancestors = node.getAncestors();
+                        if (ancestors != null && !ancestors.isEmpty()) {
+                            String[] ids = ancestors.split(",");
+                            for (String id : ids) {
+                                if (!id.trim().isEmpty()) {
+                                    long ancestorId = Long.parseLong(id.trim());
+                                    // 仅添加不在当前节点集合中的祖先ID
+                                    if (!allAncestorsMap.containsKey(ancestorId)) {
+                                        ancestorIdsToFetch.add(ancestorId);
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                    // 4. 批量获取缺失的祖先节点
+                    if (!ancestorIdsToFetch.isEmpty()) {
+                        String ancestorIdsStr = ancestorIdsToFetch.stream()
+                                .map(String::valueOf)
+                                .collect(Collectors.joining(","));
+
+                        List<ArchiveTreeContract> missingAncestors =
+                                archiveTreeContractClient.getArchiveTreeContractListByIds(ancestorIdsStr);
+
+                        for (ArchiveTreeContract ancestor : missingAncestors) {
+                            allAncestorsMap.put(ancestor.getId(), ancestor);
+                        }
+                    }
+
+                    // 5. 为每个节点重建祖先列表
+                    for (ArchiveTreeContract node : nodeList) {
+                        String nodeIdStr = String.valueOf(node.getId());
+                        List<ArchiveTreeContract> ancestorList = new ArrayList<>();
+
+                        // 构建完整路径（祖先ID + 当前节点ID）
+                        String ancestors = node.getAncestors();
+                        String fullPath = ancestors != null && !ancestors.isEmpty() ?
+                                ancestors + "," + node.getId() :
+                                String.valueOf(node.getId());
+
+                        // 按顺序构建祖先列表
+                        String[] pathIds = fullPath.split(",");
+                        for (String idStr : pathIds) {
+                            if (!idStr.trim().isEmpty()) {
+                                Long id = Long.parseLong(idStr.trim());
+                                ArchiveTreeContract ancestor = allAncestorsMap.get(id);
+                                if (ancestor != null) {
+                                    ancestorList.add(ancestor);
+                                }
+                            }
+                        }
+
+                        ancestorListMap.put(nodeIdStr, ancestorList);
+                    }
+                } catch (Exception e) {
+                    log.error("批量处理节点失败", e);
+                }
+            }
+
+
+            // 准备批量SQL和参数
+            StringBuilder insertSql = new StringBuilder();
+            List<Object[]> insertParams = new ArrayList<>();
+            StringBuilder updateSql = new StringBuilder();
+            List<Object[]> updateParams = new ArrayList<>();
+
+            for (Long fileId : fileIds) {
+                ArchiveFile file = fileMap.get(fileId);
+                if (file == null || file.getNodeId() == null || file.getNodeId().isEmpty()) {
+                    continue;
+                }
+
+                Map<String, Object> metadataMap = metadataFileMap.get(fileId);
+                boolean isAdd = (metadataMap == null);
+                Map<String, Object> keyValue = new LinkedHashMap<>();
+
+                // 收集元数据值
+                // 收集元数据值 - 传入预处理的数据映射
+                this.collectFileMetadata(
+                        file, type, keyValue, isAdd,
+                        archiveAutoMap, contractInfoMap,
+                        nodeContractMap, ancestorListMap
+                );
+
+                if (isAdd) {
+                    buildInsertSqlParams(file, keyValue, mapAll, metadataClassifications,
+                            tenantId, userId, now, insertSql, insertParams);
+                } else {
+                    buildUpdateSqlParams(fileId, keyValue, mapAll, metadataMap,
+                            userId, now, updateSql, updateParams);
+                }
+            }
+
+            // 执行批量操作
+            if (insertSql.length() > 0 && !insertParams.isEmpty()) {
+                int[] insertResults = jdbcTemplate.batchUpdate(insertSql.toString(), insertParams);
+                logBatchResultsSimple(insertResults, "INSERT");
+            }
+
+            if (updateSql.length() > 0 && !updateParams.isEmpty()) {
+                int[] updateResults = jdbcTemplate.batchUpdate(updateSql.toString(), updateParams);
+                logBatchResultsSimple(updateResults, "UPDATE");
+            }
+
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    private void buildInsertSqlParams(ArchiveFile file, Map<String, Object> keyValue,
+                                      Map<String, MetadataClassification> mapAll,
+                                      List<MetadataClassification> metadataClassifications,
+                                      String tenantId, Long userId, String now,
+                                      StringBuilder insertSql, List<Object[]> insertParams) {
+        // 准备参数列表
+        List<Object> params = new ArrayList<>();
+
+        // 固定字段参数
+        params.add(SnowFlakeUtil.getId());   // id
+        params.add(tenantId);                // tenant_id (String 类型)
+        params.add(userId);                  // create_user
+        params.add(now);                     // create_time
+        params.add(userId);                  // update_user
+        params.add(now);                     // update_time
+        params.add(0);                       // status
+        params.add(0);                       // is_deleted
+        params.add(file.getContractId());    // contract_id
+        params.add(file.getId());            // file_id
+
+        // 添加元数据字段参数
+        for (MetadataClassification mc : metadataClassifications) {
+            Object value = keyValue.getOrDefault(mc.getContainerName(), null);
+            params.add(value);
+        }
+
+        // 构建SQL模板（只构建一次）
+        if (insertSql.length() == 0) {
+            insertSql.append("INSERT INTO u_metadata_file (id, tenant_id, create_user, create_time, ");
+            insertSql.append("update_user, update_time, status, is_deleted, contract_id, file_id, ");
+
+            // 添加所有元数据字段
+            List<String> fieldKeys = new ArrayList<>();
+            for (MetadataClassification mc : metadataClassifications) {
+                fieldKeys.add(mc.getFieldKey());
+            }
+            insertSql.append(String.join(", ", fieldKeys));
+
+            insertSql.append(") VALUES (");
+
+            // 构建占位符字符串
+            StringBuilder placeholders = new StringBuilder();
+            for (int i = 0; i < (10 + metadataClassifications.size()); i++) {
+                if (i > 0) placeholders.append(", ");
+                placeholders.append("?");
+            }
+            insertSql.append(placeholders);
+
+            insertSql.append(")");
+        }
+
+        // 将参数转换为数组并添加到批处理列表
+        insertParams.add(params.toArray());
+    }
+
+    private void buildUpdateSqlParams(Long fileId, Map<String, Object> keyValue,
+                                      Map<String, MetadataClassification> mapAll,
+                                      Map<String, Object> metadataMap,
+                                      Long userId, String now,
+                                      StringBuilder updateSql, List<Object[]> updateParams) {
+        // 准备参数列表
+        List<Object> params = new ArrayList<>();
+        List<String> setFields = new ArrayList<>();
+
+        // 添加固定更新字段
+        setFields.add("update_user = ?");
+        params.add(userId);
+
+        setFields.add("update_time = ?");
+        params.add(now);
+
+        // 添加元数据字段参数
+        for (Map.Entry<String, Object> entry : keyValue.entrySet()) {
+            String containerName = entry.getKey();
+            Object value = entry.getValue();
+
+            if (mapAll.containsKey(containerName)) {
+                MetadataClassification mc = mapAll.get(containerName);
+                setFields.add(mc.getFieldKey() + " = ?");
+                params.add(value);
+            }
+        }
+
+        // 添加WHERE条件标识（最后处理）
+        params.add(fileId);
+
+        // 构建SQL模板（只构建一次）
+        if (updateSql.length() == 0 && !setFields.isEmpty()) {
+            updateSql.append("UPDATE u_metadata_file SET ");
+            updateSql.append(String.join(", ", setFields));
+            updateSql.append(" WHERE file_id = ?");
+        }
+
+        // 将参数转换为数组并添加到批处理列表
+        if (!setFields.isEmpty()) {
+            updateParams.add(params.toArray());
+        }
+    }
+
+
+    private void collectFileMetadata(ArchiveFile file, Integer type,
+                                     Map<String, Object> keyValue, boolean isAdd,Map<Long, ArchivesAuto> archiveAutoMap,
+                                     Map<String, ContractInfo> contractInfoMap,Map<String, ArchiveTreeContract> nodeContractMap,
+                                     Map<String, List<ArchiveTreeContract>> ancestorListMap) {
+        // 只有类型0需要处理
+        if (type != 0) return;
+
+        // 获取当前节点
+        ArchiveTreeContract currentNode = nodeContractMap.get(file.getNodeId());
+        if (currentNode == null) return;
+
+        // 获取祖先列表
+        List<ArchiveTreeContract> ancestorList = ancestorListMap.get(file.getNodeId());
+        if (ancestorList == null || ancestorList.isEmpty()) return;
+
+        // 准备各种层级结构
+        StringBuffer paperAddress = new StringBuffer();
+        StringBuffer nameStr = new StringBuffer();
+        StringBuffer unitProjectString = new StringBuffer();
+        StringBuffer unitProjectIdString = new StringBuffer();
+        StringBuffer divisionProjectString = new StringBuffer();
+        StringBuffer divisionProjectIdString = new StringBuffer();
+        StringBuffer itemizedProjectString = new StringBuffer();
+        StringBuffer itemizedProjectIdString = new StringBuffer();
+
+        // 处理每个层级
+        for (int i = 0; i < ancestorList.size(); i++) {
+            ArchiveTreeContract node = ancestorList.get(i);
+            metadataSetting(node, unitProjectString, unitProjectIdString,
+                    divisionProjectString, divisionProjectIdString,
+                    itemizedProjectString, itemizedProjectIdString);
+
+            if (i == 0) continue;
+
+            // 构建纸质文件位置
+            if (node.getId().equals(currentNode.getParentId())) {
+                paperAddress.append(node.getNodeName());
+                paperAddress.append(">");
+                paperAddress.append(currentNode.getNodeName());
+            }
+
+            nameStr.append(node.getNodeName());
+            nameStr.append("/");
+        }
+
+        // 设置基础元数据
+        keyValue.put("聚合层次", nameStr.toString());
+        keyValue.put("纸质文件位置", paperAddress.toString());
+
+        // 责任单位名称
+        String dutyUser = "";
+        if ((file.getDutyUser() == null || file.getDutyUser().isEmpty()) &&
+                (file.getContractId() != null && !file.getContractId().isEmpty())) {
+            ContractInfo contract = contractInfoMap.get(file.getContractId());
+            if (contract != null) {
+                if (contract.getContractType() == 1) {
+                    dutyUser = contract.getConstructionUnitName();
+                } else if (contract.getContractType() == 2) {
+                    dutyUser = contract.getSupervisionUnitName();
+                } else {
+                    dutyUser = contract.getContractorUnitName();
+                }
+            }
+        } else {
+            dutyUser = file.getDutyUser() != null ? file.getDutyUser() : "";
+        }
+        keyValue.put("立档单位名称", dutyUser);
+        keyValue.put("责任者名称", file.getDutyUser());
+
+        // 设置文件基本信息
+        keyValue.put("元数据目录文件", nameStr.toString());
+        keyValue.put("电子文件号", file.getId());
+        keyValue.put("文件页数", file.getFilePage());
+        keyValue.put("生成方式", file.getSourceType());
+        keyValue.put("题名", file.getFileName());
+
+        // 关键词生成
+        String keyWords = "";
+        if (file.getFileName() != null && file.getFileName().length() < 9) {
+            keyWords = file.getFileName();
+        } else if (file.getFileName() != null) {
+            keyWords = file.getFileName().substring(0, 8);
+        }
+        keyValue.put("关键词", keyWords);
+
+        // 摘要生成
+        String zhaiyao = "该文件为【" + (file.getSourceType() == 1 ? "原生" : "数字化") + "】于【" +
+                (file.getFileTime() != null ? file.getFileTime() : "") + "】形成，共【" +
+                (file.getFilePage() != null ? file.getFilePage() : 0) + "】页、【" +
+                (file.getFileName() != null ? file.getFileName() : "") + "】，责任者为【" +
+                dutyUser + "】";
+        keyValue.put("摘要", zhaiyao);
+        keyValue.put("文件日期", file.getFileTime());
+
+        // 设置档案信息（如果有）
+        if (file.getArchiveId() != null) {
+            ArchivesAuto archivesAuto = archiveAutoMap.get(file.getArchiveId());
+            if (archivesAuto != null) {
+                keyValue.put("密级", archivesAuto.getSecretLevel());
+                keyValue.put("档号", archivesAuto.getFileNumber());
+                keyValue.put("保管期限", archivesAuto.getStorageTime());
+                keyValue.put("文件件数", archivesAuto.getFileN());
+                keyValue.put("验证码", archivesAuto.getId());
+            }
+        }
+
+        // 文件编号和拍摄信息
+        keyValue.put("文号", file.getFileNumber());
+        keyValue.put("拍摄时间", file.getFilmingTime());
+        keyValue.put("分组号", file.getFilmCode());
+        keyValue.put("组内照片编号", file.getReferCode());
+
+        // 文件路径相关处理
+        if (file.getFileUrl() != null && !file.getFileUrl().isEmpty()) {
+            // 格式名称和存储位置
+            String fileUrl = file.getFileUrl();
+            if (fileUrl.contains(".")) {
+                keyValue.put("格式名称", fileUrl.substring(fileUrl.lastIndexOf(".") + 1));
+            } else {
+                keyValue.put("格式名称", "");
+            }
+
+            keyValue.put("存储位置", fileUrl);
+            keyValue.put("计算机文件名", fileUrl.substring(fileUrl.lastIndexOf("/") + 1));
+        }
+
+        // 文件大小和扫描信息
+        keyValue.put("计算机文件大小", file.getFileSize());
+        keyValue.put("扫描分辨率", "300dpi");
+        keyValue.put("扫描色彩模式", "彩色");
+
+        // 单位/分部/分项工程信息
+        keyValue.put("单位工程", trimLastComma(unitProjectString));
+        keyValue.put("单位工程编码", trimLastComma(unitProjectIdString));
+        keyValue.put("分部工程", trimLastComma(divisionProjectString));
+        keyValue.put("分部工程编码", trimLastComma(divisionProjectIdString));
+        keyValue.put("分项工程", trimLastComma(itemizedProjectString));
+        keyValue.put("分项工程编码", trimLastComma(itemizedProjectIdString));
+
+        // 关系默认值
+        keyValue.put("关系", "引用");
+
+        // 如果是竣工图
+        if ((currentNode.getIsBuiltDrawing() != null && currentNode.getIsBuiltDrawing() == 1) ||
+                (currentNode.getStorageType() != null && currentNode.getStorageType() == 2)) {
+            keyValue.put("图号", file.getDrawingNo());
+            keyValue.put("图幅", file.getSheetType());
+            keyValue.put("图表来源", file.getSheetSource());
+            keyValue.put("引用变更令 编号", file.getCiteChangeNumber());
+        }
+
+        // 存储类型处理
+        if (currentNode.getStorageType() != null) {
+            keyValue.put("业务事项", StorageTypeEnum.getByCode(currentNode.getStorageType()));
+        }
+
+        // 签名信息（只有当需要时处理，避免不必要查询）
+        if (isAdd) {
+            Task task = iTaskService.getTaskByFormDataId(file.getId().toString());
+            if (task != null) {
+                List<TaskParallel> taskParallelList = iTaskParallelService.queryApprovalUser(task.getProcessInstanceId());
+                if (taskParallelList != null && !taskParallelList.isEmpty()) {
+                    taskParallelList = taskParallelList.stream()
+                            .filter(taskParallel -> taskParallel.getEVisaStatus() == 1)
+                            .collect(Collectors.toList());
+
+                    if (!taskParallelList.isEmpty()) {
+                        // 处理签名信息
+                        StringBuffer nameString = new StringBuffer();
+                        StringBuffer dateString = new StringBuffer();
+                        List<Long> userIdList = new ArrayList<>();
+
+                        for (TaskParallel taskParallel : taskParallelList) {
+                            nameString.append(taskParallel.getTaskUserName()).append("、");
+                            dateString.append(taskParallel.getUpdateTime()).append("、");
+                            userIdList.add(Long.valueOf(task.getTaskUser()));
+                        }
+
+                        // 查询用户信息
+                        if (!userIdList.isEmpty()) {
+                            List<User> userList = iUserClient.userInfoByIds(userIdList);
+                            if (userList != null && !userList.isEmpty()) {
+                                List<String> postIds = userList.stream()
+                                        .map(User::getPostId)
+                                        .filter(Objects::nonNull)
+                                        .collect(Collectors.toList());
+
+                                R<List<String>> postNames = iSysClient.getPostNames(Func.join(postIds));
+                                if (postNames != null && postNames.getCode() == 200) {
+                                    keyValue.put("签名项", Func.join(postNames.getData()));
+                                }
+                            }
+                        }
+
+                        keyValue.put("签名者", trimLastComma(nameString));
+                        keyValue.put("签名时间", trimLastComma(dateString));
+                    }
+                }
+            }
+        }
+    }
+
+    // 辅助方法：去除字符串最后一个逗号/顿号
+    private String trimLastComma(StringBuffer buffer) {
+        if (buffer == null || buffer.length() == 0) return null;
+        return buffer.substring(0, buffer.length() - 1);
+    }
+
+    // 新增方法：记录批处理结果
+    private void logBatchResultsSimple(int[] results, String operation) {
+        int successCount = 0;
+        int failureCount = 0;
+        int affectedTotal = 0;
+
+        for (int rowCount : results) {
+            if (rowCount >= 0) {
+                successCount++;
+                affectedTotal += rowCount;
+            } else if (rowCount == Statement.EXECUTE_FAILED) {
+                failureCount++;
+            }
+        }
+
+        String msg = operation + " 操作结果: 成功批次 = " + successCount +
+                ", 失败批次 = " + failureCount +
+                ", 影响行数 = " + affectedTotal +
+                ", 总批次 = " + results.length;
+
+        if (failureCount == 0) {
+            log.error(msg);
+        } else {
+            log.error(msg);
+        }
+    }
+
+
 }

blade-service/blade-business/src/main/java/org/springblade/business/utils/PDFUtil.java

@@ -8,12 +8,17 @@ import com.spire.pdf.PdfDocument;
 import com.spire.pdf.PdfPageBase;
 import com.spire.pdf.general.find.PdfTextFind;
 import com.spire.pdf.general.find.PdfTextFindCollection;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.text.PDFTextStripper;
 import org.springblade.common.utils.CommonUtil;
 import org.springblade.core.tool.utils.Func;
 
+import java.io.File;
+import java.io.FileInputStream;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 
 public class PDFUtil {
@@ -89,34 +94,50 @@ public class PDFUtil {
         table.addCell(cell);
     }
 
-    public static List<String> getPdfSignIds(String pdfUrl) {
-        PdfDocument pdf = new PdfDocument();
+    public static List<String>  getPdfSignIds(String pdfUr) {
         List<String> eVisaConfigList = new ArrayList<>();
-        try {
-            InputStream ossInputStream = CommonUtil.getOSSInputStream(pdfUrl);
-            //加载PDF文档
-            pdf.loadFromStream(ossInputStream);
-
-            for(int i= 0;i<pdf.getPages().getCount();i++){
-                PdfPageBase page = pdf.getPages().get(i);
-                PdfTextFindCollection allText = page.findAllText();
-                PdfTextFind[] finds = allText.getFinds();
-                for(int k=0;k<finds.length;k++){
-                    String textStr = finds[k].getMatchText();
-                    System.out.println(textStr);
-                    String[] textS = Func.toStrArray("\\|\\|",textStr);
-                    for(String txt : textS){
-                        if (txt.length() >= 15 && Func.isNumeric(txt)||(Func.isNumeric(txt)&&txt.length()==8&&txt.startsWith("123"))) {
-                            eVisaConfigList.add(txt);
+        try  {
+            InputStream inputStream = CommonUtil.getOSSInputStream(pdfUr);
+            PDDocument document = PDDocument.load(inputStream);
+            PDFTextStripper stripper = new PDFTextStripper();
+            String text = stripper.getText(document);
+            String[] lines = text.split("[ \\n]+");
+            for(int k=0;k<lines.length;k++){
+                String textStr = lines[k];
+                if(textStr.indexOf("*")>=0){
+                    textStr = textStr.substring(textStr.lastIndexOf("*")+1,textStr.length());
+                }
+
+                String[] textS = Func.toStrArray("\\|\\|",textStr);
+                for(String txt : textS){
+                    for (int i = 0; i < txt.length(); i++) {
+                        if (!Character.isDigit(txt.charAt(i))) {
+                            txt=txt.substring(0,i);
                         }
                     }
+                    if (txt.length() >= 15 && Func.isNumeric(txt)) {
+                        eVisaConfigList.add(txt);
+                    }
+                }
+
+                // 特殊处理
+                if(textStr.indexOf("1")>=0){
+                    String txt = textStr.substring(textStr.indexOf("1"));
+                    if (txt.length() >= 15 && Func.isNumeric(txt)) {
+                        System.out.println(txt);
+                        eVisaConfigList.add(txt);
+                    }
                 }
             }
-            ossInputStream.close();
+
+            List<String> unique = eVisaConfigList.stream().distinct().collect(Collectors.toList());
+            document.close();
+            return unique;
         }catch (Exception e){
             e.printStackTrace();
+            System.out.println("pdf大小为0");
+            return eVisaConfigList;
         }
-        return eVisaConfigList;
     }
 
 /*     public static void main(String[] args) {

blade-service/blade-e-visa/src/main/java/org/springblade/evisa/controller/ArchiveController.java

@@ -90,10 +90,10 @@ public class ArchiveController {
                 }
             }
         }
-        System.out.println("队列数量_img" + executor.getQueue().size());
-        System.out.println("活跃数量_img" + executor.getActiveCount());
-        System.out.println("总共数量_img" + executor.getTaskCount());
-        System.out.println("完成数量_img" + executor.getCompletedTaskCount());
+        System.out.println("队列数量_img2" + executor.getQueue().size());
+        System.out.println("活跃数量_img2" + executor.getActiveCount());
+        System.out.println("总共数量_img2" + executor.getTaskCount());
+        System.out.println("完成数量_img2" + executor.getCompletedTaskCount());
     }
 
     // 分解第一页的任务
@@ -181,12 +181,12 @@ public class ArchiveController {
             String firstPage = FileUtils.getSysLocalFileUrl() + "archiveSplit/";
             int bkb = 0 ;
             //将imagePath 的数据转成一个可解析的html
-            String htmlUrl1 = pngToHtml(firstPage, archiveId);
-            String htmlUrl2 = pngToHtml(firstPage, archiveId);
+            String htmlUrl = pngToHtml(firstPage, archiveId);
+            /*String htmlUrl2 = pngToHtml(firstPage, archiveId);
             String htmlUrl = "";
             if (htmlUrl1.equals(htmlUrl2) && htmlUrl1.indexOf("_001.html") >= 0 && htmlUrl1.indexOf("archiveSplit") >= 0) {
                 htmlUrl = htmlUrl2;
-            }
+            }*/
 
             if (htmlUrl.indexOf("_001.html") >= 0 && htmlUrl.indexOf("archiveSplit") >= 0) {
                 String htmlString = IoUtil.readToString(new FileInputStream(htmlUrl));

blade-service/blade-e-visa/src/main/java/org/springblade/evisa/controller/EVController.java

@@ -58,7 +58,7 @@ public class EVController {
     @Resource(name = "taskExecutor1")
     private ThreadPoolExecutor executor;
 
-    @Scheduled(cron = "0/10 * * * * ?")
+   // @Scheduled(cron = "0/10 * * * * ?")
     public void SignInfo() {
         //执行代码
 

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ArchiveTreeContractController.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.manager.controller;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.mixsmart.utils.StringUtils;
 import io.swagger.annotations.*;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -47,6 +48,8 @@ import org.springblade.manager.service.IContractInfoService;
 import org.springblade.manager.service.impl.ArchiveTreeContractSyncImpl;
 import org.springblade.manager.vo.*;
 
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -82,6 +85,7 @@ public class ArchiveTreeContractController extends BladeController {
     private final ArchiveTreeContractSyncImpl archiveTreeContractSync;
 
     private final IContractInfoService contractInfoService;
+    private final JdbcTemplate jdbcTemplate;
 
     /**
      * 详情
@@ -90,7 +94,22 @@ public class ArchiveTreeContractController extends BladeController {
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "详情", notes = "传入archiveTreeContract")
     public R<ArchiveTreeContract> detail(ArchiveTreeContract archiveTreeContract) {
-        ArchiveTreeContract detail = archiveTreeContractService.getOne(Condition.getQueryWrapper(archiveTreeContract));
+        ArchiveTreeContract detail = archiveTreeContractService.getOne(Wrappers.lambdaQuery(ArchiveTreeContract.class).eq(ArchiveTreeContract::getId,archiveTreeContract.getId()));
+        Long contractId1 = detail.getContractId();
+        if(contractId1==null){
+            contractId1=archiveTreeContract.getContractId();
+        }
+        String sql="select * from m_contract_info where id="+contractId1;
+        ContractInfo info = jdbcTemplate.queryForObject(sql, new BeanPropertyRowMapper<>(ContractInfo.class));
+        if(detail.getRollor()==null&&info!=null&&info.getFiler()!=null){
+            detail.setRollor(info.getFiler());
+        }
+        if(detail.getReviewer()==null&&info!=null&&info.getReviewer()!=null){
+            detail.setReviewer(info.getReviewer());
+        }
+        if(detail.getFileNumberPrefix()==null&&info!=null&&info.getPrefix()!=null){
+            detail.setFileNumberPrefix(info.getPrefix());
+        }
         return R.data(detail);
     }
 
@@ -138,7 +157,10 @@ public class ArchiveTreeContractController extends BladeController {
     @PostMapping("/update")
     @ApiOperationSupport(order = 5)
     @ApiOperation(value = "修改", notes = "传入archiveTreeContract")
-    public R update(@Valid @RequestBody ArchiveTreeContract archiveTreeContract) {
+    /**
+     * isSaveChild 0是保存子节点，1不保存子节点
+     */
+    public R update(@Valid @RequestBody ArchiveTreeContractDTO archiveTreeContract) {
         if (archiveTreeContract == null) {
             return R.fail(200, "未查询到对应节点信息");
         }
@@ -203,9 +225,9 @@ public class ArchiveTreeContractController extends BladeController {
 
         boolean b = archiveTreeContractService.updateById(ar);
         //更新下级节点为同一规则
-
-        archiveTreeContractService.updateAllSonNodeIdsForArchiveAutoRule(ar);
-
+        if(archiveTreeContract.getIsSaveChild()!=null&&archiveTreeContract.getIsSaveChild()==0){
+            archiveTreeContractService.updateAllSonNodeIdsForArchiveAutoRule(ar);
+        }
         return R.status(b);
     }
 

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ExcelTabController.java

@@ -3091,25 +3091,7 @@ public class ExcelTabController extends BladeController {
                         InputStream inputStreamByUrl = FileUtils.getInputStreamByUrl(tableNode2.getHtmlUrl());
                         String htmlString = IoUtil.readToString(inputStreamByUrl);
                         Document doc = Jsoup.parse(htmlString);
-                        // 模糊匹配
-                        Elements cbdw = doc.select("el-select[placeholder*=承包单位]");
-                        Elements htd = doc.select("el-select[placeholder*=合同段]");
-                        Elements jldw = doc.select("el-input[placeholder*=监理单位]");
-                        Elements jljg = doc.select("el-select[placeholder*=监理机构]");
-                        Elements jlr = doc.select("el-input[placeholder*=记录人]");
-                        Elements rq = doc.select("el-date-picker[placeholder*=日期]");
-                        Elements shr = doc.select("el-input[placeholder*=审核人]");
-                        Elements tqqk = doc.select("el-input[placeholder*=天气情况]");
-                        List<Elements> allElements=new ArrayList<>();
-                        allElements.add(cbdw);
-                        allElements.add(htd);
-                        allElements.add(jldw);
-                        allElements.add(jljg);
-                        allElements.add(jlr);
-                        allElements.add(rq);
-                        allElements.add(shr);
-                        allElements.add(tqqk);
-                        allElements=allElements.stream().filter(o->o!=null&&o.size()>0).collect(Collectors.toList());
+                        List<Elements> allElements = getBiaoTou(doc);
                         if(allElements.size()>0){
                             for (String key : businessDataMap.get(0).keySet()) {
                                 String tabVal = businessDataMap.get(0).get(key) + "";
@@ -3164,8 +3146,10 @@ public class ExcelTabController extends BladeController {
                                 }
                             }
                             for (Elements element : allElements) {
-                                if(reData.containsKey(element.attr("keyname"))){
-                                    resultMapList.put(element.attr("keyname"),reData.get(element.attr("keyname")));
+                                for (Element element1 : element) {
+                                    if(reData.containsKey(element1.attr("keyname"))){
+                                        resultMapList.put(element1.attr("keyname"),reData.get(element1.attr("keyname")));
+                                    }
                                 }
                             }
                         }
@@ -3178,6 +3162,58 @@ public class ExcelTabController extends BladeController {
         return R.data(resultMapList);
     }
 
+    public List<Elements> getBiaoTou(Document doc){
+        // 模糊匹配
+        Elements cbdw = doc.select("el-select[placeholder*=承包单位]");
+        Elements cbdw1 = doc.select("el-input[placeholder*=承包单位]");
+        Elements htd = doc.select("el-select[placeholder*=合同段]");
+        Elements htd1 = doc.select("el-input[placeholder*=合同段]");
+        Elements jldw = doc.select("el-input[placeholder*=监理单位]");
+        Elements jljg = doc.select("el-select[placeholder*=监理机构]");
+        Elements jljg1 = doc.select("el-input[placeholder*=监理机构]");
+        Elements jlr = doc.select("el-input[placeholder*=记录人]");
+        Elements rq = doc.select("el-date-picker[placeholder*=日期]");
+        Elements shr = doc.select("el-input[placeholder*=审核人]");
+        Elements tqqk = doc.select("el-input[placeholder*=天气情况]");
+        Elements dwgc = doc.select("el-input[placeholder*=单位工程]");
+        Elements fxgc = doc.select("el-input[placeholder*=分项工程]");
+        Elements fbgc = doc.select("el-input[placeholder*=分部工程]");
+        Elements zh = doc.select("el-input[placeholder*=桩号]");
+        Elements bw = doc.select("el-input[placeholder*=部位]");
+        Elements xq = doc.select("el-select[placeholder*=星期]");
+        Elements tq = doc.select("el-input[placeholder*=天气]");
+        Elements qw = doc.select("el-input[placeholder*=气温_最高]");
+        Elements qw1 = doc.select("el-input[placeholder*=气温_最低]");
+        Elements sgdw = doc.select("el-input[placeholder*=施工单位]");
+        Elements hth = doc.select("el-input[placeholder*=合同号]");
+        Elements bh = doc.select("el-input[placeholder*=编号]");
+        List<Elements> allElements=new ArrayList<>();
+        allElements.add(cbdw);
+        allElements.add(cbdw1);
+        allElements.add(htd);
+        allElements.add(htd1);
+        allElements.add(jldw);
+        allElements.add(jljg);
+        allElements.add(jljg1);
+        allElements.add(jlr);
+        allElements.add(rq);
+        allElements.add(shr);
+        allElements.add(tqqk);
+        allElements.add(dwgc);
+        allElements.add(fxgc);
+        allElements.add(fbgc);
+        allElements.add(zh);
+        allElements.add(bw);
+        allElements.add(xq);
+        allElements.add(tq);
+        allElements.add(qw);
+        allElements.add(qw1);
+        allElements.add(sgdw);
+        allElements.add(hth);
+        allElements.add(bh);
+        return allElements.stream().filter(o->o!=null&&o.size()>0).distinct().collect(Collectors.toList());
+    }
+
 
 
     /**

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/SystemMsgController.java

@@ -47,7 +47,9 @@ public class SystemMsgController extends BladeController {
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "新增", notes = "传入版本信息")
     public R add(@Valid @RequestBody SystemMsg systemMsg){
-        systemMsg.setPushDateTime(systemMsg.getPushDateTime().with(ChronoField.SECOND_OF_MINUTE, 0));
+        //systemMsg.setPushDateTime(systemMsg.getPushDateTime().with(ChronoField.SECOND_OF_MINUTE, 0));
+
+        systemMsg.setPushDateTime(systemMsg.getPushDateTime());
         //如果新增的是更新公告，则校验是否已经存在更新公告
         if (systemMsg.getMsgType() == 1) {
             List<SystemMsg> list = systemMsgService.list(new LambdaQueryWrapper<SystemMsg>()

blade-service/blade-manager/src/main/java/org/springblade/manager/job/SystemMsgJob.java

@@ -48,7 +48,7 @@ public class SystemMsgJob {
         if (!schedulerEnabled) return;
 
         /** 普通公告推送*/
-        String sql1 = "select * from m_system_msg where is_deleted = 0 and msg_type = 2 and push_status = 1 and push_end_date_time >= now()";
+        String sql1 = "select * from m_system_msg where is_deleted = 0 and msg_type = 2 and push_status = 1 and now()<=push_end_date_time and now()>=push_date_time ";
         List<SystemMsg> list1 = jdbcTemplate.query(sql1,new BeanPropertyRowMapper<>(SystemMsg.class));
         if (list1.size() > 0){
             for (SystemMsg msg : list1) {
@@ -60,7 +60,7 @@ public class SystemMsgJob {
         }
         /** 维护公告推送*/
         //String sql2 = "select * from m_system_msg where is_deleted = 0 and msg_type = 1 and status = 1 and push_status = 1 and push_date_time >= now() and push_warn_date_time <= TIMESTAMPADD(SECOND, 1, NOW())";
-        String sql2 = "select * from m_system_msg where is_deleted = 0 and msg_type = 1 and status = 1 and push_status = 1 and push_warn_date_time>=NOW() ";
+        String sql2 = "select * from m_system_msg where is_deleted = 0 and msg_type = 1 and status = 1 and push_status = 1 and TIMESTAMPDIFF(SECOND,push_warn_date_time,sysdate())>0  ";
         List<SystemMsg> list2 = jdbcTemplate.query(sql2,new BeanPropertyRowMapper<>(SystemMsg.class));
         if (list2.size() > 0){
             for (SystemMsg msg : list2) {
@@ -72,12 +72,13 @@ public class SystemMsgJob {
         }
         /** 维护倒计时*/
       //  String sql3 = "select * from m_system_msg where is_deleted = 0 and msg_type = 1 and status != 3 and TIMESTAMPADD(SECOND, 1, NOW()) >= push_count_down_date_time and now() < push_date_time ";
-        String sql3 = "select * from m_system_msg where is_deleted = 0 and msg_type = 1 and status != 3 and push_count_down_date_time >=NOW() ";
+        String sql3 = "select * from m_system_msg where is_deleted = 0 and msg_type = 1 and status != 3 and TIMESTAMPDIFF(SECOND,push_count_down_date_time,sysdate())>0  ";
         List<SystemMsg> list3 = jdbcTemplate.query(sql3,new BeanPropertyRowMapper<>(SystemMsg.class));
         if (list3.size() > 0){
             SystemMsg msg = list3.get(0);
             msg.setMsgType(3);
-            msg.setMsgContent(Duration.between(LocalDateTime.now(), msg.getPushDateTime()).getSeconds()+"");
+           // msg.setMsgContent(Duration.between(LocalDateTime.now(), msg.getPushDateTime()).getSeconds()+"");
+            msg.setMsgContent((msg.getMsgCountDownTime()*60)+"");
             systemMsgService.pushSystemMsgToAllUser(msg);
             systemMsgService.update(new LambdaUpdateWrapper<SystemMsg>()
                     .set(SystemMsg::getStatus,3)

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ArchiveTreeContractMapper.xml

@@ -50,6 +50,7 @@
         <result column="archive_name_suffix" property="archiveNameSuffix"/>
         <result column="ext_key_id" property="extKeyId"/>
         <result column="out_id" property="outId"/>
+        <result column="ext_node_type" property="extNodeType"/>
     </resultMap>
     <delete id="removeImageNodeChild">
         delete from m_archive_tree_contract

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreeMapper.xml

@@ -468,7 +468,7 @@
             and e_name like concat('%',#{eName},'%')
         </if>
         <if test="eType != null and eType != '' ">
-            and e_type like concat('%',#{eType},'%')
+            and e_type = #{eType}
         </if>
 
     </select>

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreePrivateMapper.java

@@ -43,7 +43,7 @@ public interface WbsTreePrivateMapper extends EasyBaseMapper<WbsTreePrivate> {
 
     List<TreeNodeVOByTabType> tabTypeLazyTree(IPage page, Long parentId, String projectId, String titleName);
 
-    List<TreeNodeVOByTabType> tabTypeLazyTreeAll(IPage page, Long parentId, String titleName);
+    List<TreeNodeVOByTabType> tabTypeLazyTreeAll(Long parentId, String titleName);
 
     int updateByPKeyId(@Param("pKeyId") Long pKeyId, @Param("wbsTP") WbsTreePrivate wbsTP);
 

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

@@ -513,6 +513,7 @@ public class ArTreeContractInitServiceImpl {
             archiveTree.setExtAttachId(subTree.getId());
             archiveTree.setSort(wbsTreeVO2.getSort());
             archiveTree.setDisplayHierarchy(level.toString());
+            archiveTree.setExtNodeType(wbsTreeVO2.getNodeType());
             archiveTree.setIsDeleted(0);
             //上传节点
             if (wbsTreeVO2.getNodeType() != null && wbsTreeVO2.getNodeType().longValue() == level) {

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

@@ -3257,14 +3257,14 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
             //报告编号
             if (bgHB.size() >= 1 && StringUtils.isNotEmpty(dto.getReportNo())) {
                 for (Element element : bgHB) {
-                    DataInfo.put(element.attr("keyname"), "NUMBER-" + dto.getReportNo());
+                   // DataInfo.put(element.attr("keyname"), "NUMBER-" + dto.getReportNo());
                     break;
                 }
             }
             //记录编号
             if (jlBH.size() >= 1 && StringUtils.isNotEmpty(dto.getRecordNo())) {
                 for (Element element : jlBH) {
-                    DataInfo.put(element.attr("keyname"), "NUMBER-" + dto.getRecordNo());
+                   // DataInfo.put(element.attr("keyname"), "NUMBER-" + dto.getRecordNo());
                     break;
                 }
             }

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

@@ -310,7 +310,7 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
         if (SelectorModel.ID <= parentId && parentId <= SelectorModel.MAX_ID) {
             data = this.baseList(titleName);
         } else {
-            data = baseMapper.tabTypeLazyTreeAll(page, parentId, titleName);
+            data = baseMapper.tabTypeLazyTreeAll(parentId, titleName);
         }
         addBase(data, base);
      /*   if (base && hasPartFormula != null) {

blade-service/blade-user/src/main/java/org/springblade/system/user/controller/WbsTreeController.java

@@ -19,6 +19,7 @@ import org.springblade.manager.vo.PrivateTreeVO2;
 import org.springblade.manager.vo.WbsTreeContractLazyVO;
 import org.springblade.system.user.service.IUserService;
 import org.springblade.system.user.util.ComplexStringComparator;
+import org.springblade.system.user.vo.InformationQueryBIMVO;
 import org.springblade.system.user.vo.InformationQueryVO1;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
@@ -167,6 +168,17 @@ public class WbsTreeController extends BladeController {
         return R.data(iUserService.queryInformationByContractIdAndName(contractId, name));
     }
 
+    @GetMapping("/informationWriteQuery/queryInformationByFileNumber")
+    @ApiOperation("根据合同段Id，模糊文件名查询(杭宁项目专用)")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "contractId",value = "合同段Id"),
+            @ApiImplicitParam(name="fileNumber",value = "划分编号")
+    })
+    public R<List<InformationQueryBIMVO>> queryInformationByFileNumber(@RequestParam String contractId, @RequestParam String fileNumber){
+        return R.data(iUserService.queryInformationByFileNumber(contractId, fileNumber));
+    }
+
+
 //    /**
 //     * 项目全加载树
 //     *

blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java

@@ -25,10 +25,7 @@ import org.springblade.business.vo.InformationQueryVO;
 import org.springblade.manager.vo.PrivateTreeVO2;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.excel.UserExcel;
-import org.springblade.system.user.vo.InformationQueryVO1;
-import org.springblade.system.user.vo.InformationQueryVO2;
-import org.springblade.system.user.vo.UserContractInfoVO;
-import org.springblade.system.user.vo.UserVO;
+import org.springblade.system.user.vo.*;
 
 import java.util.List;
 
@@ -80,4 +77,7 @@ public interface UserMapper extends BaseMapper<User> {
     List<PrivateTreeVO2> getAllNode(@Param("projectId") String projectId);
 
     List<InformationQueryVO1> queryInformationByContractIdAndName(@Param("contractId")String contractId, @Param("name")String name);
+
+    //
+    List<InformationQueryBIMVO> queryInformationByFileNumber(@Param("contractId")String contractId, @Param("name")String name);
 }

blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml

@@ -247,4 +247,8 @@
         </if>
     </select>
 
+    <select id="queryInformationByFileNumber" resultType="org.springblade.system.user.vo.InformationQueryBIMVO">
+
+    </select>
+
 </mapper>

blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java

@@ -16,6 +16,7 @@ import org.springblade.system.user.entity.UserInfo;
 import org.springblade.system.user.entity.UserOauth;
 import org.springblade.system.user.enums.UserEnum;
 import org.springblade.system.user.excel.UserExcel;
+import org.springblade.system.user.vo.InformationQueryBIMVO;
 import org.springblade.system.user.vo.InformationQueryVO1;
 import org.springblade.system.user.vo.UserVO;
 
@@ -244,4 +245,6 @@ public interface IUserService extends BaseService<User> {
 
 
     List<InformationQueryVO1> queryInformationByContractIdAndName(String contractId, String name);
+
+    List<InformationQueryBIMVO> queryInformationByFileNumber(String contractId, String fieldNumber);
 }

blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

@@ -63,6 +63,7 @@ import org.springblade.system.user.service.IUserOauthService;
 import org.springblade.system.user.service.IUserService;
 import org.springblade.system.user.util.FileUtils;
 import org.springblade.system.user.util.ForestNodeMerger;
+import org.springblade.system.user.vo.InformationQueryBIMVO;
 import org.springblade.system.user.vo.InformationQueryVO1;
 import org.springblade.system.user.vo.InformationQueryVO2;
 import org.springblade.system.user.vo.UserVO;
@@ -2048,4 +2049,15 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
     }
 
 
+    @Override
+    public List<InformationQueryBIMVO> queryInformationByFileNumber(String contractId, String fileNumber) {
+        if (StringUtil.isEmpty(contractId)) {
+            throw new ServiceException("未获取到合同段id");
+        }
+
+        List<InformationQueryBIMVO> informationQueryVO1s = baseMapper.queryInformationByFileNumber(contractId, fileNumber);
+
+        return informationQueryVO1s;
+    }
+
 }