SGTY преди 7 месеца
родител
ревизия
0dbb4ee839

+ 4 - 4
src/main/java/com/qizhen/healsphere/config/Neo4jUtil.java

@@ -10,14 +10,14 @@ import org.springframework.context.annotation.Configuration;
 public class Neo4jUtil {
 
 //    @Value("${spring.neo4j.uri}")
-    private static String url = "bolt://173.18.12.194:7687";
-//    private static String url = "bolt://172.16.8.59:7687";
+    //private static String url = "bolt://173.18.12.194:7687";
+    private static String url = "bolt://172.16.8.59:7687";
 //    @Value("${spring.neo4j.authentication.username}")
     private static String username = "neo4j";
 
 //    @Value("${spring.neo4j.authentication.password}")
-    private static String password = "12345678";
-//    private static String password = "1Qaz@wsx";
+//    private static String password = "12345678";
+    private static String password = "1Qaz@wsx";
 
     private static Driver driver;
 

+ 8 - 8
src/main/java/com/qizhen/healsphere/repository/neo4j/BaseRelationshipRepository.java

@@ -20,18 +20,18 @@ public class BaseRelationshipRepository {
      * @param properties
      */
     public void createRelationship(String startLabel, Long startId, String endLabel, Long endId, String relationshipType, Map<String, Object> properties) {
-        StringBuilder setClause = new StringBuilder();
-        properties.forEach((key, value) -> setClause.append("r.").append(key).append(" = '").append(value).append("'").append(", "));
-
-        if (setClause.length() > 0) {
-            setClause.setLength(setClause.length() - 2);
-        }
+//        StringBuilder setClause = new StringBuilder();
+//        properties.forEach((key, value) -> setClause.append("r.").append(key).append(" = '").append(value).append("'").append(", "));
+//
+//        if (setClause.length() > 0) {
+//            setClause.setLength(setClause.length() - 2);
+//        }
 
         String query = String.format(
                 "MATCH (a:`%s`), (b:`%s`) WHERE id(a) = $startId AND id(b) = $endId " +
                         "MERGE (a)-[r:`%s`]->(b) " +
-                        "SET %s RETURN r",
-                startLabel, endLabel, relationshipType, setClause
+                        "RETURN r",
+                startLabel, endLabel, relationshipType
         );
 
         try(Session session = Neo4jUtil.getSession()) {

+ 1 - 0
src/main/java/com/qizhen/healsphere/service/impl/RelationshipServiceImpl.java

@@ -39,6 +39,7 @@ public class RelationshipServiceImpl implements RelationshipService {
             // 如果所有关系都成功创建,则返回 true
             return true;
         } catch (Exception e) {
+            e.printStackTrace();
             return false;
         }
     }

+ 5 - 5
src/test/java/com/qizhen/healsphere/DataWriteTest.java

@@ -61,16 +61,16 @@ public class DataWriteTest {
                     }
                     try{
                         JSONArray jsonArray = JSONArray.parseArray(value);
-                        BaseEntity fromEntity = createNoExists(startLabel, temp.getEntity());
-                        startId = fromEntity.getId();
+                        BaseEntity startEntity = createNoExists(startLabel, temp.getEntity());
+                        startId = startEntity.getId();
                         List<RelationshipVO> relationshipList = new ArrayList<>();
                         for(int i=0;i<jsonArray.size();i++){
                             String name = jsonArray.getString(i);
                             if(StringUtils.isEmpty(name)){
                                 continue;
                             }
-                            BaseEntity toEntity =  createNoExists(endLabel, name);
-                            Long endId = toEntity.getId();
+                            BaseEntity endEntity =  createNoExists(endLabel, name);
+                            Long endId = endEntity.getId();
                             RelationshipVO relationshipVO = new RelationshipVO();
                             relationshipVO.setStartId(startId);
                             relationshipVO.setEndId(endId);
@@ -80,7 +80,7 @@ public class DataWriteTest {
                             relationshipList.add(relationshipVO);
                         }
                         if(!CollectionUtils.isEmpty(relationshipList)) {
-                            relationshipService.createRelationship(relationshipList);
+                            System.out.println( relationshipService.createRelationship(relationshipList));
                         }
                     }catch (Exception e){
                         e.printStackTrace();