From e26af85e049516e6ce2b082bc2bc90bf71643e95 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 24 三月 2023 09:06:30 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/all/BaseQueryController.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 51 insertions(+), 6 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 8ee0d1f..e57f134 100644
--- a/src/main/java/com/lf/server/controller/all/BaseQueryController.java
+++ b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
@@ -132,7 +132,7 @@
}
Page<Object> page = new Page<>(pageIndex, pageSize);
- page.addOrder(OrderItem.asc("gid"));
+ page.addOrder(OrderItem.desc("gid"));
IPage<Object> paged = baseMapper.selectPage(page, wrapper);
return success(paged.getTotal(), paged.getRecords());
@@ -168,12 +168,13 @@
}
QueryWrapper wrapper = new QueryWrapper();
+ wrapper.select("ST_AsText(geom) as geom, *");
baseQueryService.addBufferWrapper(baseMapper, wrapper, wkt, buffer);
wrapper.last("limit " + limit);
List<?> list = baseMapper.selectList(wrapper);
- return success(list);
+ return success(null == list ? 0 : list.size(), list);
} catch (Exception ex) {
return fail(ex, null);
}
@@ -241,6 +242,53 @@
}
@SysLog()
+ @ApiOperation(value = "鏍规嵁GID鏌ヨ")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "name", value = "鏄犲皠鍚嶇О", dataType = "String", paramType = "query", example = "dlgagnp"),
+ @ApiImplicitParam(name = "gid", value = "GID", dataType = "int", paramType = "query", example = "1")
+ })
+ @GetMapping(value = "/selectByGid")
+ public ResponseMsg<Object> selectByGid(String name, int gid) {
+ try {
+ GeomBaseMapper baseMapper = ClassHelper.getGeoBaseMapper(name);
+ if (baseMapper == null) {
+ return fail("鏌ヨ瀵硅薄涓嶅瓨鍦�", null);
+ }
+
+ QueryWrapper wrapper = new QueryWrapper();
+ wrapper.select("ST_AsText(geom) as geom, *");
+ wrapper.eq("gid", gid);
+
+ Object obj = baseMapper.selectOne(wrapper);
+
+ return success(null == obj ? 0 : 1, obj);
+ } catch (Exception ex) {
+ return fail(ex, null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏍规嵁瀹炰綋鍚嶆煡璇㈣〃鍚�")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "name", value = "鏄犲皠鍚嶇О", dataType = "String", paramType = "query", example = "dlgagnp")
+ })
+ @GetMapping(value = "/selectTabByEntity")
+ public ResponseMsg<Object> selectTabByEntity(String name) {
+ try {
+ BasicMapper baseMapper = ClassHelper.getBasicMapper(name);
+ if (baseMapper == null) {
+ return fail("鏌ヨ瀵硅薄涓嶅瓨鍦�", null);
+ }
+
+ String tab = BaseQueryService.getTabName(baseMapper);
+
+ return success(tab);
+ } catch (Exception ex) {
+ return fail(ex, null);
+ }
+ }
+
+ @SysLog()
@ApiOperation(value = "妯＄硦鎼滅储瀛楁")
@ApiImplicitParams({
@ApiImplicitParam(name = "name", value = "鏄犲皠鍚嶇О", dataType = "String", paramType = "query", example = "dlgagnp"),
@@ -262,11 +310,8 @@
if (StringHelper.isEmpty(field) || StringHelper.isSqlInjection(field)) {
return fail("鏌ヨ瀛楁涓嶆纭�", null);
}
- if (!StringHelper.isEmpty(value)) {
- value = value.trim().replace("'", "");
- }
- value = StringHelper.getLikeStr2(value);
+ value = StringHelper.isEmpty(value) ? "%" : StringHelper.getLikeUpperStr(value);
List<String> rs = baseMapper.selectFieldFuzzy(tab, field, value);
return success(rs);
--
Gitblit v1.9.3