修改BUG

blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/feign/NewIOSSClient.java

@@ -9,6 +9,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.List;
+
 @FeignClient(value = AppConstant.APPLICATION_RESOURCE_NAME)
 public interface NewIOSSClient {
 
@@ -29,5 +31,4 @@ public interface NewIOSSClient {
 
     @PostMapping(REMOVE_PDF_FILE)
     void removeFile(@RequestParam String fileName);
-
 }

blade-ops/blade-resource/src/main/java/org/springblade/resource/feign/NewIOSSClientImpl.java

@@ -2,10 +2,12 @@ package org.springblade.resource.feign;
 
 import lombok.AllArgsConstructor;
 import org.springblade.core.oss.model.BladeFile;
+import org.springblade.core.oss.model.OssFile;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
 import org.springblade.resource.builder.oss.OssBuilder;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -13,6 +15,8 @@ import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
 
 @NonDS
 @RestController

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

@@ -68,24 +68,28 @@ public class ArchiveAutoPdfServiceImpl implements IArchiveAutoPdfService {
     public void test1() {
 
         Long pkeyId = SnowFlakeUtil.getId();
-
-        String file_path = "D:\\tmp";
-        String excelUrl = file_path +  "\\备考表.xlsx";
-
-        Map<String, Object> DataInfo = new HashMap<>();
-
-        DataVO dataVO = FormulaUtil.convertCellToIndex("C2");
-        String key =  "1__"+ dataVO.getY() + "_" + dataVO.getX();
-        DataInfo.put(key,"档号123456");
-
-        DataVO dataVO1 = FormulaUtil.convertCellToIndex("A9");
-        String key1 =  "2__"+ dataVO1.getY() + "_" + dataVO1.getX();
-        DataInfo.put(key1,"hahahahaa");
-        try {
-            String url = getBussPdfInfo(pkeyId.toString(),DataInfo,excelUrl,file_path);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+        String  file2 = "upload/20230413/306c87ffc640699aa92d53a5f4e6d632.xlsx";
+        List<String> files = new ArrayList<>();
+        files.add(file2);
+        BladeFile bladeFile = newIOSSClient.uploadFile1(file2,"123");
+
+//        String file_path = "D:\\tmp";
+//        String excelUrl = file_path +  "\\备考表.xlsx";
+//
+//        Map<String, Object> DataInfo = new HashMap<>();
+//
+//        DataVO dataVO = FormulaUtil.convertCellToIndex("C2");
+//        String key =  "1__"+ dataVO.getY() + "_" + dataVO.getX();
+//        DataInfo.put(key,"档号123456");
+//
+//        DataVO dataVO1 = FormulaUtil.convertCellToIndex("A9");
+//        String key1 =  "2__"+ dataVO1.getY() + "_" + dataVO1.getX();
+//        DataInfo.put(key1,"hahahahaa");
+//        try {
+//            String url = getBussPdfInfo(pkeyId.toString(),DataInfo,excelUrl,file_path);
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
 
         System.out.println();
 

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

@@ -450,9 +450,9 @@ public class ArchiveTreeContractServiceImpl extends BaseServiceImpl<ArchiveTreeC
 		}
 
 		//更新排序，把排序，自动组卷这种变化，刷新到新增节点和修改节点上
-		archiveTreeContractSync.InitTreeSort(dstTree,saveContractList,upList,srcTrees);
-
 		saveList.addAll(saveContractList);
+		archiveTreeContractSync.InitTreeSort(dstTree,saveContractList,upList,srcTrees,saveList);
+
 		//同步生成案卷
 		arTreeContractInitService.syncArchiveAutoList(saveList,contractInfos);
 

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

@@ -102,7 +102,8 @@ public class ArchiveTreeContractSyncImpl {
      * @param dstTree
      * @param addList
      */
-    public void InitTreeSort(ArchiveTreeContractVO2  dstTree,List<ArchiveTreeContract> addList,List<ArchiveTreeContract> upList,List<ArchiveTreeVO2> proVo2Trees)
+    public void InitTreeSort(ArchiveTreeContractVO2  dstTree,List<ArchiveTreeContract> addList,
+                             List<ArchiveTreeContract> upList,List<ArchiveTreeVO2> proVo2Trees,List<ArchiveTreeContract> allAddList)
     {
         Map<Long,ArchiveTreeContractVO2> vo2Map = new LinkedHashMap<>();
 
@@ -118,7 +119,7 @@ public class ArchiveTreeContractSyncImpl {
         archiveAutoRuleSync.syncArchiveTreeContractList(vo2Map,proVo2Trees);
 
         //根据vo的排序和自动组卷信息，刷新新增节点，根据修改标识生成更新节点
-        arTreeContractInitService.handleAddAndUpList(vo2Map,addList,upList);
+        arTreeContractInitService.handleAddAndUpList(vo2Map,allAddList,upList);
 
     }