更新一键导入

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/common/Constant.java

@@ -83,11 +83,31 @@ public class Constant {
             "国有建设用地使用权及房屋所有权首次登记"
     );
 
+
+    public static final List<String> NODE_ATTACHMENT_NAME_LIST = List.of(
+            "2019",
+            "2020",
+            "2021",
+            "2022",
+            "2023",
+            "2024",
+            "DX2017",
+            "DX2018",
+            "DX2019",
+            "DX2020",
+            "DX2021",
+            "DX2022",
+            "DX2024",
+            "DX2025",
+            "DX2026"
+    );
+
+
     //项目excel导入路径
     //public static final String  IMPORT_EXCEL_DATA_FILE_PATH = "D:\\one_code_manage\\project_excel_data";
     public static final String  IMPORT_EXCEL_DATA_FILE_PATH = "D:\\tmp\\one_code_manage\\excel_deom";
 
-    public static final String  FILE_UPLOAD_PATH = "/home/siwei/uploadPath/2026/05/26";
+    public static final String  FILE_UPLOAD_PATH = "/home/siwei/uploadPath/2026/06/07";
 
 
 }

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/enums/DecisionType.java

@@ -14,12 +14,12 @@ public enum DecisionType {
     DECISION_TYPE_1("1", "现状数据", "vector.gj_sandiao", "gid", "gj_sandiao", "gid", "dlmc","dlbm"),
     DECISION_TYPE_2("2", "城镇开发边界", "vector.gj_chengzhen", "gid", "gj_chengzhen", "gid", "ghfqmc","ghfqdm"),
     DECISION_TYPE_3("3", "控规数据", "vector.gj_konggui", "gid", "gj_konggui", "gid", "dkbh","ydxz"),
-    DECISION_TYPE_4("4", "所有权宗地", "vector.zdjbxx", "zddm", "zdjbxx", "zddm", "qlrsjsyrlxm","zdszx"),
+    //DECISION_TYPE_4("4", "所有权宗地", "vector.zdjbxx", "zddm", "zdjbxx", "zddm", "qlrsjsyrlxm","zdszx"),
     DECISION_TYPE_5("5", "使用权宗地", "vector.zdjbxx", "zddm", "zdjbxx", "zddm", "qlrsjsyrlxm","zdszx"),
     DECISION_TYPE_6("6", "供地数据", "vector.gj_gd_data", "gid", "gj_gd_data", "gid","srr", "nf"),
     DECISION_TYPE_7("7", "用地报批（存量）数据", "vector.gj_bp_data", "gid", "gj_bp_data", "gid", "xmmc","xmlx"),
     DECISION_TYPE_6_1("6", "土地供应数据", "public.c_one_code_tdgy", "node_id", "c_one_code_tdgy", "node_id","srf","hbcrht_date"),
-    DECISION_TYPE_7_1("7", "用地报批数据", "public.t_ydbp_data", "id", "t_ydbp_data", "id", "name","pfwh"),
+//    DECISION_TYPE_7_1("7", "用地报批数据", "public.t_ydbp_data", "id", "t_ydbp_data", "id", "name","pfwh"),
 
 //    DECISION_TYPE_6_2("6", "供地数据", "c_one_code_tdgy", "node_id", "供地数据2", "project_name","project_code"),
 //    DECISION_TYPE_7_2("7", "报批数据", "c_one_code_ydbp", "node_id", "报批数据2", "node_id", "project_name","project_code");

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/third/impl/DealExcelServiceImpl.java

@@ -53,6 +53,7 @@ import java.util.stream.Collectors;
 @Service
 public class DealExcelServiceImpl {
 
+    private final String rootPathAll = Constant.IMPORT_EXCEL_DATA_FILE_PATH + "\\数据治理批量导入示例数据\\赣江新区项目文件夹建立\\1.出让项目";
     private final String rootPath2019 = Constant.IMPORT_EXCEL_DATA_FILE_PATH + "\\数据治理批量导入示例数据\\赣江新区项目文件夹建立\\1.出让项目\\2019";
     private final String rootPath2020 = Constant.IMPORT_EXCEL_DATA_FILE_PATH + "\\数据治理批量导入示例数据\\赣江新区项目文件夹建立\\1.出让项目\\2020";
     private final String rootPathZip = Constant.IMPORT_EXCEL_DATA_FILE_PATH + "\\zip";
@@ -606,10 +607,10 @@ public class DealExcelServiceImpl {
 
             String projectName = xm.get("项目名称");
             if (StringUtils.isBlank(projectName)) {
-                projectName = "xxxx_" + System.currentTimeMillis();
+                projectName = "xxxx1_" + System.currentTimeMillis();
                 log.warn("项目名称为空，默认设置为{}", projectName);
             }else {
-                projectName = "pro_" + projectName;
+                projectName = "pro1_" + projectName;
             }
 
             projectVo.setName(projectName);
@@ -956,34 +957,25 @@ public class DealExcelServiceImpl {
             return;
         }
 
-        List<String> aa = List.of(
-                "2020-3 赣江新区直管区国药南大道以东、规划路以南、国药支路以西、慈菇东路以北（SHD02-07）",
-                "2020-4 赣江新区直管区欧阳修支路以东、欧阳修路以南、储备用地以西、慈菇东路以北（SHD04-05-01）",
-                "2020-12 赣江新区直管区济生南路以东、欧阳修路以南、储备用地以西、慈菇东路以北SHD06-03"
-        );
-
-        if(aa.contains(projectFileName)){
-            int a1=100;
-            int b2=a1+100;
-            log.info("附件材料处理逻辑：{},{}", projectFileName,b2);
-        }
+//        List<String> aa = List.of(
+//                "2020-3 赣江新区直管区国药南大道以东、规划路以南、国药支路以西、慈菇东路以北（SHD02-07）",
+//                "2020-4 赣江新区直管区欧阳修支路以东、欧阳修路以南、储备用地以西、慈菇东路以北（SHD04-05-01）",
+//                "2020-12 赣江新区直管区济生南路以东、欧阳修路以南、储备用地以西、慈菇东路以北SHD06-03"
+//        );
+//
+//        if(aa.contains(projectFileName)){
+//            int a1=100;
+//            int b2=a1+100;
+//            log.info("附件材料处理逻辑：{},{}", projectFileName,b2);
+//        }
 
         //这里先初始化项目
         nodeAttachmentService.addDefaultAttachment(projectId, nodeId,gdType);
-
-        String fullFilePath = "";
-        Path filePath = Paths.get(rootPath2019 + "\\" + projectFileName);
-        if (Files.exists(filePath) && Files.isDirectory(filePath)) {
-            fullFilePath = copyFileToDirectory(rootPath2019 + "\\" + projectFileName, targectDir + "\\" + projectFileName, nodeFileName);
-        }
-
-        if (StringUtils.isBlank(fullFilePath)) {
-            filePath = Paths.get(rootPath2020 + "\\" + projectFileName);
-            if (Files.exists(filePath) && Files.isDirectory(filePath)) {
-                fullFilePath = copyFileToDirectory(rootPath2020 + "\\" + projectFileName, targectDir + "\\" + projectFileName, nodeFileName);
-            }
+        String fullFilePath ="";
+        String innerDirName = getDealFilePath(projectFileName);//找到当前文件
+        if (StringUtils.isNotBlank(fullFilePath)) {
+            fullFilePath = copyFileToDirectory(rootPathAll +"\\" + innerDirName + "\\" + projectFileName, targectDir + "\\" + projectFileName, nodeFileName);
         }
-
         if (StringUtils.isNotBlank(fullFilePath)) {
             //这里进行文件关联
             String nodeAttachmentId = associationFile(fullFilePath, projectId, nodeId);
@@ -992,10 +984,28 @@ public class DealExcelServiceImpl {
             log.warn("未找到数据治理文件名称--附件材料：{}，请确认文件是否存在于路径{}或{}", projectFileName, rootPath2019, rootPath2020);
         }
 
+    }
+
 
+    public  String getDealFilePath(String projectFileName) {
+        String fullFilePath = "";
+        try {
+            for(String pathName : Constant.NODE_ATTACHMENT_NAME_LIST){
+                Path filePath = Paths.get(rootPathAll + "\\" +pathName+ "\\" + projectFileName);
+                if (Files.exists(filePath) && Files.isDirectory(filePath)) {
+                    fullFilePath =pathName;
+                    break;
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return "";
+        }
+        return fullFilePath;
     }
 
 
+
     //矢量数据处理  -- 数据治理文件名
     public void dealCurrentNodeGeom(String dzjgh, String nodeId) {
         if (StringUtils.isBlank(dzjgh)) {