修改接口

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

@@ -2,6 +2,7 @@ package com.onemap.system.api;
 
 import com.onemap.common.core.constant.ServiceNameConstants;
 import com.onemap.common.core.web.domain.RequestResult;
+import com.onemap.system.api.domain.PolygonDataVo;
 import com.onemap.system.api.factory.ApplyFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -16,5 +17,5 @@ public interface ApplyService {
     RequestResult GetCascadeList(String param);
 
     @PostMapping("/tabledata/polygon/GetTableData")
-    RequestResult queryTableListByPolygon(String sourceDataId, String sourcePolygonWkt, String sourceLayerId, String sourceLayerType, String queryTableId);
+    RequestResult queryTableListByPolygon(PolygonDataVo polygonDataVo);
 }

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

@@ -0,0 +1,12 @@
+package com.onemap.system.api.domain;
+
+import lombok.Data;
+
+@Data
+public class PolygonDataVo {
+    String sourceDataId;
+    String sourcePolygonWkt;
+    String sourceLayerId;
+    String sourceLayerType;
+    String queryTableId;
+}

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

@@ -1,7 +1,9 @@
 package com.onemap.system.api.factory;
 
 import com.onemap.common.core.web.domain.RequestResult;
+import com.onemap.common.core.web.page.TableDataInfo;
 import com.onemap.system.api.ApplyService;
+import com.onemap.system.api.domain.PolygonDataVo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;
@@ -15,7 +17,7 @@ public class ApplyFallbackFactory implements FallbackFactory<ApplyService> {
     public ApplyService create(Throwable cause) {
         return new ApplyService() {
             @Override
-            public RequestResult queryTableListByPolygon(String sourceDataId, String sourcePolygonWkt, String sourceLayerId, String sourceLayerType, String queryTableId) {
+            public RequestResult queryTableListByPolygon(PolygonDataVo polygonDataVo) {
                 return RequestResult.error("内部错误");
             }
 

onemap-auth/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         namespace: model
         # 服务注册地址
-        server-addr: 192.168.100.30:8848
+        server-addr: 127.0.0.1:8848
       config:
         namespace: model
         # 配置中心地址
-        server-addr: 192.168.100.30:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

onemap-gateway/src/main/resources/bootstrap.yml

@@ -19,11 +19,11 @@ spring:
       discovery:
         namespace: model
         # 服务注册地址
-        server-addr: 192.168.100.30:8848
+        server-addr: 127.0.0.1:8848
       config:
         namespace: model
         # 配置中心地址
-        server-addr: 192.168.100.30:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置
@@ -34,13 +34,13 @@ spring:
       eager: true
       transport:
         # 控制台地址
-        dashboard: 192.168.100.30:8718
+        dashboard: 127.0.0.1:8718
 
       # nacos配置持久化
       datasource:
         ds1:
           nacos:
-            server-addr: 192.168.100.30:8848
+            server-addr: 127.0.0.1:8848
             dataId: sentinel-onemap-gateway
             groupId: DEFAULT_GROUP
             data-type: json

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

@@ -25,6 +25,7 @@ import com.onemap.common.core.utils.StringUtils;
 import com.onemap.common.core.web.domain.RequestResult;
 import com.onemap.system.api.ApplyService;
 import com.onemap.system.api.SpatialService;
+import com.onemap.system.api.domain.PolygonDataVo;
 import com.onemap.system.api.domain.WktsVo;
 import org.apache.commons.io.FileUtils;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
@@ -69,8 +70,8 @@ public class ReportServiceImpl implements IReportService {
     @Resource
     SpatialService spatialService;
 
-    // @Resource
-    // ApplyService applyService;
+    @Resource
+    ApplyService applyService;
 
     @Resource
     CreateUtilsDBService createUtilsDBService;
@@ -244,6 +245,8 @@ public class ReportServiceImpl implements IReportService {
                 NpoiHelper.content(document, "\t按照项目选址要求和影响因子，经对所选范围内的所有用地进行分析，筛选出符合要求的方案共" + fzxzJgGisDTOList.size() + "个。", pos++);
             }
 
+            // 获取规划信息
+            List<TableSortRes> tableSortRes = getCascadeList();
             for (int i = 0; i < fzxzJgGisDTOList.size(); i++) {
                 if (i != 0) {
                     // 添加分页
@@ -628,20 +631,19 @@ public class ReportServiceImpl implements IReportService {
         return ewktRes;
     }
 
-    // /**
-    //  * 获取级联列表
-    //  */
-    // private void GetCascadeList() {
-    //     RequestResult requestResult = applyService.GetCascadeList("");
-    //     List<TableSortRes> tableSortResList = (List<TableSortRes>) requestResult.get("data");
-    // }
-
-    // /**
-    //  * 获取表格数据
-    //  */
-    // private void getTableData() {
-    //
-    //     String sourceDataId, String sourcePolygonWkt, String sourceLayerId, String sourceLayerType, String queryTableId
-    //     applyService.queryTableListByPolygon()
-    // }
+    /**
+     * 获取级联列表
+     */
+    private List<TableSortRes> getCascadeList() {
+        RequestResult requestResult = applyService.GetCascadeList("");
+        List<TableSortRes> tableSortResList = (List<TableSortRes>) requestResult.get("data");
+        return tableSortResList;
+    }
+
+    /**
+     * 获取表格数据
+     */
+    private void getTableData(PolygonDataVo polygonDataVo) {
+        applyService.queryTableListByPolygon(polygonDataVo);
+    }
 }

onemap-modules/onemap-analyse/src/main/resources/bootstrap.yml

@@ -20,11 +20,11 @@ spring:
       discovery:
         namespace: model
         # 服务注册地址
-        server-addr: 192.168.100.30:8848
+        server-addr: 127.0.0.1:8848
       config:
         namespace: model
         # 配置中心地址
-        server-addr: 192.168.100.30:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/table/TableDataSelectController.java

@@ -1,5 +1,6 @@
 package com.onemap.apply.controller.table;
 
+import com.onemap.apply.domain.table.PolygonDataDTO;
 import com.onemap.apply.service.table.TableDataSelectService;
 import com.onemap.common.core.web.controller.BaseController;
 import com.onemap.common.core.web.domain.RequestResult;
@@ -27,9 +28,14 @@ public class TableDataSelectController extends BaseController {
         return RequestResult.success(tableDataSelectService.dataQueryByPoint(sourcePointWkt, sourceLayerId, sourceLayerType, queryTableId));
     }
 
+    // @PostMapping("/polygon/GetTableData")
+    // public RequestResult queryTableListByPolygon(String sourceDataId, String sourcePolygonWkt, String sourceLayerId, String sourceLayerType, String queryTableId) {
+    //     return RequestResult.success(tableDataSelectService.dataQueryByPolygon(sourceDataId, sourcePolygonWkt, sourceLayerId, sourceLayerType, queryTableId));
+    // }
+
     @PostMapping("/polygon/GetTableData")
-    public RequestResult queryTableListByPolygon(String sourceDataId, String sourcePolygonWkt, String sourceLayerId, String sourceLayerType, String queryTableId) {
-        return RequestResult.success(tableDataSelectService.dataQueryByPolygon(sourceDataId, sourcePolygonWkt, sourceLayerId, sourceLayerType, queryTableId));
+    public RequestResult queryTableListByPolygon(PolygonDataDTO polygonDataDTO) {
+        return RequestResult.success(tableDataSelectService.dataQueryByPolygon(polygonDataDTO.getSourceDataId(), polygonDataDTO.getSourcePolygonWkt(), polygonDataDTO.getSourceLayerId(), polygonDataDTO.getSourceLayerType(), polygonDataDTO.getQueryTableId()));
     }
 
     @GetMapping("/query/layer")

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/table/PolygonDataDTO.java

@@ -0,0 +1,12 @@
+package com.onemap.apply.domain.table;
+
+import lombok.Data;
+
+@Data
+public class PolygonDataDTO {
+    String sourceDataId;
+    String sourcePolygonWkt;
+    String sourceLayerId;
+    String sourceLayerType;
+    String queryTableId;
+}

onemap-modules/onemap-apply/src/main/resources/bootstrap.yml

@@ -30,11 +30,11 @@ spring:
       discovery:
         namespace: model
         # 服务注册地址
-        server-addr: 192.168.100.30:8848
+        server-addr: 127.0.0.1:8848
       config:
         namespace: model
         # 配置中心地址
-        server-addr: 192.168.100.30:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

onemap-modules/onemap-file/src/main/resources/bootstrap.yml

@@ -34,11 +34,11 @@ spring:
       discovery:
         namespace: model
         # 服务注册地址
-        server-addr: 192.168.100.30:8848
+        server-addr: 127.0.0.1:8848
       config:
         namespace: model
         # 配置中心地址
-        server-addr: 192.168.100.30:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

onemap-modules/onemap-model/src/main/resources/bootstrap.yml

@@ -20,11 +20,11 @@ spring:
       discovery:
         namespace: model
         # 服务注册地址
-        server-addr: 192.168.100.30:8848
+        server-addr: 127.0.0.1:8848
       config:
         namespace: model
         # 配置中心地址
-        server-addr: 192.168.100.30:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

onemap-modules/onemap-spatial/src/main/resources/bootstrap.yml

@@ -20,11 +20,11 @@ spring:
       discovery:
         namespace: model
         # 服务注册地址
-        server-addr: 192.168.100.30:8848
+        server-addr: 127.0.0.1:8848
       config:
         namespace: model
         # 配置中心地址
-        server-addr: 192.168.100.30:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

onemap-modules/onemap-system/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         namespace: model
         # 服务注册地址
-        server-addr: 192.168.100.30:8848
+        server-addr: 127.0.0.1:8848
       config:
         namespace: model
         # 配置中心地址
-        server-addr: 192.168.100.30:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置