From 97c74c4cabbf10a70ae7f772ffeda08cdecd7ae0 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 十一月 2022 19:58:18 +0800
Subject: [PATCH] 1
---
src/main/resources/mapper/all/BaseQueryMapper.xml | 11 ++++++++++-
data/db_fn.sql | 5 +++++
src/main/java/com/lf/server/controller/all/BaseQueryController.java | 8 ++++----
3 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/data/db_fn.sql b/data/db_fn.sql
index f9966dd..42ad05a 100644
--- a/data/db_fn.sql
+++ b/data/db_fn.sql
@@ -269,7 +269,12 @@
and ST_Intersects(geom,
ST_PolygonFromText('POLYGON ((115.94927385452 32.3754479115071 0,121.989371092554 32.2766788010181 0,121.850621222894 29.6874200067864 0,115.9727267226 29.7835368627922 0,115.94927385452 32.3754479115071 0))', 4326))
+select a.* from lf.sys_domain a inner join lf.sys_dict b on a.dom_name = b.domain_na
+where b.ns = 'bd' and b.tab = 'dlg_25w_hyda' and b.domain_na is not null;
+select * from lf.sys_dict where ns = 'bd' and tab = 'dlg_25w_hyda' and domain_na is not null;
+select * from lf.sys_domain where dom_name='dlg25gbcode';
+select * from bd.dlg_25w_aanp;
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 1c9ac49..79a465b 100644
--- a/src/main/java/com/lf/server/controller/all/BaseQueryController.java
+++ b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
@@ -204,7 +204,7 @@
@SysLog()
@ApiOperation(value = "鏌ヨ瀛楁淇℃伅")
@ApiImplicitParams({
- @ApiImplicitParam(name = "name", value = "鏄犲皠鍚嶇О", dataType = "String", paramType = "query", example = "dlgAgnp")
+ @ApiImplicitParam(name = "name", value = "鏄犲皠鍚嶇О", dataType = "String", paramType = "query", example = "dlg25wAanp")
})
@GetMapping(value = "/selectFields")
public ResponseMsg<List<DictEntity>> selectFields(String name) {
@@ -219,7 +219,7 @@
return null;
}
- String[] strs = tabName.split(".");
+ String[] strs = tabName.split("\\.");
List<DictEntity> list = baseQueryService.selectFields(strs[0], strs[1]);
return success(list);
@@ -231,7 +231,7 @@
@SysLog()
@ApiOperation(value = "鏌ヨ鍊煎煙淇℃伅")
@ApiImplicitParams({
- @ApiImplicitParam(name = "name", value = "鏄犲皠鍚嶇О", dataType = "String", paramType = "query", example = "dlgAgnp")
+ @ApiImplicitParam(name = "name", value = "鏄犲皠鍚嶇О", dataType = "String", paramType = "query", example = "dlg25wAanp")
})
@GetMapping(value = "/selectDomains")
public ResponseMsg<List<DomainEntity>> selectDomains(String name) {
@@ -246,7 +246,7 @@
return null;
}
- String[] strs = tabName.split(".");
+ String[] strs = tabName.split("\\.");
List<DomainEntity> list = baseQueryService.selectDomains(strs[0], strs[1]);
return success(list);
diff --git a/src/main/resources/mapper/all/BaseQueryMapper.xml b/src/main/resources/mapper/all/BaseQueryMapper.xml
index 80f6476..27640e3 100644
--- a/src/main/resources/mapper/all/BaseQueryMapper.xml
+++ b/src/main/resources/mapper/all/BaseQueryMapper.xml
@@ -22,6 +22,15 @@
</select>
<select id="selectTabs" resultType="com.lf.server.entity.ctrl.TabEntity">
- select distinct ns,tab,fn_get_entity(tab) entity,tab_desc,tabletype from lf.sys_dict order by tab;
+ select distinct ns,tab,fn_get_entity(tab) entity,tab_desc,tabletype from lf.sys_dict order by tab
+ </select>
+
+ <select id="selectFields" resultType="com.lf.server.entity.data.DictEntity">
+ select * from lf.sys_dict where ns = #{ns} and tab = #{tab} order by order_num
+ </select>
+
+ <select id="selectDomains" resultType="com.lf.server.entity.data.DomainEntity">
+ select a.* from lf.sys_domain a inner join lf.sys_dict b on a.dom_name = b.domain_na
+ where b.ns = #{ns} and b.tab = #{tab} and b.domain_na is not null
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3