实体关系接口

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/dimentity/DimEntityController.java

@@ -1,79 +1,55 @@
 package com.onemap.apply.controller.dimentity;
 
-import com.onemap.apply.domain.dimentity.DimEntityDto;
+import com.onemap.apply.domain.dimentity.EntityRelationshipToNeo4jVo;
 import com.onemap.apply.mapper.dimentity.DimEntityReponsitory;
 import com.onemap.apply.service.dimentity.DimEntityService;
+import com.onemap.common.core.utils.StringUtils;
 import com.onemap.common.core.web.domain.RequestResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.neo4j.core.Neo4jClient;
-import org.springframework.data.neo4j.core.Neo4jTemplate;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Map;
 
 @RestController
 @RequestMapping("dimentity")
 public class DimEntityController {
-
-    @Autowired
-    private DimEntityReponsitory dimEntityReponsitory;
-    @Autowired
-    private Neo4jClient neo4jClient;
     @Resource
     private DimEntityService dimEntityService;
 
     @GetMapping("/entity/code/table/tree")
-    public RequestResult queryEntityCodeTableTree(String id) throws IOException {
+    public RequestResult queryEntityCodeTableTree(String id) {
         return RequestResult.success(dimEntityService.queryEntityCodeTableTree(id));
     }
 
     @GetMapping("/entity/data")
-    public RequestResult queryEntityData(String entityid) throws IOException {
+    public RequestResult queryEntityData(String entityid) {
         return RequestResult.success(dimEntityService.queryEntityData(entityid));
     }
 
-    @GetMapping("/test")
-    public RequestResult test() throws IOException {
-        dimEntityService.TestToNe04j();
-        return RequestResult.success("操作成功", 0);
+    @GetMapping("/entity/relationship")
+    public RequestResult queryEntityRelationship(String entityid) {
+        return RequestResult.success(dimEntityService.queryEntityRelationshipToNeo4j(entityid));
     }
 
-//    @GetMapping("/test")
-//    public RequestResult test() throws IOException {
-////        List<DimEntityDto> dtoList = dimEntityReponsitory.findAll();
-////        MovieEntity movieEntity = new MovieEntity("电影名001", "电影名001");
-////        movieRepository.save(movieEntity);
-////        return RequestResult.success(movieRepository.findAll());
-//
-////        dimEntityReponsitory.findEntityRelationships3();
-////        DimEntityDto f = new DimEntityDto();
-////        f.setEntityid("MA1001NE103K1034230XXXXXXXXXXXXX2501010009");
-////        dimEntityReponsitory.findAll()
-//
-//
-//        DimEntityDto g = dimEntityReponsitory.findEntityRelationships4("MA1001NE103K1034230XXXXXXXXXXXXX2501010009");
-//        System.out.println(g);
-//
-////        dimEntityReponsitory.findEntityRelationships5("MA1001NE103K1034230XXXXXXXXXXXXX2501010009", "MA1001NE103K103423043622XXXXXXXX2301010018", "12");
-//
-////        String relationshipType="12";
-////        // 构建 Cypher 查询来创建关系
-////        String cypherQuery = "MATCH (a:Person {id: $personId1}), (b:Person {id: $personId2}) " +
-////                "CREATE (a)-[r:" + relationshipType + "]->(b) " +
-////                "RETURN r";
-//
-//        String cql = "match (a:Entity {entityid:'MA1001NE103K1034230XXXXXXXXXXXXX2501010009'}), (b:Entity {entityid:'MA1001NE103K103423043622XXXXXXXX2301010018'}) MERGE (a)-[r:关系]->(b)";
-//        neo4jClient.query(cql).run();
-//
-//        Collection<Map<String, Object>> all = neo4jClient
-//                .query("match (n:Entity{ entityid:'MA1001NE103K1034230XXXXXXXXXXXXX2501010009'}) <-[r]->(b:Entity)  return b.entityid, type(r)")
-//                .fetch().all();
-//        return RequestResult.success(all);
-//    }
+    @GetMapping("/entity/add/relationship")
+    public RequestResult addEntityRelationship(EntityRelationshipToNeo4jVo entityRelationshipToNeo4jVo) {
+        if (entityRelationshipToNeo4jVo == null) {
+            return RequestResult.error("参数缺失");
+        }
+        if (StringUtils.isEmpty(entityRelationshipToNeo4jVo.getComentityid())) {
+            return RequestResult.error("参数缺失");
+        }
+        if (StringUtils.isEmpty(entityRelationshipToNeo4jVo.getEntityid())) {
+            return RequestResult.error("参数缺失");
+        }
+        if (StringUtils.isEmpty(entityRelationshipToNeo4jVo.getComrelation())) {
+            return RequestResult.error("参数缺失");
+        }
+        dimEntityService.createEntityRelationshipToNeo4j(entityRelationshipToNeo4jVo);
+        return RequestResult.success("操作成功", 0);
+    }
 
 }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/dimentity/DimEntityService.java

@@ -24,6 +24,4 @@ public interface DimEntityService {
 
     Map<String, Object> queryEntityRelationshipToNeo4j(String entityid);
 
-    void TestToNe04j();
-
 }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/dimentity/impl/DimEntityServiceImpl.java

@@ -180,89 +180,4 @@ public class DimEntityServiceImpl implements DimEntityService {
         return retMap;
     }
 
-    @Override
-    public void TestToNe04j() {
-        System.out.println("TestToNe04j.............");
-        //创建视图
-//        String viewTableName = StringUtils.getTemporaryTableName();
-        //添加测试数据
-//        DimEntityDto dimEntityDto_do = new DimEntityDto();
-//        dimEntityDto_do.setEntityid(viewTableName);
-//        dimEntityDto_do.setEntilayer(viewTableName);
-//        DimEntityDto dimEntityDto_d2 = addEntityToNeo4j(dimEntityDto_do);
-//        System.out.println(dimEntityDto_d2.toString());
-
-        //删除单条数据
-//        removeOneEntityToNeo4j("temporary_1735180866846_203031d59ffb4c178fb1c193b2585657");
-
-        //创建关系
-//        String viewTableNamed1 = StringUtils.getTemporaryTableName();
-//        DimEntityDto dimEntityDto_d1 = new DimEntityDto();
-//        dimEntityDto_d1.setEntityid(viewTableNamed1);
-//        dimEntityDto_d1.setEntilayer(viewTableNamed1);
-//        DimEntityDto dimEntityDto_d2 = addEntityToNeo4j(dimEntityDto_d1);
-//        System.out.println(dimEntityDto_d2.toString());
-//        String viewTableNamed2 = StringUtils.getTemporaryTableName();
-//        DimEntityDto dimEntityDto_d3 = new DimEntityDto();
-//        dimEntityDto_d3.setEntityid(viewTableNamed2);
-//        dimEntityDto_d3.setEntilayer(viewTableNamed2);
-//        DimEntityDto dimEntityDto_d4 = addEntityToNeo4j(dimEntityDto_d3);
-//        System.out.println(dimEntityDto_d4.toString());
-//
-//        EntityRelationshipToNeo4jVo entityRelationshipToNeo4jVod5 = new EntityRelationshipToNeo4jVo();
-//        entityRelationshipToNeo4jVod5.setEntilayer(dimEntityDto_d2.getEntilayer());
-//        entityRelationshipToNeo4jVod5.setEntityid(dimEntityDto_d2.getEntityid());
-//        entityRelationshipToNeo4jVod5.setComilayer(dimEntityDto_d4.getEntilayer());
-//        entityRelationshipToNeo4jVod5.setComentityid(dimEntityDto_d4.getEntityid());
-//        entityRelationshipToNeo4jVod5.setComrelation("正向");
-//        createEntityRelationshipToNeo4j(entityRelationshipToNeo4jVod5);
-//
-//        EntityRelationshipToNeo4jVo entityRelationshipToNeo4jVod6 = new EntityRelationshipToNeo4jVo();
-//        entityRelationshipToNeo4jVod6.setEntilayer(dimEntityDto_d4.getEntilayer());
-//        entityRelationshipToNeo4jVod6.setEntityid(dimEntityDto_d4.getEntityid());
-//        entityRelationshipToNeo4jVod6.setComilayer(dimEntityDto_d2.getEntilayer());
-//        entityRelationshipToNeo4jVod6.setComentityid(dimEntityDto_d2.getEntityid());
-//        entityRelationshipToNeo4jVod6.setComrelation("反向");
-//        createEntityRelationshipToNeo4j(entityRelationshipToNeo4jVod6);
-
-        //查询关系，并返回结果
-        // MA1001NE103K1034230XXXXXXXXXXXXX2501010009
-//        Map<String, Object> RelationshipDatad0 = queryEntityRelationshipToNeo4j("MA1001NE103K1034230XXXXXXXXXXXXX2501010009");
-//        System.out.println(JSON.toJSONString(RelationshipDatad0));
-
-        //清除所有
-//        removeAllEntityToNeo4j();
-
-        //批量添加数据及关系
-        List<String> tablesListd0 = dimEntityMapper.querySchemaTableByName("vector", "实体关系表");
-        Set<String> tableSetd0 = new HashSet<>();
-        for (String tableName : tablesListd0) {
-            List<EntityRelationshipToNeo4jVo> list = dimEntityMapper.queryRelationshipDateByTableName(tableName);
-            for (EntityRelationshipToNeo4jVo entityRelationshipToNeo4jVo : list) {
-                String d0 = entityRelationshipToNeo4jVo.getComentityid();
-                String d1 = entityRelationshipToNeo4jVo.getComilayer();
-                if (!tableSetd0.contains(d0)) {
-                    DimEntityDto dimEntityDto_d1 = new DimEntityDto();
-                    dimEntityDto_d1.setEntityid(d0);
-                    dimEntityDto_d1.setEntilayer(d1);
-                    addEntityToNeo4j(dimEntityDto_d1);
-                    tableSetd0.add(d0);
-                }
-
-                String d2 = entityRelationshipToNeo4jVo.getEntityid();
-                String d3 = entityRelationshipToNeo4jVo.getEntilayer();
-                if (!tableSetd0.contains(d2)) {
-                    DimEntityDto dimEntityDto_d1 = new DimEntityDto();
-                    dimEntityDto_d1.setEntityid(d2);
-                    dimEntityDto_d1.setEntilayer(d3);
-                    addEntityToNeo4j(dimEntityDto_d1);
-                    tableSetd0.add(d2);
-                }
-                createEntityRelationshipToNeo4j(entityRelationshipToNeo4jVo);
-            }
-        }
-
-
-    }
-
 }