处理超时

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

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

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

@@ -336,6 +336,8 @@ public class FzssServiceImpl implements IFzssService {
                 System.out.println("燃气");
             }
 
+            System.out.println("因子名称："+factorUseDTO.getFactorName());
+
             FactorSpatialVo factorSpatialVo = factorUseDTO.getConditionInfoObj();
             if (factorSpatialVo.getSpatialType().equals("intersect")) {
                 // 1.先切割因子地块
@@ -351,6 +353,8 @@ public class FzssServiceImpl implements IFzssService {
                         // 地块与因子求交集
                         rawTable = createUtilsDBService.intersectionTableWkt(rawTable, null, calculateEwkt);
                     } else {
+                        // TODO：永久基本农田暂时不做处理
+                        if(factorUseDTO.getFactorName().equals("永久基本农田"))continue;
                         // 地块与因子求差集
                         rawTable = createUtilsDBService.differenceTableWkt(rawTable, null, calculateEwkt);
                     }

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: 192.168.60.2:8848
       config:
         namespace: model
         # 配置中心地址
-        server-addr: 192.168.100.30:8848
+        server-addr: 192.168.60.2:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

onemap-modules/onemap-analyse/src/main/resources/mapper/oracle/vector/CreateUtilsDBMapper.xml

@@ -55,11 +55,25 @@
         DROP TABLE IF EXISTS "${temporaryTable}";
     </insert>
 
-    <insert id="differenceTableWkt">
-        CREATE TABLE "${newTableName}" AS
+<!--    <insert id="differenceTableWkt">-->
+<!--        CREATE TABLE "${newTableName}" AS-->
+<!--        SELECT id, public.ST_Difference(inTbale.geom, public.st_geomfromewkt(#{ewkt})) AS geom-->
+<!--        FROM "${tableName}" inTbale-->
+<!--        WHERE NOT public.ST_IsEmpty(public.ST_Difference(inTbale.geom, public.st_geomfromewkt(#{ewkt})))-->
+<!--        <if test="tableIds != null and tableIds.size() > 0">-->
+<!--            AND inTbale.id::VARCHAR IN-->
+<!--            <foreach collection="tableIds" item="tableId" open="(" close=")" separator=",">-->
+<!--                #{tableId}-->
+<!--            </foreach>-->
+<!--        </if>-->
+<!--        ;-->
+<!--    </insert>-->
+
+    <insert id="differenceTableWkt" timeout="60">
+        CREATE TABLE vector."${newTableName}" AS
         SELECT id, public.ST_Difference(inTbale.geom, public.st_geomfromewkt(#{ewkt})) AS geom
-        FROM "${tableName}" inTbale
-        WHERE NOT public.ST_IsEmpty(public.ST_Difference(inTbale.geom, public.st_geomfromewkt(#{ewkt})))
+        FROM vector."${tableName}" inTbale
+        WHERE 1=1
         <if test="tableIds != null and tableIds.size() > 0">
             AND inTbale.id::VARCHAR IN
             <foreach collection="tableIds" item="tableId" open="(" close=")" separator=",">
@@ -67,6 +81,8 @@
             </foreach>
         </if>
         ;
+        DELETE FROM vector."${newTableName}"
+        WHERE public.ST_IsEmpty(geom);
     </insert>
 
     <insert id="intersectionTableWkt">

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: 192.168.60.2:8848
       config:
         namespace: model
         # 配置中心地址
-        server-addr: 192.168.100.30:8848
+        server-addr: 192.168.60.2: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: 192.168.60.2:8848
       config:
         namespace: model
         # 配置中心地址
-        server-addr: 192.168.100.30:8848
+        server-addr: 192.168.60.2:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

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

@@ -31,11 +31,11 @@ spring:
       discovery:
         namespace: model
         # 服务注册地址
-        server-addr: 192.168.100.30:8848
+        server-addr: 192.168.60.2:8848
       config:
         namespace: model
         # 配置中心地址
-        server-addr: 192.168.100.30:8848
+        server-addr: 192.168.60.2: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: 192.168.60.2:8848
       config:
         namespace: model
         # 配置中心地址
-        server-addr: 192.168.100.30:8848
+        server-addr: 192.168.60.2: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: 192.168.60.2:8848
       config:
         namespace: model
         # 配置中心地址
-        server-addr: 192.168.100.30:8848
+        server-addr: 192.168.60.2:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置