From 670f36af44911c51eb2e57b230c67b585b696896 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 30 三月 2023 09:15:28 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/service/show/DataLibService.java        |    3 +++
 src/main/java/com/lf/server/controller/all/BaseQueryController.java |    2 +-
 data/update.sql                                                     |    3 ++-
 src/main/resources/application.yml                                  |   12 ++++++------
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/data/update.sql b/data/update.sql
index 6134590..8f75fe3 100644
--- a/data/update.sql
+++ b/data/update.sql
@@ -12,7 +12,8 @@
 comment on column lf.sys_apply.gids is 'GID';
 comment on column lf.sys_apply.filters is '杩囨护鏉′欢';
 
-select * from lf.sys_apply;
+select * from bd.dlg_agnp;
+select * from lf.sys_apply order by id desc;
 --------------------------------------------------------- 琛ュ厖瀛楁
 -- alter table lf.sys_meta rename column bstab to tab; alter table lf.sys_meta drop column mdtab;
 alter table lf.sys_fme_log add column create_time timestamp(6) without time zone default now();
diff --git a/src/main/java/com/lf/server/controller/all/BaseQueryController.java b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
index 558d2b9..1277d32 100644
--- a/src/main/java/com/lf/server/controller/all/BaseQueryController.java
+++ b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
@@ -634,7 +634,7 @@
             }
 
             UserEntity ue = tokenService.getCurrentUser(req);
-            String guid = dataLibService.downloadDbReq(ue, dr);
+            String guid = dataLibService.downloadDbReq4Wkt(ue, dr);
 
             return success(guid);
         } catch (Exception ex) {
diff --git a/src/main/java/com/lf/server/service/show/DataLibService.java b/src/main/java/com/lf/server/service/show/DataLibService.java
index adf6c3c..ab4bf13 100644
--- a/src/main/java/com/lf/server/service/show/DataLibService.java
+++ b/src/main/java/com/lf/server/service/show/DataLibService.java
@@ -185,6 +185,9 @@
                 } else {
                     dataMap.get(enity).addAll(list);
                 }
+                if ("bborehole".equals(enity)){
+                    continue;
+                }
                 if (wrapper.isEmptyOfWhere()) {
                     wrapper.apply("1 = 1");
                 }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ff70519..205db0c 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -42,11 +42,11 @@
     name: prod
     # JDBC 鍩烘湰閰嶇疆 &currentSchema=public
     #url: jdbc:postgresql://103.85.165.99:5433/langfang?useAffectedRows=true
-    #url: jdbc:postgresql://192.168.20.205:5433/langfang?useAffectedRows=true
-    url: jdbc:postgresql://127.0.0.1:5433/langfang?useAffectedRows=true
+    url: jdbc:postgresql://192.168.20.205:5433/langfang?useAffectedRows=true
+    #url: jdbc:postgresql://127.0.0.1:5433/langfang?useAffectedRows=true
     username : postgres
-    #password: Postgres!_14_Lf
-    password: postgres
+    password: Postgres!_14_Lf
+    #password: postgres
     driver-class-name: org.postgresql.Driver
     paltform: POSTGRESQL
     type: com.alibaba.druid.pool.DruidDataSource
@@ -147,8 +147,8 @@
   # IIS鐨勪富鏈哄湴鍧�
   iisHost: 127.0.0.1
   # FME鏈嶅姟鍦板潃
-  fmeUrl: http://103.85.165.99:8051/
-  #fmeUrl: http://192.168.20.205:88/
+  #fmeUrl: http://103.85.165.99:8051/
+  fmeUrl: http://192.168.20.205:88/
   # 鍑哄浘鏈嶅姟
   exportServer: http://127.0.0.1/ExportMap
   #exportServer: http://103.85.165.99:8050/ExportMap

--
Gitblit v1.9.3