Merge branch 'master' of http://114.244.114.158:8802/siwei/sanya-data-management-back into dev

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

@@ -82,4 +82,12 @@ public class DimEntityController extends BaseController {
         return RequestResult.success("操作成功", 0);
     }
 
+    @PostMapping("/entity/add/relationship/data")
+    public RequestResult addEntityRelationshipData() {
+        List<EntityRelationshipToNeo4jVo> list = dimEntityService.queryRelationshipDateByTableName("syst_实体关系表");
+        for (EntityRelationshipToNeo4jVo entityRelationshipToNeo4jVo : list) {
+            dimEntityService.createEntityRelationshipToNeo4j(entityRelationshipToNeo4jVo);
+        }
+        return RequestResult.success("操作成功", 0);
+    }
 }

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

@@ -32,4 +32,6 @@ public interface DimEntityService {
     Map<String, Object> queryEntityRelationshipFilter(Map map);
 
     List<Map> queryEntityColor();
+
+    List<EntityRelationshipToNeo4jVo> queryRelationshipDateByTableName(String tableName);
 }

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

@@ -174,7 +174,7 @@ public class DimEntityServiceImpl implements DimEntityService {
     @Override
     public void createEntityRelationshipToNeo4j(EntityRelationshipToNeo4jVo entityRelationshipToNeo4jVo) {
         //        String cql = "match (a:Entity {entityid:'MA1001NE103K1034230XXXXXXXXXXXXX2501010009'}), (b:Entity {entityid:'MA1001NE103K103423043622XXXXXXXX2301010018'}) MERGE (a)-[r:关系]->(b)";
-        String cql = "match " + "(a:Entity {entityid:'" + entityRelationshipToNeo4jVo.getEntityid() + "'})," + "(b:Entity {entityid:'" + entityRelationshipToNeo4jVo.getComentityid() + "'}) " + " MERGE (a)-[r:" + entityRelationshipToNeo4jVo.getComrelation() + "]->(b) ";
+        String cql = "MERGE (a:Entity {entityid:'" + entityRelationshipToNeo4jVo.getEntityid() + "'})" + " MERGE (b:Entity {entityid:'" + entityRelationshipToNeo4jVo.getComentityid() + "'}) " + " MERGE (a)-[r:" + entityRelationshipToNeo4jVo.getComrelation() + "]->(b) ";
         neo4jClient.query(cql).run();
     }
 
@@ -283,6 +283,12 @@ public class DimEntityServiceImpl implements DimEntityService {
         return retList;
     }
 
+    @Override
+    public List<EntityRelationshipToNeo4jVo> queryRelationshipDateByTableName(String tableName) {
+        List<EntityRelationshipToNeo4jVo> list = dimEntityMapper.queryRelationshipDateByTableName(tableName);
+        return list;
+    }
+
     @Override
     public Map<String, Object> queryEntityRelationshipFilter(Map map) {
         String query_data = (String) map.get("query_data");

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/yzt/ZymlServiceImpl.java

@@ -221,6 +221,8 @@ public class ZymlServiceImpl implements IZymlService {
                 c.setFavorite(cur.getMy());
                 c.setUrl(cur.getUrl());
                 c.setLegend(cur.getLegend());
+                c.setFwmc(cur.getFwmc());
+                c.setFwys(cur.getFwys());
                 treedata.add(c);
             }
             return RequestResult.success("成功", treedata);

onemap-modules/onemap-apply/src/main/resources/mapper/oracle/yzt/ZymlMapper.xml

@@ -155,7 +155,9 @@
           t.gltj as "gltj",
           t.sjly as "sjly",
           t.legend as "legend",
-        t.ywlx as "ywlx",
+          t.ywlx as "ywlx",
+          t.fwmc AS "fwmc",
+          t.fwys AS "fwys",
         #{username} as "my",
           null as "fzbsm",
           to_char(res.datetime ,'yyyy-MM-dd hh24:mi:ss') as "datetime",

onemap-modules/onemap-apply/src/main/resources/mapper/postgresql/yzt/ZymlMapper.xml

@@ -227,7 +227,9 @@
           t.gltj as "gltj",
           t.sjly as "sjly",
           t.legend as "legend",
-        t.ywlx as "ywlx",
+          t.ywlx as "ywlx",
+          t.fwmc AS "fwmc",
+          t.fwys AS "fwys",
         #{username} as "my",
         #{username} as "favorite"
        from T_YZT_ZYML t