From 34a130282a3ff8fb0b9afdb4e5b986fb5178625f Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 29 十月 2022 10:22:52 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/all/BaseQueryController.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 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 add5aaf..86d8f1f 100644
--- a/src/main/java/com/lf/server/controller/all/BaseQueryController.java
+++ b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.lf.server.aspect.SysLog;
import com.lf.server.entity.all.ResponseMsg;
+import com.lf.server.entity.bd.DlgAgnpEntity;
import com.lf.server.helper.AesHelper;
import com.lf.server.helper.StringHelper;
import com.lf.server.mapper.all.GeomBaseMapper;
@@ -31,18 +32,20 @@
@ApiOperation(value = "鏌ヨ璁板綍鏁�")
@ApiImplicitParams({
@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")
})
@GetMapping({"/selectCount"})
- public ResponseMsg<Long> selectCount(String name, String wkt, Integer srid) {
+ public ResponseMsg<Long> selectCount(String name, String filter, String wkt, Integer srid) {
try {
BaseMapper baseMapper = baseQueryService.getBaseMapper(name);
if (baseMapper == null) {
return fail("鏌ヨ瀵硅薄涓嶅瓨鍦�", null);
}
- QueryWrapper<Object> wrapper = new QueryWrapper<>();
+ QueryWrapper wrapper = new QueryWrapper();
+ baseQueryService.addFilterWrapper(wrapper, filter);
baseQueryService.addGeomWrapper(baseMapper, wrapper, wkt, srid);
long count = baseMapper.selectCount(wrapper);
@@ -57,20 +60,22 @@
@ApiOperation(value = "鍒嗛〉鏌ヨ")
@ApiImplicitParams({
@ApiImplicitParam(name = "name", value = "鏄犲皠鍚嶇О", dataType = "String", paramType = "query", example = "dlgAgnp"),
+ @ApiImplicitParam(name = "filter", value = "杩囨护鏉′欢", dataType = "String", paramType = "query", example = "1=1 and 2>=1"),
@ApiImplicitParam(name = "wkt", value = "WKT锛堣憲鍚嶆枃鏈級", dataType = "String", paramType = "query", example = ""),
@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 wkt, Integer srid, Integer pageIndex, Integer pageSize) {
+ public ResponseMsg<List<Object>> selectByPage(String name, String filter, String wkt, Integer srid, Integer pageIndex, Integer pageSize) {
try {
BaseMapper baseMapper = baseQueryService.getBaseMapper(name);
if (baseMapper == null) {
return fail("鏌ヨ瀵硅薄涓嶅瓨鍦�", null);
}
- QueryWrapper<Object> wrapper = new QueryWrapper<>();
+ QueryWrapper wrapper = new QueryWrapper();
+ baseQueryService.addFilterWrapper(wrapper, filter);
baseQueryService.addGeomWrapper(baseMapper, wrapper, wkt, srid);
Page<Object> page = new Page<>(pageIndex, pageSize);
--
Gitblit v1.9.3