Browse Source

fix: 修复ssh扫描文件排序问题

weijianghai 2 years ago
parent
commit
510bf4bf07

+ 2 - 1
src/main/java/com/nokia/common/ssh/SSHUtil.java

@@ -16,6 +16,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
 import java.util.Vector;
+import java.util.stream.Collectors;
 
 /**
  * 使用jsch库实现的ssh的工具类
@@ -69,7 +70,7 @@ public class SSHUtil {
             session.disconnect();
         }
 
-        return fileNameList;
+        return fileNameList.stream().sorted().collect(Collectors.toList());
     }
 
     /**

+ 22 - 0
src/main/java/com/nokia/pm_interface_5g/task/FiveGPmTask.java

@@ -34,6 +34,8 @@ import java.text.SimpleDateFormat;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 @Data
 @Component
@@ -90,6 +92,26 @@ public class FiveGPmTask {
         }
     }
 
+    @XxlJob("pm5gRestHandler")
+    public void pm5gRestHandler() {
+        // 读取目标文件夹下的文件
+        try (Stream<Path> stream = Files.list(Paths.get(distinctTargetDir))) {
+            List<Path> pathList = stream.collect(Collectors.toList());
+            log.info("pathList: {}", pathList);
+            XxlJobHelper.log("pathList: {}", pathList);
+            for (Path t : pathList) {
+                String filename = t.getFileName().toString();
+                log.info("file: {}", filename);
+                XxlJobHelper.log("file: {}", filename);
+                gpload(filename);
+            }
+        } catch (Exception e) {
+            log.error("发生异常了: {}", e.getMessage(), e);
+            XxlJobHelper.log("发生异常了: {}", e.getMessage(), e);
+            XxlJobHelper.handleFail(e.getMessage());
+        }
+    }
+
     /**
      * 单一任务
      *