文件上传初始化调整

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

@@ -16,7 +16,9 @@ import com.siwei.apply.mapper.*;
 import com.siwei.apply.service.NodeAttachmentService;
 import com.siwei.apply.service.NodeLandService;
 import com.siwei.apply.service.ProjectService;
+import com.siwei.apply.utils.FileExtractUtil;
 import com.siwei.apply.utils.JsonUtil;
+import com.siwei.apply.utils.ServiceFileUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.io.FileUtils;
@@ -29,6 +31,7 @@ import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.*;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -395,17 +398,25 @@ public class ProjectImpl implements ProjectService {
 
     @Override
     public void testData() {
-        String nodeId = null;
-        List<ProjectWorkflow> projectWorkflows = projectWorkflowMapper.selectByProjectIdAndNodeTableName("11111", "22222");
-        Optional<ProjectWorkflow> res = projectWorkflows.stream().findFirst();
-        if(res.isPresent()){
-            nodeId = res.get().getNodeId();
-        }
-        log.info("------------"+nodeId);
+//        String nodeId = null;
+//        List<ProjectWorkflow> projectWorkflows = projectWorkflowMapper.selectByProjectIdAndNodeTableName("11111", "22222");
+//        Optional<ProjectWorkflow> res = projectWorkflows.stream().findFirst();
+//        if(res.isPresent()){
+//            nodeId = res.get().getNodeId();
+//        }
+//        log.info("------------"+nodeId);
+//
+//        NodeAttachment ccc = nodeAttachmentService.getByNodeId("4eafe114-a812-4c2b-bcb3-ad470ff96fa9");
+//        String sss = JsonUtil.toJson(ccc);
+//        System.out.println(sss);
+
+            String str = "国有建设用地使用权及房屋所有权首次登记";
+            String path = ServiceFileUtil.createDirectory(str);
+            Path file = Paths.get(path);
+            Map<String, Object> res = FileExtractUtil.getDirectoryStructure(file);
+            log.info("------------"+res);
+
 
-        NodeAttachment ccc = nodeAttachmentService.getByNodeId("4eafe114-a812-4c2b-bcb3-ad470ff96fa9");
-        String sss = JsonUtil.toJson(ccc);
-        System.out.println(sss);
 
     }
 

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/utils/ServiceFileUtil.java

@@ -0,0 +1,54 @@
+package com.siwei.apply.utils;
+
+import com.siwei.common.core.exception.ServiceException;
+import com.siwei.common.core.utils.DateUtils;
+import com.siwei.common.core.utils.StringUtils;
+import com.siwei.common.core.utils.uuid.Seq;
+import org.apache.commons.io.FilenameUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+/**
+ * 文件工具类
+ */
+public class ServiceFileUtil {
+    
+    private static final Logger logger = LoggerFactory.getLogger(ServiceFileUtil.class);
+
+    private static final String createFilePath = "/home/siwei/uploadPath";
+
+    /**
+     * 编码目录名
+     */
+    public static final String extractFilename(String name)
+    {
+        return StringUtils.format("{}/{}_{}", DateUtils.datePath(),
+                FilenameUtils.getBaseName(name), Seq.getId(Seq.uploadSeqType));
+    }
+
+    //给定一个名称创建一个目录,返回路径
+    public static String  createDirectory(String directoryName) {
+        String directoryPathAndName = null;
+        try {
+            directoryPathAndName =createFilePath+"/"+ extractFilename(directoryName);
+            Path file = Paths.get(directoryPathAndName);
+            if (Files.exists(file)) {
+                logger.warn("处理文件失败：文件不存在: {}", directoryPathAndName);
+            }else {
+                //直接创建目录
+                Path extractPath = Paths.get(directoryPathAndName);
+                Files.createDirectories(extractPath);
+            }
+        } catch (IOException e) {
+            throw new ServiceException("创建目录失败,请检查!"+e.getMessage());
+        }
+        return directoryPathAndName;
+    }
+
+
+}

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/utils/ServiceUtil.java

@@ -2,6 +2,7 @@ package com.siwei.apply.utils;
 
 import com.siwei.apply.domain.NodeAttachment;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.*;
 
@@ -24,7 +25,8 @@ public class ServiceUtil {
             if (CollectionUtils.isNotEmpty(childrenList)) {
                 for (Map childMap : childrenList) {
                     String childName = (String) childMap.get("name");
-                    if (childName.equalsIgnoreCase(dirName)) {
+                    //if (childName.equalsIgnoreCase(dirName)) {
+                    if (StringUtils.containsIgnoreCase(childName, dirName)) {
                         list = (List<Map<String, String>>) childMap.get("children");
                         break;
                     }
@@ -38,4 +40,9 @@ public class ServiceUtil {
 
 
 
+
+
+
+
+
 }