档号按起始流水号整理档号

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

@@ -149,15 +149,15 @@ public class ArchivesAutoController extends BladeController {
     @GetMapping("/fileNumberFlush")
     @ApiOperationSupport(order = 4)
     @ApiOperation(value = "档号整理——按档号排序")
-    public R fileNumberFlush(Long projectId,Long contractId,String nodeId,Integer isArchive){
+    public R fileNumberFlush(Long projectId,Long contractId,String nodeId,Integer isArchive,Integer startNumber){
         List<ArchiveTreeContract> archiveTreeContracts = this.archiveTreeContractClient.queryAllChildByAncestors(nodeId,contractId);
         List<String> ids = new ArrayList<>();
         if(archiveTreeContracts != null && archiveTreeContracts.size() > 0){
             ids=JSONArray.parseArray(JSONObject.toJSONString(archiveTreeContracts.stream().map(ArchiveTreeContract::getId).distinct().collect(Collectors.toList())), String.class);
         }
         ids.add(nodeId);
-        archivesAutoService.fileNumberFlush(projectId,contractId,ids,isArchive);
-        return R.success("正在重置题名中,请稍后刷新");
+        archivesAutoService.fileNumberFlush(projectId,contractId,ids,isArchive,startNumber);
+        return R.success("正在刷新档号中,请稍后刷新");
     }
 
 

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

@@ -92,6 +92,7 @@ import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.rmi.ServerException;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.List;
@@ -1566,6 +1567,9 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 			aiName.setStatus(1);
 			aiNames.add(aiName);
 		}
+		if(aiNames.size()<=0){
+			throw new ServerException("所选节点正在生成中，请勿重复提交");
+		}
 		//异步调用AI接口
 		aiNameService.syncCreatAiName(aiNames);
 		return aiNameService.saveBatch(aiNames);
@@ -4500,18 +4504,18 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 
     @Override
     @Async
-    public void fileNumberFlush(Long projectId, Long contractId, List<String> nodeIds,Integer isArchive) {
+    public void fileNumberFlush(Long projectId, Long contractId, List<String> nodeIds,Integer isArchive,Integer startNumber) {
         ArchiveProjectConfig config = archiveProjectConfigService.getByProjectIdOrNew(projectId);
         List<ArchivesAutoVO4>list=baseMapper.selectAllArchiveAuto(projectId,contractId,nodeIds,isArchive);
         if(list!=null && list.size()>0){
             if(config.getDirType()==null||config.getDirType()==0){
-                List<ArchivesAuto> archivesAutos = setFileNumberByConfig(config, list);
+                List<ArchivesAuto> archivesAutos = setFileNumberByConfig(config, list,startNumber);
                 this.updateBatchById(archivesAutos);
             }else {
                 Map<Long, List<ArchivesAutoVO4>> map = list.stream().collect(Collectors.groupingBy(ArchivesAutoVO4::getParentId));
                 for (Map.Entry<Long, List<ArchivesAutoVO4>> entry : map.entrySet()) {
                     List<ArchivesAutoVO4> value = entry.getValue();
-                    List<ArchivesAuto> archivesAutos = setFileNumberByConfig(config, value);
+                    List<ArchivesAuto> archivesAutos = setFileNumberByConfig(config, value,startNumber);
                    this.updateBatchById(archivesAutos);
                 }
             }
@@ -4616,8 +4620,11 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
         return true;
     }
 
-    public List<ArchivesAuto> setFileNumberByConfig(ArchiveProjectConfig config,List<ArchivesAutoVO4> value){
-        int i=1;
+    public List<ArchivesAuto> setFileNumberByConfig(ArchiveProjectConfig config,List<ArchivesAutoVO4> value,Integer startNumber){
+        int i=startNumber;
+		if(config.getIndexType()==1&&startNumber.toString().length()>config.getIndexNum()+1){
+			throw new ServiceException("起始流水号位数不能超过设置的虚数位数");
+		}
         List<ArchivesAuto>list=new ArrayList<>();
         for (ArchivesAutoVO4 v:value) {
             ArchivesAuto auto = new ArchivesAuto();
@@ -4625,7 +4632,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
                v.setFileNumber(v.getFileNumberPrefix()+"_"+i);
            }else {
                String prefix = v.getFileNumberPrefix();
-               int index = i; // 编号从 1 开始
+               int index = i; // 编号从 startNumber 开始
                // 获取配置中的编号长度（最多多少位）
                int numLength = config.getIndexNum();
                // 默认最多4位，防止过长或无效值