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

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

@@ -22,11 +22,15 @@ public class DimEntityController extends BaseController {
     @Resource
     private DimEntityService dimEntityService;
 
+    // 查询树结构
     @GetMapping("/entity/code/table/tree")
     public RequestResult queryEntityCodeTableTree(String id) {
+        // 实体图元关联表:建立关联关系
+        // 根据表名称查询数量
         return RequestResult.success(dimEntityService.queryEntityCodeTableTree(id));
     }
 
+    // 查询类别列表
     @GetMapping("/entity/code/table/list")
     public TableDataInfo queryEntityCodeTableList(String id, String entityid, String entityname) {
         List<String> tablesList = dimEntityService.queryEntityCodeTableListFront(id);
@@ -37,11 +41,13 @@ public class DimEntityController extends BaseController {
         return getDataTable(dimEntityService.queryEntityCodeTableList(id, entityid, entityname, tablesList));
     }
 
+    // 查询单个实体图元信息
     @GetMapping("/entity/data")
     public RequestResult queryEntityData(String entityid) {
         return RequestResult.success(dimEntityService.queryEntityData(entityid));
     }
 
+    // 查询实体图元关系
     @GetMapping("/entity/relationship")
     public RequestResult queryEntityRelationship(String entityid) {
         return RequestResult.success(dimEntityService.queryEntityRelationshipToNeo4j(entityid));

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/yzt/ZymlTreeDataDTO.java

@@ -2,7 +2,6 @@ package com.onemap.apply.domain.yzt;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.sun.org.apache.xpath.internal.operations.Bool;
 
 import java.util.ArrayList;
 import java.util.Date;

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

@@ -68,10 +68,11 @@ public class DimEntityServiceImpl implements DimEntityService {
     public Map<String, Object> queryEntityData(String entityid) {
         Map<String, Object> result = new HashMap<>();
         //获取所有的实体关系表
-        List<String> tablesList = dimEntityMapper.querySchemaTableByName("vector", "实体图元关联表");
+        List<String> tablesList = dimEntityMapper.querySchemaTableByName("vector", "syst_实体图元关联表");
         if (tablesList == null || tablesList.size() == 0) {
             return result;
         }
+        // ###### TODO：这里用到了关联关系图层
         List<EntityRelationshipVo> relationshipVos = dimEntityMapper.queryEntityRelationshipDataByEntityId(entityid, tablesList);
         if (relationshipVos == null || relationshipVos.size() == 0) {
             return result;
@@ -125,7 +126,7 @@ public class DimEntityServiceImpl implements DimEntityService {
             return;
         }
         //获取所有的实体关系表
-        List<String> tablesList = dimEntityMapper.querySchemaTableByName("vector", "实体图元关联表");
+        List<String> tablesList = dimEntityMapper.querySchemaTableByName("vector", "syst_实体图元关联表");
 
 
         //通过实体关系表，获取实体关系表中，所有映射的实体代理点。此处创建视图，视图将一个小时后删除

onemap-modules/onemap-apply/src/main/resources/mapper/postgresql/dimentity/DimEntityMapper.xml

@@ -138,7 +138,7 @@
                        ${viewSql}
                        ) x
               group by entilayer) v1
-                 left join base.t_entity_code_table v2 on LOWER(v1.entilayer) like concat('%', LOWER(v2.entilayer))
+                 left join base.t_entity_code_table v2 on LOWER(v1.entilayer) like concat('%', LOWER(v2.entilayer), '%')
     </update>
 
     <select id="queryRelationshipDateByTableName" parameterType="String" resultMap="EntityRelationshipToNeo4jVoResult">