From e54ef5e185c46a35641dce47b792c4f20b98879a Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 十一月 2022 19:08:25 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/all/BaseQueryService.java | 9 ++++-----
src/main/java/com/lf/server/controller/all/BaseQueryController.java | 26 ++++++++++++++++++++++++--
说明.txt | 8 +++++---
src/main/java/com/lf/server/mapper/all/BaseQueryMapper.java | 10 ++++++----
4 files changed, 39 insertions(+), 14 deletions(-)
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 31b9c7b..1c9ac49 100644
--- a/src/main/java/com/lf/server/controller/all/BaseQueryController.java
+++ b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
@@ -209,7 +209,18 @@
@GetMapping(value = "/selectFields")
public ResponseMsg<List<DictEntity>> selectFields(String name) {
try {
- List<DictEntity> list = baseQueryService.selectFields(name);
+ BasicMapper baseMapper = baseQueryService.getBasicMapper(name);
+ if (baseMapper == null) {
+ return fail("鏌ヨ瀵硅薄涓嶅瓨鍦�", null);
+ }
+
+ String tabName = baseQueryService.getTabName(baseMapper);
+ if (tabName == null) {
+ return null;
+ }
+
+ String[] strs = tabName.split(".");
+ List<DictEntity> list = baseQueryService.selectFields(strs[0], strs[1]);
return success(list);
} catch (Exception ex) {
@@ -225,7 +236,18 @@
@GetMapping(value = "/selectDomains")
public ResponseMsg<List<DomainEntity>> selectDomains(String name) {
try {
- List<DomainEntity> list = baseQueryService.selectDomains(name);
+ BasicMapper baseMapper = baseQueryService.getBasicMapper(name);
+ if (baseMapper == null) {
+ return fail("鏌ヨ瀵硅薄涓嶅瓨鍦�", null);
+ }
+
+ String tabName = baseQueryService.getTabName(baseMapper);
+ if (tabName == null) {
+ return null;
+ }
+
+ String[] strs = tabName.split(".");
+ List<DomainEntity> list = baseQueryService.selectDomains(strs[0], strs[1]);
return success(list);
} catch (Exception ex) {
diff --git a/src/main/java/com/lf/server/mapper/all/BaseQueryMapper.java b/src/main/java/com/lf/server/mapper/all/BaseQueryMapper.java
index ff288d7..ebc56df 100644
--- a/src/main/java/com/lf/server/mapper/all/BaseQueryMapper.java
+++ b/src/main/java/com/lf/server/mapper/all/BaseQueryMapper.java
@@ -42,16 +42,18 @@
/**
* 鏌ヨ瀛楁淇℃伅
*
- * @param name 鍚嶇О
+ * @param ns 鍚嶇О绌洪棿
+ * @param tab 琛ㄥ悕
* @return 瀹炰綋绫婚泦鍚�
*/
- public List<DictEntity> selectFields(String name);
+ public List<DictEntity> selectFields(String ns, String tab);
/**
* 鏌ヨ鍊煎煙淇℃伅
*
- * @param name 鍚嶇О
+ * @param ns 鍚嶇О绌洪棿
+ * @param tab 琛ㄥ悕
* @return 瀹炰綋绫婚泦鍚�
*/
- public List<DomainEntity> selectDomains(String name);
+ public List<DomainEntity> selectDomains(String ns, String tab);
}
diff --git a/src/main/java/com/lf/server/service/all/BaseQueryService.java b/src/main/java/com/lf/server/service/all/BaseQueryService.java
index b311158..bf20e0a 100644
--- a/src/main/java/com/lf/server/service/all/BaseQueryService.java
+++ b/src/main/java/com/lf/server/service/all/BaseQueryService.java
@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.lf.server.entity.all.ResponseMsg;
import com.lf.server.entity.ctrl.IdNameEntity;
import com.lf.server.entity.ctrl.TabEntity;
import com.lf.server.entity.data.DictEntity;
@@ -229,12 +228,12 @@
}
@Override
- public List<DictEntity> selectFields(String name) {
- return baseQueryMapper.selectFields(name);
+ public List<DictEntity> selectFields(String ns, String tab) {
+ return baseQueryMapper.selectFields(ns, tab);
}
@Override
- public List<DomainEntity> selectDomains(String name) {
- return baseQueryMapper.selectDomains(name);
+ public List<DomainEntity> selectDomains(String ns, String tab) {
+ return baseQueryMapper.selectDomains(ns, tab);
}
}
diff --git "a/\350\257\264\346\230\216.txt" "b/\350\257\264\346\230\216.txt"
index 8ee1499..4648dbf 100644
--- "a/\350\257\264\346\230\216.txt"
+++ "b/\350\257\264\346\230\216.txt"
@@ -29,9 +29,9 @@
28.寮�鍙戝ぇ鏂囦欢涓婁紶鎺ュ彛锛坈ommons-fileupload锛�
29.寮�鍙戞壒閲忎慨鏀圭敤鎴峰瘑鐮佹帴鍙�
30.寮�鍙戜笂浼燬hp鏂囦欢鍔熻兘
-31.浣跨敤Gdal璇诲彇Shp鏂囦欢锛岃鍙栧悗鍒犻櫎鏂囦欢 <
-32.
-33.
+31.浣跨敤Gdal璇诲彇Shp鏂囦欢锛岃鍙栧悗鍒犻櫎鏂囦欢
+32.淇敼瀛楀吀琛ㄧ殑鏁版嵁缁撴瀯锛屽彉鏇存墍鏈夋秹鍙婄殑鍚庡彴鏂规硶
+33.寮�鍙戝�煎煙琛ㄧ殑鎿嶄綔鎺ュ彛 <
34.
35.
36.
@@ -110,6 +110,8 @@
浣跨敤Commons FileUpLoad 鏂囦欢涓婁紶鍔熻兘锛�
https://www.itdaan.com/blog/2017/08/08/b2dbc1106fa7.html
+Postgresql鎸夊ぉ銆佸懆銆佹湀銆佸勾缁熻淇℃伅锛�
+https://blog.csdn.net/qq_44663150/article/details/119681400
----------------------------------------------------------------------------------------------------
涓�銆佸紑鍙戣繍琛岀幆澧�
JDK鐗堟湰锛�1.8
--
Gitblit v1.9.3