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 | 182 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 151 insertions(+), 31 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 3d2b6c5..e57f134 100644
--- a/src/main/java/com/lf/server/controller/all/BaseQueryController.java
+++ b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.lf.server.annotation.SysLog;
import com.lf.server.entity.all.ResponseMsg;
+import com.lf.server.entity.all.StaticData;
import com.lf.server.entity.ctrl.DownloadReqEntity;
import com.lf.server.entity.ctrl.IdNameEntity;
import com.lf.server.entity.ctrl.KeyValueEntity;
@@ -19,6 +20,7 @@
import com.lf.server.mapper.all.BasicMapper;
import com.lf.server.mapper.all.GeomBaseMapper;
import com.lf.server.service.all.BaseQueryService;
+import com.lf.server.service.data.DictService;
import com.lf.server.service.data.DirService;
import com.lf.server.service.data.DownloadService;
import com.lf.server.service.data.MetaService;
@@ -65,6 +67,9 @@
@Autowired
BaseQueryService baseQueryService;
+ @Autowired
+ DictService dictService;
+
@SysLog()
@ApiOperation(value = "鏌ヨ璁板綍鏁�")
@ApiImplicitParams({
@@ -89,7 +94,7 @@
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -127,12 +132,51 @@
}
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());
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "缂撳啿鍖烘煡璇�")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "name", value = "鏄犲皠鍚嶇О", dataType = "String", paramType = "query", example = "dlgagnp"),
+ @ApiImplicitParam(name = "wkt", value = "WKT锛堣憲鍚嶆枃鏈級", dataType = "String", paramType = "query", example = ""),
+ @ApiImplicitParam(name = "buffer", value = "缂撳啿鍖哄ぇ灏�", dataType = "Double", paramType = "query", example = "10"),
+ @ApiImplicitParam(name = "limit", value = "闄愬埗鏉℃暟", dataType = "Integer", paramType = "query", example = "20")
+ })
+ @GetMapping(value = "/selectByBuffer")
+ public ResponseMsg<List<?>> selectByBuffer(String name, String wkt, Double buffer, Integer limit) {
+ try {
+ if (StringHelper.isEmpty(wkt)) {
+ return fail("WKT涓嶈兘涓虹┖", null);
+ }
+ if (null == limit || limit < 1 || limit > StaticData.ONE_HUNDRED) {
+ limit = 20;
+ }
+ if (null == buffer || buffer < 0 || buffer > StaticData.ONE_HUNDRED_THOUSAND) {
+ buffer = 10.0;
+ }
+
+ GeomBaseMapper baseMapper = ClassHelper.getGeoBaseMapper(name);
+ if (baseMapper == null) {
+ return fail("鏌ヨ瀵硅薄涓嶅瓨鍦�", null);
+ }
+
+ 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(null == list ? 0 : list.size(), list);
+ } catch (Exception ex) {
+ return fail(ex, null);
}
}
@@ -163,7 +207,7 @@
return success(count, rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -193,7 +237,54 @@
return success(wkt);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
+ }
+ }
+
+ @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);
}
}
@@ -219,16 +310,13 @@
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);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -244,7 +332,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -260,20 +348,24 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@SysLog()
@ApiOperation(value = "鏌ヨ鎵�鏈夎〃")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = "鐐�"),
+ @ApiImplicitParam(name = "hasGeom", value = "鍚湁Geom瀛楁", dataType = "Boolean", paramType = "query", example = "false")
+ })
@GetMapping(value = "/selectTabs")
- public ResponseMsg<List<TabEntity>> selectTabs() {
+ public ResponseMsg<List<TabEntity>> selectTabs(String name, Boolean hasGeom) {
try {
- List<TabEntity> list = baseQueryService.selectTabs();
+ List<TabEntity> list = dictService.selectDictTab(name, null == hasGeom || !hasGeom ? "gid" : "geom");
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -284,10 +376,11 @@
@ApiImplicitParam(name = "depcode", value = "鍗曚綅缂栫爜", dataType = "String", paramType = "query", example = "00"),
@ApiImplicitParam(name = "dirs", value = "鐩綍缂栫爜", dataType = "String", paramType = "query", example = "00,01"),
@ApiImplicitParam(name = "tab", value = "琛ㄥ悕", dataType = "String", paramType = "query", example = "dlg_"),
+ @ApiImplicitParam(name = "hasGeom", value = "鍚湁Geom瀛楁", dataType = "Boolean", paramType = "query", example = "false"),
@ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
@ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
})
- public ResponseMsg<List<TabEntity>> selectTabsByPage(String depcode, String dirs, String tab, Integer pageSize, Integer pageIndex) {
+ public ResponseMsg<Object> selectTabsByPage(String depcode, String dirs, String tab, Boolean hasGeom, Integer pageSize, Integer pageIndex) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
@@ -305,16 +398,17 @@
filters += String.format(" and (%s)", dirs);
}
- int count = baseQueryService.selectTabsForCount(tab);
+ String field = null == hasGeom || !hasGeom ? "gid" : "geom";
+ int count = baseQueryService.selectTabsForCount(tab, field);
if (count == 0) {
return success(0, null);
}
- List<TabEntity> rs = baseQueryService.selectTabsByPage(tab, filters, pageSize, pageSize * (pageIndex - 1));
+ List<TabEntity> rs = baseQueryService.selectTabsByPage(tab, field, filters, pageSize, pageSize * (pageIndex - 1));
return success(count, rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -341,7 +435,7 @@
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -362,7 +456,7 @@
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -389,7 +483,7 @@
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -410,7 +504,7 @@
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -430,7 +524,7 @@
return success(rows);
} catch (Exception ex) {
- return fail(ex.getMessage(), 0);
+ return fail(ex, 0);
}
}
@@ -456,7 +550,7 @@
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -476,7 +570,7 @@
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -512,7 +606,7 @@
return success(guid);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -544,8 +638,18 @@
return success(guid);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏌ョ湅鏂囦欢")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "guid", value = "闄勪欢Guid", dataType = "String", paramType = "body")
+ })
+ @GetMapping(value = "/downloadForView")
+ public void downloadForView(String guid, HttpServletResponse res) {
+ metaService.downloadForView(guid, true, res);
}
@SysLog()
@@ -575,7 +679,7 @@
return success(count, rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -591,7 +695,7 @@
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -607,7 +711,23 @@
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏍规嵁鍏冩暟鎹甀D鏌ヨ")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "ID", dataType = "int", paramType = "query", example = "1")
+ })
+ @GetMapping(value = "/selectMetaById")
+ public ResponseMsg<MetaEntity> selectMetaById(int id) {
+ try {
+ MetaEntity entity = metaService.selectById(id);
+
+ return success(entity);
+ } catch (Exception ex) {
+ return fail(ex, null);
}
}
}
\ No newline at end of file
--
Gitblit v1.9.3