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

onemap-api/onemap-api-system/src/main/java/com/onemap/system/api/AnalyseService.java

@@ -3,7 +3,7 @@ package com.onemap.system.api;
 import com.onemap.common.core.constant.ServiceNameConstants;
 import com.onemap.common.core.domain.R;
 import com.onemap.common.core.web.domain.RequestResult;
-import com.onemap.system.api.domain.AnalyseUtilsVo;
+import com.onemap.system.api.domain.*;
 import com.onemap.system.api.factory.AnalyseFallbackFactory;
 import com.onemap.system.api.factory.RemoteAuthFallbackFactory;
 import com.onemap.system.api.factory.RemoteLogFallbackFactory;
@@ -11,6 +11,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 分析服务
@@ -18,34 +19,15 @@ import java.util.List;
 @FeignClient(contextId = "analyseService", value = ServiceNameConstants.ANALYSE_SERVICE, fallbackFactory = AnalyseFallbackFactory.class)
 public interface AnalyseService {
 
-    /**
-     * table中与wkt数据是否有交集
-     */
     @PostMapping("/analyse/db/intersects/table_wkt")
-    public RequestResult intersectsTableWkt(
-            @RequestParam(value = "inputTable") String inputTable,
-            @RequestParam(value = "inputSRID", required = false) Integer inputSRID,
-            @RequestParam(value = "inputIds", required = false) List<String> inputIds,
-            @RequestParam(value = "intersectsWkt") String intersectsWkt,
-            @RequestParam(value = "intersectsWktSRID", required = false) Integer intersectsWktSRID);
+    public RequestResult intersectsTableWkt(@RequestBody IntersectsTableWktVo intersectsTableWktVo);
 
-    /**
-     * table中与wkt数据是否有交集
-     */
-    @PostMapping("/analyse/db/intersects/table_wkt_v1")
-    public RequestResult intersectsTableWktV1(@RequestBody AnalyseUtilsVo analyseUtilsVo);
+    @PostMapping("/create/db/intersection/table_wkt")
+    public RequestResult intersectionTableWkt(@RequestBody IntersectionTableWktVo intersectionTableWktVo);
 
+    @PostMapping("/table/date/raw_table")
+    public RequestResult rawTable(@RequestBody RawTableVo rawTableVo);
 
-    @PostMapping("/analyse/db/intersection/table_wkt")
-    public RequestResult intersectionTableWkt(
-            @RequestParam(value = "inputTable") String inputTable,
-            @RequestParam(value = "inputSRID", required = false) Integer inputSRID,
-            @RequestParam(value = "inputIds", required = false) List<String> inputIds,
-            @RequestParam(value = "intersectionWkt") String intersectionWkt,
-            @RequestParam(value = "intersectionWktSRID", required = false) Integer intersectionWktSRID,
-            @RequestParam(value = "outputColumn", required = false) List<String> outputColumn);
-
-    @PostMapping("/analyse/db/intersection/table_wkt_v1")
-    public RequestResult intersectionTableWktV1(@RequestBody AnalyseUtilsVo analyseUtilsVo);
-
+    @PostMapping("/table/date/target_table")
+    public RequestResult targetTable(@RequestBody TargetTableVo targetTableVo);
 }

onemap-api/onemap-api-system/src/main/java/com/onemap/system/api/domain/ContainsTableWktVo.java

@@ -0,0 +1,33 @@
+package com.onemap.system.api.domain;
+
+import java.util.List;
+
+public class ContainsTableWktVo {
+    String tableName;
+    List<String> tableIds;
+    String ewkt;
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName;
+    }
+
+    public List<String> getTableIds() {
+        return tableIds;
+    }
+
+    public void setTableIds(List<String> tableIds) {
+        this.tableIds = tableIds;
+    }
+
+    public String getEwkt() {
+        return ewkt;
+    }
+
+    public void setEwkt(String ewkt) {
+        this.ewkt = ewkt;
+    }
+}

onemap-api/onemap-api-system/src/main/java/com/onemap/system/api/domain/IntersectionTableWktVo.java

@@ -0,0 +1,33 @@
+package com.onemap.system.api.domain;
+
+import java.util.List;
+
+public class IntersectionTableWktVo {
+    private String tableName;
+    private List<String> tableIds;
+    private String ewkt;
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName;
+    }
+
+    public List<String> getTableIds() {
+        return tableIds;
+    }
+
+    public void setTableIds(List<String> tableIds) {
+        this.tableIds = tableIds;
+    }
+
+    public String getEwkt() {
+        return ewkt;
+    }
+
+    public void setEwkt(String ewkt) {
+        this.ewkt = ewkt;
+    }
+}

onemap-api/onemap-api-system/src/main/java/com/onemap/system/api/domain/IntersectsTableWktVo.java

@@ -0,0 +1,33 @@
+package com.onemap.system.api.domain;
+
+import java.util.List;
+
+public class IntersectsTableWktVo {
+    private String tableName;
+    private List<String> tableIds;
+    private String ewkt;
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName;
+    }
+
+    public List<String> getTableIds() {
+        return tableIds;
+    }
+
+    public void setTableIds(List<String> tableIds) {
+        this.tableIds = tableIds;
+    }
+
+    public String getEwkt() {
+        return ewkt;
+    }
+
+    public void setEwkt(String ewkt) {
+        this.ewkt = ewkt;
+    }
+}

onemap-api/onemap-api-system/src/main/java/com/onemap/system/api/domain/RawTableVo.java

@@ -0,0 +1,63 @@
+package com.onemap.system.api.domain;
+
+import java.util.List;
+
+/**
+ * 获取原始表的信息
+ */
+public class RawTableVo {
+    private String rawTableName; // 原始表名
+    private List<String> ids;  // id
+    private List<String> columns; // 列名
+    private Boolean siweiArea; // 是否需要计算面积
+    private Integer srid;  // srid
+    private Boolean isGeography = true;
+
+    public String getRawTableName() {
+        return rawTableName;
+    }
+
+    public void setRawTableName(String rawTableName) {
+        this.rawTableName = rawTableName;
+    }
+
+    public List<String> getIds() {
+        return ids;
+    }
+
+    public void setIds(List<String> ids) {
+        this.ids = ids;
+    }
+
+    public List<String> getColumns() {
+        return columns;
+    }
+
+    public void setColumns(List<String> columns) {
+        this.columns = columns;
+    }
+
+    public Boolean getSiweiArea() {
+        return siweiArea;
+    }
+
+    public void setSiweiArea(Boolean siweiArea) {
+        this.siweiArea = siweiArea;
+    }
+
+    public Integer getSrid() {
+        return srid;
+    }
+
+    public void setSrid(Integer srid) {
+        this.srid = srid;
+    }
+
+    public Boolean getIsGeography() {
+        return isGeography;
+    }
+
+    public void setsIsGeography(Boolean isGeography) {
+        isGeography = isGeography;
+    }
+}

onemap-api/onemap-api-system/src/main/java/com/onemap/system/api/domain/TargetTableVo.java

@@ -0,0 +1,17 @@
+package com.onemap.system.api.domain;
+
+
+/**
+ * 通过生成的空间表获取原始表的数据
+ */
+public class TargetTableVo extends RawTableVo {
+    private String targetTableName;
+
+    public String getTargetTableName() {
+        return targetTableName;
+    }
+
+    public void setTargetTableName(String targetTableName) {
+        this.targetTableName = targetTableName;
+    }
+}

onemap-api/onemap-api-system/src/main/java/com/onemap/system/api/factory/AnalyseFallbackFactory.java

@@ -1,16 +1,16 @@
 package com.onemap.system.api.factory;
 
-import com.onemap.common.core.domain.R;
 import com.onemap.common.core.web.domain.RequestResult;
 import com.onemap.system.api.AnalyseService;
-import com.onemap.system.api.RemoteAuthService;
-import com.onemap.system.api.domain.AnalyseUtilsVo;
+import com.onemap.system.api.domain.IntersectionTableWktVo;
+import com.onemap.system.api.domain.IntersectsTableWktVo;
+import com.onemap.system.api.domain.RawTableVo;
+import com.onemap.system.api.domain.TargetTableVo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
-
-import java.util.List;
+import org.springframework.web.bind.annotation.RequestBody;
 
 @Component
 public class AnalyseFallbackFactory implements FallbackFactory<AnalyseService> {
@@ -21,24 +21,24 @@ public class AnalyseFallbackFactory implements FallbackFactory<AnalyseService> {
         log.error("分析服务调用失败:{}", throwable.getMessage());
         return new AnalyseService() {
             @Override
-            public RequestResult intersectsTableWkt(String inputTable, Integer inputSRID, List<String> inputIds, String intersectsWkt, Integer intersectsWktSRID) {
+            public RequestResult intersectsTableWkt(IntersectsTableWktVo intersectsTableWktVo) {
                 return RequestResult.error("内部错误");
             }
 
             @Override
-            public RequestResult intersectsTableWktV1(AnalyseUtilsVo vo) {
+            public RequestResult intersectionTableWkt(IntersectionTableWktVo intersectionTableWktVo) {
                 return RequestResult.error("内部错误");
             }
 
             @Override
-            public RequestResult intersectionTableWkt(String inputTable, Integer inputSRID, List<String> inputIds, String intersectionWkt, Integer intersectionWktSRID, List<String> outputColumn) {
+            public RequestResult rawTable(@RequestBody RawTableVo rawTableVo) {
                 return RequestResult.error("内部错误");
             }
 
             @Override
-            public RequestResult intersectionTableWktV1(AnalyseUtilsVo vo) {
+            public RequestResult targetTable(@RequestBody TargetTableVo targetTableVo) {
                 return RequestResult.error("内部错误");
             }
         };
     }
-}
+}

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/controller/analyse/AnalyseUtilsDBController.java

@@ -28,7 +28,7 @@ public class AnalyseUtilsDBController extends BaseController {
      */
     @PostMapping("/intersects/table_wkt")
     @Slave
-    public RequestResult intersectsTableWktV(@RequestBody IntersectsTableWktVo analyseUtilsVo) {
+    public RequestResult intersectsTableWkt(@RequestBody IntersectsTableWktVo analyseUtilsVo) {
         if (analyseUtilsVo == null) {
             RequestResult.error("analyseUtilsVo is null");
         }

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/controller/analyse/CreateUtilsDBController.java

@@ -1,9 +1,6 @@
 package com.onemap.analyse.controller.analyse;
 
-import com.onemap.analyse.domain.vo.BufferColumnTablesVo;
-import com.onemap.analyse.domain.vo.BufferTablesVo;
-import com.onemap.analyse.domain.vo.DifferenceTablesVo;
-import com.onemap.analyse.domain.vo.IntersectsTableWktVo;
+import com.onemap.analyse.domain.vo.*;
 import com.onemap.analyse.service.CreateUtilsDBService;
 import com.onemap.common.core.web.controller.BaseController;
 import com.onemap.common.core.web.domain.RequestResult;
@@ -38,7 +35,6 @@ public class CreateUtilsDBController extends BaseController {
         String newTable = createUtilsDBService.bufferTable(
                 bufferTablesVo.getTableName(),
                 bufferTablesVo.getRadius());
-
         Map<String, String> result = new HashMap<>();
         result.put("tableName", newTable);
         return RequestResult.success(result);
@@ -77,21 +73,24 @@ public class CreateUtilsDBController extends BaseController {
                 differenceTablesVo.getTableNameB());
         Map<String, String> result = new HashMap<>();
         result.put("tableName", newTable);
-        return RequestResult.success(newTable);
+        return RequestResult.success(result);
     }
 
     /**
      * table中与wkt数据取交集
      *
-     * @param intersectsTableWktVo
+     * @param intersectionTableWktVo
      * @return
      */
     @PostMapping("/intersection/table_wkt")
     @Slave
-    public RequestResult intersectionTableWkt(@RequestBody IntersectsTableWktVo intersectsTableWktVo) {
-        return RequestResult.success(createUtilsDBService.intersectionTableWkt(
-                intersectsTableWktVo.getTableName(),
-                intersectsTableWktVo.getTableIds(),
-                intersectsTableWktVo.getEwkt()));
+    public RequestResult intersectionTableWkt(@RequestBody IntersectionTableWktVo intersectionTableWktVo) {
+        String newTable = createUtilsDBService.intersectionTableWkt(
+                intersectionTableWktVo.getTableName(),
+                intersectionTableWktVo.getTableIds(),
+                intersectionTableWktVo.getEwkt());
+        Map<String, String> result = new HashMap<>();
+        result.put("tableName", newTable);
+        return RequestResult.success(result);
     }
 }

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/vo/IntersectionTableWktVo.java

@@ -0,0 +1,12 @@
+package com.onemap.analyse.domain.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class IntersectionTableWktVo {
+    private String tableName;
+    private List<String> tableIds;
+    private String ewkt;
+}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/analyse/HttpAnalyseService.java

@@ -0,0 +1,26 @@
+package com.onemap.apply.service.analyse;
+
+import com.onemap.common.core.web.domain.RequestResult;
+import com.onemap.system.api.domain.IntersectionTableWktVo;
+import com.onemap.system.api.domain.IntersectsTableWktVo;
+import com.onemap.system.api.domain.RawTableVo;
+import com.onemap.system.api.domain.TargetTableVo;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+import java.util.Map;
+
+public interface HttpAnalyseService {
+
+    public Object getHttpAnalyse(Object objectVo);
+
+    public List<String> intersectsTableWkt(IntersectsTableWktVo analyseUtilsVo);
+
+    public String intersectionTableWkt(IntersectionTableWktVo intersectionTableWktVo);
+
+    public List<Map> rawTable(RawTableVo rawTableVo);
+
+    public List<Map> targetTable(TargetTableVo targetTableVo);
+
+}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/analyse/impl/HttpAnalyseServiceImpl.java

@@ -0,0 +1,143 @@
+package com.onemap.apply.service.analyse.impl;
+
+import com.onemap.apply.service.analyse.HttpAnalyseService;
+import com.onemap.common.core.utils.StringUtils;
+import com.onemap.common.core.web.domain.RequestResult;
+import com.onemap.system.api.AnalyseService;
+import com.onemap.system.api.domain.IntersectionTableWktVo;
+import com.onemap.system.api.domain.IntersectsTableWktVo;
+import com.onemap.system.api.domain.RawTableVo;
+import com.onemap.system.api.domain.TargetTableVo;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class HttpAnalyseServiceImpl implements HttpAnalyseService {
+
+    @Resource
+    private AnalyseService analyseService;
+
+    public Object getHttpAnalyse(Object objectVo) {
+        RequestResult result = new RequestResult();
+        if (objectVo instanceof IntersectsTableWktVo) {
+            result = analyseService.rawTable((RawTableVo) objectVo);
+        }
+        if (StringUtils.isNull(result)) {
+            return null;
+        }
+        Object code = result.get("code");
+        Object statuscode = result.get("statuscode");
+        if (code == null && statuscode == null) {
+            return null;
+        }
+        if (code != null) {
+            return null;
+        }
+        if (statuscode != null && (Integer) statuscode != 200) {
+            return null;
+        }
+        return result.get("data");
+    }
+
+    public List<String> intersectsTableWkt(IntersectsTableWktVo analyseUtilsVo) {
+        RequestResult result = analyseService.intersectsTableWkt(analyseUtilsVo);
+        if (StringUtils.isNull(result)) {
+            return null;
+        }
+        Object code = result.get("code");
+        Object statuscode = result.get("statuscode");
+        if (code == null && statuscode == null) {
+            return null;
+        }
+        if (code != null) {
+            return null;
+        }
+        if (statuscode != null && (Integer) statuscode != 200) {
+            return null;
+        }
+        Object resultDataObject = result.get("data");
+        if (StringUtils.isNotNull(resultDataObject)) {
+            List<String> idsList = (List<String>) resultDataObject;
+            return idsList;
+        }
+        return null;
+    }
+
+    public String intersectionTableWkt(IntersectionTableWktVo intersectionTableWktVo) {
+        RequestResult result = analyseService.intersectionTableWkt(intersectionTableWktVo);
+        if (StringUtils.isNull(result)) {
+            return null;
+        }
+        Object code = result.get("code");
+        Object statuscode = result.get("statuscode");
+        if (code == null && statuscode == null) {
+            return null;
+        }
+        if (code != null) {
+            return null;
+        }
+        if (statuscode != null && (Integer) statuscode != 200) {
+            return null;
+        }
+        Object resultDataObject = result.get("data");
+        if (StringUtils.isNotNull(resultDataObject)) {
+            Map data = (Map) resultDataObject;
+            Object tableName = data.get("tableName");
+            if (StringUtils.isNotNull(tableName)) {
+                return (String) tableName;
+            }
+        }
+        return null;
+    }
+
+    public List<Map> rawTable(RawTableVo rawTableVo) {
+        RequestResult result = analyseService.rawTable(rawTableVo);
+        if (StringUtils.isNull(result)) {
+            return null;
+        }
+        Object code = result.get("code");
+        Object statuscode = result.get("statuscode");
+        if (code == null && statuscode == null) {
+            return null;
+        }
+        if (code != null) {
+            return null;
+        }
+        if (statuscode != null && (Integer) statuscode != 200) {
+            return null;
+        }
+        Object resultDataObject = result.get("data");
+        if (StringUtils.isNotNull(resultDataObject)) {
+            List<Map> idsList = (List<Map>) resultDataObject;
+            return idsList;
+        }
+        return null;
+    }
+
+    public List<Map> targetTable(TargetTableVo targetTableVo) {
+        RequestResult result = analyseService.targetTable(targetTableVo);
+        if (StringUtils.isNull(result)) {
+            return null;
+        }
+        Object code = result.get("code");
+        Object statuscode = result.get("statuscode");
+        if (code == null && statuscode == null) {
+            return null;
+        }
+        if (code != null) {
+            return null;
+        }
+        if (statuscode != null && (Integer) statuscode != 200) {
+            return null;
+        }
+        Object resultDataObject = result.get("data");
+        if (StringUtils.isNotNull(resultDataObject)) {
+            List<Map> idsList = (List<Map>) resultDataObject;
+            return idsList;
+        }
+        return null;
+    }
+}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/table/TableDataSelectServiceImpl.java

@@ -6,13 +6,10 @@ import com.onemap.apply.domain.table.TableDataVo;
 import com.onemap.apply.domain.table.TableFiledDTO;
 import com.onemap.apply.domain.table.TableResRuleDTO;
 import com.onemap.apply.mapper.table.*;
+import com.onemap.apply.service.analyse.HttpAnalyseService;
 import com.onemap.apply.service.table.TableDataSelectService;
 import com.onemap.common.core.utils.StringUtils;
-import com.onemap.common.core.web.domain.RequestResult;
-import com.onemap.system.api.AnalyseService;
-import com.onemap.system.api.domain.AnalyseUtilsVo;
-import oracle.jdbc.internal.ObjectData;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.onemap.system.api.domain.*;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -27,11 +24,12 @@ public class TableDataSelectServiceImpl implements TableDataSelectService {
     @Resource
     private TableDataSelectMapper tableDataSelectMapper;
     @Resource
-    private AnalyseService analyseService;
+    private HttpAnalyseService httpAnalyseService;
     @Resource
     private TableFiledRelationMapper tableFiledRelationMapper;
     @Resource
     private TableFiledMapper tableFiledMapper;
+    private final Integer SRID = 4525;
 
     @Override
     public Map dataSelectByPoint(String pointEWkt, String bsm) {
@@ -40,7 +38,6 @@ public class TableDataSelectServiceImpl implements TableDataSelectService {
             QueryWrapper<TableResRuleDTO> queryResOneWrapper = new QueryWrapper<>();
             queryResOneWrapper.eq("id", bsm);
             TableResRuleDTO v_table_res_id = tableResRuleMapper.selectOne(queryResOneWrapper);
-
             List<List<TableDataVo>> data = dataSelectById(pointEWkt, bsm);
             if (data == null || data.size() <= 0) {
                 return retList;
@@ -133,23 +130,26 @@ public class TableDataSelectServiceImpl implements TableDataSelectService {
             //intersection 交集
 //            v_table_Res.getAnalyseType();
             if ("intersection".equals(v_analyse_type)) {
-                return tabelIntersectionHandle(pointEWkt, v_from_table.getTableName(), v_from_table.getId());
+                return tableIntersectionHandle(pointEWkt, v_from_table.getTableName(), v_from_table.getId());
             }
-            return tabelIntersectsHandle(pointEWkt, v_from_table.getTableName(), v_from_table.getId());
+            return tableIntersectsHandle(pointEWkt, v_from_table.getTableName(), v_from_table.getId());
         } else {
             if ("intersection".equals(v_analyse_type)) {
-                return tabelIntersectionHandle(pointEWkt, v_analyse_table.getTableName(), v_analyse_table.getId());
+                return tableIntersectionHandle(pointEWkt, v_analyse_table.getTableName(), v_analyse_table.getId());
             }
-            return tabelIntersectsHandle(pointEWkt, v_analyse_table.getTableName(), v_analyse_table.getId());
+            return tableIntersectsHandle(pointEWkt, v_analyse_table.getTableName(), v_analyse_table.getId());
         }
     }
 
 
     //取相交的函数
-    private List<List<TableDataVo>> tabelIntersectsHandle(String eWkt, String tableName, String tableId) {
+    private List<List<TableDataVo>> tableIntersectsHandle(String eWkt, String tableName, String tableId) {
         List<List<TableDataVo>> retList = new ArrayList<>();
-        List<String> from_kj_ids = intersectsTableWkt(tableName, null, null, eWkt, null);
-        if (from_kj_ids == null || from_kj_ids.size() == 0) {
+        IntersectsTableWktVo intersectsTableWktVo = new IntersectsTableWktVo();
+        intersectsTableWktVo.setEwkt(eWkt);
+        intersectsTableWktVo.setTableName(tableName);
+        List<String> from_kj_ids = httpAnalyseService.intersectsTableWkt(intersectsTableWktVo);
+        if (from_kj_ids == null || from_kj_ids.size() <= 0) {
             return retList;
         }
 
@@ -158,18 +158,26 @@ public class TableDataSelectServiceImpl implements TableDataSelectService {
         for (TableFiledDTO v_data : filedlist) {
             outputColumn.add(v_data.getFiledName());
         }
-        List<Map> retDataList = new ArrayList<>();
-        for (String v_id : from_kj_ids) {
-            Map map = tableDataSelectMapper.getTableDataById(tableName, v_id, outputColumn);
-            retDataList.add(map);
+        RawTableVo rawTableVo = new RawTableVo();
+        rawTableVo.setRawTableName(tableName);
+        rawTableVo.setSrid(SRID);
+        rawTableVo.setIds(from_kj_ids);
+        rawTableVo.setsIsGeography(false);
+        rawTableVo.setColumns(outputColumn);
+        List<Map> retDataList = httpAnalyseService.rawTable(rawTableVo);
+        if (retDataList == null || retDataList.size() <= 0) {
+            return retList;
         }
         return dataMapTransFormZh(retDataList, filedlist);
     }
 
     //取并集的函数
-    private List<List<TableDataVo>> tabelIntersectionHandle(String eWkt, String tableName, String tableId) {
+    private List<List<TableDataVo>> tableIntersectionHandle(String eWkt, String tableName, String tableId) {
         List<List<TableDataVo>> retList = new ArrayList<>();
-        List<String> from_kj_ids = intersectsTableWkt(tableName, null, null, eWkt, null);
+        IntersectsTableWktVo intersectsTableWktVo = new IntersectsTableWktVo();
+        intersectsTableWktVo.setEwkt(eWkt);
+        intersectsTableWktVo.setTableName(tableName);
+        List<String> from_kj_ids = httpAnalyseService.intersectsTableWkt(intersectsTableWktVo);
         if (from_kj_ids == null || from_kj_ids.size() == 0) {
             return retList;
         }
@@ -179,7 +187,23 @@ public class TableDataSelectServiceImpl implements TableDataSelectService {
         for (TableFiledDTO v_data : list) {
             outputColumn.add(v_data.getFiledName());
         }
-        List<Map> from_jg = intersectionTableWkt(tableName, 4326, from_kj_ids, eWkt, 4525, outputColumn);
+
+        IntersectionTableWktVo intersectionTableWktVo = new IntersectionTableWktVo();
+        intersectionTableWktVo.setEwkt(eWkt);
+        intersectionTableWktVo.setTableIds(from_kj_ids);
+        intersectionTableWktVo.setTableName(tableName);
+        String from_kj_data = httpAnalyseService.intersectionTableWkt(intersectionTableWktVo);
+        if (StringUtils.isEmpty(from_kj_data)) {
+            return retList;
+        }
+
+        TargetTableVo targetTableVo = new TargetTableVo();
+        targetTableVo.setTargetTableName(from_kj_data);
+        targetTableVo.setColumns(outputColumn);
+        targetTableVo.setRawTableName(tableName);
+        targetTableVo.setsIsGeography(false);
+        targetTableVo.setSrid(SRID);
+        List<Map> from_jg = httpAnalyseService.targetTable(targetTableVo);
         if (from_jg == null || from_jg.size() <= 0) {
             return retList;
         }
@@ -213,68 +237,6 @@ public class TableDataSelectServiceImpl implements TableDataSelectService {
         return retList;
     }
 
-    public List<String> intersectsTableWkt(String inputTable, Integer inputSRID, List<String> inputIds, String intersectsWkt, Integer intersectsWktSRID) {
-        AnalyseUtilsVo vo = new AnalyseUtilsVo();
-        vo.setInputTable(inputTable);
-        vo.setInputSRID(inputSRID);
-        vo.setInputIds(inputIds);
-        vo.setAnalyseWkt(intersectsWkt);
-        vo.setAnalyseWktSRID(intersectsWktSRID);
-        RequestResult result = analyseService.intersectsTableWktV1(vo);
-        if (StringUtils.isNull(result)) {
-            return null;
-        }
-        Object code = result.get("code");
-        Object statuscode = result.get("statuscode");
-        if (code == null && statuscode == null) {
-            return null;
-        }
-        if (code != null) {
-            return null;
-        }
-        if (statuscode != null && (Integer) statuscode != 200) {
-            return null;
-        }
-        Object resultDataObject = result.get("data");
-        if (StringUtils.isNotNull(resultDataObject)) {
-            List<String> idsList = (List<String>) resultDataObject;
-            return idsList;
-        }
-        return null;
-    }
-
-    public List<Map> intersectionTableWkt(String inputTable, Integer inputSRID, List<String> inputIds, String intersectsWkt, Integer intersectsWktSRID, List<String> outputColumn) {
-        AnalyseUtilsVo vo = new AnalyseUtilsVo();
-        vo.setInputTable(inputTable);
-        vo.setInputSRID(inputSRID);
-        vo.setInputIds(inputIds);
-        vo.setAnalyseWkt(intersectsWkt);
-        vo.setAnalyseWktSRID(intersectsWktSRID);
-        vo.setOutputColumn(outputColumn);
-        RequestResult result = analyseService.intersectionTableWktV1(vo);
-        if (StringUtils.isNull(result)) {
-            return null;
-        }
-        Object code = result.get("code");
-        Object statuscode = result.get("statuscode");
-        if (code == null && statuscode == null) {
-            return null;
-        }
-        if (code != null) {
-            return null;
-        }
-        if (statuscode != null && (Integer) statuscode != 200) {
-            return null;
-        }
-        Object resultDataObject = result.get("data");
-        if (StringUtils.isNotNull(resultDataObject)) {
-            List<Map> idsList = (List<Map>) resultDataObject;
-            return idsList;
-        }
-        return null;
-    }
-
-
     public List<TableFiledDTO> getFieldListByTableId(String tableId, Integer isDisplay) {
         List<TableFiledDTO> list = tableFiledMapper.getFiledDTOByTableId(tableId, isDisplay);
         return list;