Merge branch 'dev' into f-xiaogu

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

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

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

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

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/mapper/vector/TableDataMapper.java

@@ -29,4 +29,6 @@ public interface TableDataMapper {
     void delInIds(@Param("tableName") String tableName, @Param("ids") List<String> ids);
 
     void delOutIds(@Param("tableName") String tableName, @Param("ids") List<String> ids);
+
+    void clearTable(@Param("tableName") String tableName);
 }

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

@@ -59,11 +59,16 @@ public class TableDateServiceImpl implements ITableDateService {
 
     @Override
     public void delInIds(String tableName, List<String> ids) {
-        tableDataMapper.delInIds(tableName, ids);
+        if (ids.size() != 0)
+            tableDataMapper.delInIds(tableName, ids);
     }
 
     @Override
     public void delOutIds(String tableName, List<String> ids) {
-        tableDataMapper.delOutIds(tableName, ids);
+        if (ids.size() != 0) {
+            tableDataMapper.delOutIds(tableName, ids);
+        } else {
+            tableDataMapper.clearTable(tableName);
+        }
     }
 }

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

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

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

@@ -165,4 +165,8 @@
             #{id}
         </foreach>
     </delete>
+    <delete id="clearTable">
+        DELETE
+        FROM "${tableName}"
+    </delete>
 </mapper>

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

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

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

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

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

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

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

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

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

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

sql/pgsql/0_init.sql

@@ -6,4 +6,7 @@
 -- TB_GHDK_SITUATION
 
 --修改试图
--- vector.v_jsc_tdgy_jt_xx
+-- vector.v_jsc_tdgy_jt_xx
+
+-- 添加表
+--AFTER_BJXM_SZ