合并代码

ruoyi-biemo/src/main/java/com/ruoyi/biemo/business/response/MyResultResponse.java

@@ -3,6 +3,7 @@ package com.ruoyi.biemo.business.response;
 import com.ruoyi.biemo.business.domain.Node;
 import com.ruoyi.biemo.business.domain.Relationship;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class MyResultResponse {
@@ -10,7 +11,13 @@ public class MyResultResponse {
     private List<Datas> results;
     private List<String> errors;
 
+    public MyResultResponse() {
+    }
+
     public List<String> getErrors() {
+        if (errors == null) {
+            errors = new ArrayList<>();
+        }
         return errors;
     }
 
@@ -19,6 +26,9 @@ public class MyResultResponse {
     }
 
     public List<Datas> getResults() {
+        if (results == null) {
+            results = new ArrayList<>();
+        }
         return results;
     }
 

ruoyi-biemo/src/main/java/com/ruoyi/biemo/business/service/DocInfoService.java

@@ -199,12 +199,22 @@ public class DocInfoService extends EsService<DocInfo> {
                     Node node1 = new Node();
                     //node1.setId(nodesMap.get(nodeName1));
                     node1.setId(nodeName1);
-                    node1.setLabels(new ArrayList<String>(){{add(nodeName1);}});
-                    node1.setProperties(new HashMap<String,Object>(){{put("name",nodeName1);put("email","9094908@qq.com");}});
+                    node1.setLabels(new ArrayList<String>() {{
+                        add(nodeName1);
+                    }});
+                    node1.setProperties(new HashMap<String, Object>() {{
+                        put("name", nodeName1);
+                        put("email", "9094908@qq.com");
+                    }});
                     Node node2 = new Node();
                     node2.setId(nodeName2);
-                    node2.setLabels(new ArrayList<String>(){{add(nodeName2);}});
-                    node2.setProperties(new HashMap<String,Object>(){{put("name",nodeName2);put("email","9094908@qq.com");}});
+                    node2.setLabels(new ArrayList<String>() {{
+                        add(nodeName2);
+                    }});
+                    node2.setProperties(new HashMap<String, Object>() {{
+                        put("name", nodeName2);
+                        put("email", "9094908@qq.com");
+                    }});
                     nodes.add(node1);
                     nodes.add(node2);
                     Relationship relationship = new Relationship();
@@ -212,7 +222,11 @@ public class DocInfoService extends EsService<DocInfo> {
                     relationship.setType(relationName);
                     relationship.setStartNode(nodeName1);
                     relationship.setEndNode(nodeName2);
-                    relationship.setProperties(new HashMap<String,Object>(){{put("source",nodeName1);put("relation",relationName);put("target",nodeName2);}});
+                    relationship.setProperties(new HashMap<String, Object>() {{
+                        put("source", nodeName1);
+                        put("relation", relationName);
+                        put("target", nodeName2);
+                    }});
                     relationships.add(relationship);
                 }
             }
@@ -295,21 +309,48 @@ public class DocInfoService extends EsService<DocInfo> {
         return summary;
     }
 
-//        不用集合耗时：293270952500     不用集合耗时：245180467700
+
+    //    //社会网络分析
+//    public List<MyResultResponse> socialNetworkAnalysis(String[] ids) {
+//        List<MyResultResponse> list = new ArrayList<>();
+//        long stratTime = System.nanoTime();
+//        if (ids != null && ids.length > 0) {
+//            for (int i = 0; i < ids.length; i++) {
+////                list.add(analysis(ids[i], true));
+//                list.add(analysis(ids[i], false));
+//            }
+//        }
+//        long endTime = System.nanoTime();
+//        System.out.println("方法耗时：" + (endTime - stratTime));
+//        return list;
 //    }
     //社会网络分析
-    public List<MyResultResponse> socialNetworkAnalysis(String[] ids) {
-        List<MyResultResponse> list = new ArrayList<>();
-        long stratTime = System.nanoTime();
+    public MyResultResponse socialNetworkAnalysis(String[] ids) {
+        MyResultResponse response2 = new MyResultResponse();
+        MyResultResponse response3 = new MyResultResponse();
         if (ids != null && ids.length > 0) {
             for (int i = 0; i < ids.length; i++) {
-//                list.add(analysis(ids[i], true));
-                list.add(analysis(ids[i], true));
+                if (i == 0) {
+                    response2 = analysis(ids[0], false);
+                } else {
+                    response3 = analysis(ids[1], false);
                 }
             }
-        long endTime = System.nanoTime();
-        System.out.println("不用集合耗时：" + (endTime - stratTime));
-        return list;
+        }
+        MyResultResponse myResultResponse = new MyResultResponse();
+        List<MyResultResponse.Datas> results =  new ArrayList<>();
+        List<MyResultResponse.Datas> results2 = response2.getResults();
+        List<MyResultResponse.Datas> results3 = response3.getResults();
+
+        results.addAll(0,results3);
+        results.addAll(1,results2);
+
+        List<String> errors = myResultResponse.getErrors();
+        errors.addAll(response2.getErrors());
+        errors.addAll(response3.getErrors());
+        myResultResponse.setResults(results);
+        myResultResponse.setErrors(errors);
+         return myResultResponse;
     }
 
     //文章管理--批量分析