From 15375a1d0d07c61c132906ff8da45f67bcd711f6 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 17 十一月 2022 15:51:05 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/all/BaseQueryController.java | 80 ++++++++++++++++++++++++++++++++++-----
1 files changed, 69 insertions(+), 11 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 f6d4a8e..7ad8127 100644
--- a/src/main/java/com/lf/server/controller/all/BaseQueryController.java
+++ b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
@@ -4,10 +4,12 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.lf.server.aspect.SysLog;
+import com.lf.server.annotation.SysLog;
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;
+import com.lf.server.entity.data.DomainEntity;
import com.lf.server.helper.AesHelper;
import com.lf.server.helper.StringHelper;
import com.lf.server.mapper.all.BasicMapper;
@@ -18,6 +20,7 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
import java.util.List;
@@ -34,11 +37,11 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "name", value = "鏄犲皠鍚嶇О", dataType = "String", paramType = "query", example = "dlgAgnp"),
@ApiImplicitParam(name = "filter", value = "杩囨护鏉′欢", dataType = "String", paramType = "query", example = "gid >= 50 and name like '鍘�' and objectid < 5000.0"),
- @ApiImplicitParam(name = "wkt", value = "WKT锛堣憲鍚嶆枃鏈級", dataType = "String", paramType = "query", example = "gAPpDbZ53XfoQfvT8dj/uhBWX5os8kBJQ1LrNvH3VX7byFQdUJMPiEr8Fkj0q2i1pw+L8KFrvR0MLXq2xaO21nlQQXmEPofJxpDQZwEWUIFZsToXo1kLRD3t6WQezxWB8YTzXHM20Ba73x/ZuuezVhOFOq1U8HKf1dXQdv7gBzEB6fWMmFDc3FuH8GDDHv3LfT86Gio9VgMO6ohlrUdf3ZKtTHeLSuzGF4t0RZuX97YBNo25IIzpeTfRTXBxfdxA"),
- @ApiImplicitParam(name = "srid", value = "绌洪棿寮曠敤鏍囪瘑绗�", dataType = "Integer", paramType = "query", example = "4326")
+ @ApiImplicitParam(name = "wkt", value = "WKT锛堣憲鍚嶆枃鏈級", dataType = "String", paramType = "query", example = "gAPpDbZ53XfoQfvT8dj/uhBWX5os8kBJQ1LrNvH3VX7byFQdUJMPiEr8Fkj0q2i1pw+L8KFrvR0MLXq2xaO21nlQQXmEPofJxpDQZwEWUIFZsToXo1kLRD3t6WQezxWB8YTzXHM20Ba73x/ZuuezVhOFOq1U8HKf1dXQdv7gBzEB6fWMmFDc3FuH8GDDHv3LfT86Gio9VgMO6ohlrUdf3ZKtTHeLSuzGF4t0RZuX97YBNo25IIzpeTfRTXBxfdxA")
})
- @GetMapping({"/selectCount"})
- public ResponseMsg<Long> selectCount(String name, String filter, String wkt, Integer srid) {
+ @GetMapping(value = "/selectCount")
+ @PostMapping(value = "/selectCount")
+ public ResponseMsg<Long> selectCount(String name, String filter, String wkt) {
try {
BasicMapper baseMapper = baseQueryService.getBasicMapper(name);
if (baseMapper == null) {
@@ -47,7 +50,7 @@
QueryWrapper wrapper = new QueryWrapper();
baseQueryService.addFilterWrapper(wrapper, filter);
- baseQueryService.addGeomWrapper(baseMapper, wrapper, wkt, srid);
+ baseQueryService.addGeomWrapper(baseMapper, wrapper, wkt);
long count = baseMapper.selectCount(wrapper);
@@ -63,12 +66,13 @@
@ApiImplicitParam(name = "name", value = "鏄犲皠鍚嶇О", dataType = "String", paramType = "query", example = "dlgAgnp"),
@ApiImplicitParam(name = "filter", value = "杩囨护鏉′欢", dataType = "String", paramType = "query", example = ""),
@ApiImplicitParam(name = "wkt", value = "WKT锛堣憲鍚嶆枃鏈級", dataType = "String", paramType = "query", example = ""),
- @ApiImplicitParam(name = "srid", value = "绌洪棿寮曠敤鏍囪瘑绗�", dataType = "Integer", paramType = "query", example = "4326"),
+ //@ApiImplicitParam(name = "srid", value = "绌洪棿寮曠敤鏍囪瘑绗�", dataType = "Integer", paramType = "query", example = "4326"),
@ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1"),
@ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10")
})
@GetMapping(value = "/selectByPage")
- public ResponseMsg<List<Object>> selectByPage(String name, String filter, String wkt, Integer srid, Integer pageIndex, Integer pageSize) {
+ @PostMapping(value = "/selectByPage")
+ public ResponseMsg<List<Object>> selectByPage(String name, String filter, String wkt, Integer pageIndex, Integer pageSize) {
try {
BasicMapper baseMapper = baseQueryService.getBasicMapper(name);
if (baseMapper == null) {
@@ -77,7 +81,7 @@
QueryWrapper wrapper = new QueryWrapper();
baseQueryService.addFilterWrapper(wrapper, filter);
- baseQueryService.addGeomWrapper(baseMapper, wrapper, wkt, srid);
+ baseQueryService.addGeomWrapper(baseMapper, wrapper, wkt);
Page<Object> page = new Page<>(pageIndex, pageSize);
page.addOrder(OrderItem.asc("gid"));
@@ -189,9 +193,63 @@
@SysLog()
@ApiOperation(value = "鏌ヨ鎵�鏈夎〃")
@GetMapping(value = "/selectTabs")
- public ResponseMsg<List<DictEntity>> selectTabs() {
+ public ResponseMsg<List<TabEntity>> selectTabs() {
try {
- List<DictEntity> list = baseQueryService.selectTabs();
+ List<TabEntity> list = baseQueryService.selectTabs();
+
+ return success(list);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏌ヨ瀛楁淇℃伅")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "name", value = "鏄犲皠鍚嶇О", dataType = "String", paramType = "query", example = "dlg25wAanp")
+ })
+ @GetMapping(value = "/selectFields")
+ public ResponseMsg<List<DictEntity>> selectFields(String name) {
+ try {
+ 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) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏌ヨ鍊煎煙淇℃伅")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "name", value = "鏄犲皠鍚嶇О", dataType = "String", paramType = "query", example = "dlg25wAanp")
+ })
+ @GetMapping(value = "/selectDomains")
+ public ResponseMsg<List<DomainEntity>> selectDomains(String name) {
+ try {
+ 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) {
--
Gitblit v1.9.3