From 29af0d3a73d8cac88a3d1798c03d60dd025fd8d7 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 28 十月 2022 15:46:53 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/all/BaseQueryController.java | 58 +++++++++++++++++++++++++++-------------------------------
1 files changed, 27 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 bfbaf01..add5aaf 100644
--- a/src/main/java/com/lf/server/controller/all/BaseQueryController.java
+++ b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
@@ -1,5 +1,6 @@
package com.lf.server.controller.all;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
@@ -7,12 +8,13 @@
import com.lf.server.aspect.SysLog;
import com.lf.server.entity.all.ResponseMsg;
import com.lf.server.helper.AesHelper;
-import com.lf.server.helper.ClassHelper;
import com.lf.server.helper.StringHelper;
import com.lf.server.mapper.all.GeomBaseMapper;
+import com.lf.server.service.all.BaseQueryService;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import java.util.List;
@@ -22,25 +24,28 @@
* @author WWW
*/
public class BaseQueryController extends BaseController {
+ @Autowired
+ BaseQueryService baseQueryService;
+
@SysLog()
@ApiOperation(value = "鏌ヨ璁板綍鏁�")
@ApiImplicitParams({
- @ApiImplicitParam(name = "name", value = "鏄犲皠鍚嶇О", dataType = "String", paramType = "query", example = "dlgAgnp")
+ @ApiImplicitParam(name = "name", value = "鏄犲皠鍚嶇О", dataType = "String", paramType = "query", example = "dlgAgnp"),
+ @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) {
+ public ResponseMsg<Long> selectCount(String name, String wkt, Integer srid) {
try {
- if (StringHelper.isEmpty(name)) {
- return fail("鍚嶇О绌洪棿鍜屽疄浣撳悕绉颁笉鑳戒负绌�", null);
- }
-
- Object obj = ClassHelper.getBean(name.trim() + "Mapper");
- if (!(obj instanceof BaseMapper)) {
+ BaseMapper baseMapper = baseQueryService.getBaseMapper(name);
+ if (baseMapper == null) {
return fail("鏌ヨ瀵硅薄涓嶅瓨鍦�", null);
}
- BaseMapper baseMapper = (BaseMapper) obj;
- long count = baseMapper.selectCount(null);
+ QueryWrapper<Object> wrapper = new QueryWrapper<>();
+ baseQueryService.addGeomWrapper(baseMapper, wrapper, wkt, srid);
+
+ long count = baseMapper.selectCount(wrapper);
return success(count);
} catch (Exception ex) {
@@ -52,29 +57,25 @@
@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 = "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, Integer pageIndex, Integer pageSize) {
+ public ResponseMsg<List<Object>> selectByPage(String name, String wkt, Integer srid, Integer pageIndex, Integer pageSize) {
try {
- if (pageSize < 1 || pageIndex < 1) {
- return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
- }
- if (StringHelper.isEmpty(name)) {
- return fail("鍚嶇О绌洪棿鍜屽疄浣撳悕绉颁笉鑳戒负绌�", null);
- }
-
- Object obj = ClassHelper.getBean(name.trim() + "Mapper");
- if (!(obj instanceof BaseMapper)) {
+ BaseMapper baseMapper = baseQueryService.getBaseMapper(name);
+ if (baseMapper == null) {
return fail("鏌ヨ瀵硅薄涓嶅瓨鍦�", null);
}
- BaseMapper baseMapper = (BaseMapper) obj;
+ QueryWrapper<Object> wrapper = new QueryWrapper<>();
+ baseQueryService.addGeomWrapper(baseMapper, wrapper, wkt, srid);
+
Page<Object> page = new Page<>(pageIndex, pageSize);
page.addOrder(OrderItem.asc("gid"));
-
- IPage<Object> paged = baseMapper.selectPage(page, null);
+ IPage<Object> paged = baseMapper.selectPage(page, wrapper);
return success(paged.getTotal(), paged.getRecords());
} catch (Exception ex) {
@@ -91,16 +92,11 @@
@GetMapping(value = "/selectWktById")
public ResponseMsg<String> selectWktById(String name, Integer gid) {
try {
- if (StringHelper.isEmpty(name)) {
- return fail("鍚嶇О绌洪棿鍜屽疄浣撳悕绉颁笉鑳戒负绌�", null);
- }
-
- Object obj = ClassHelper.getBean(name.trim() + "Mapper");
- if (!(obj instanceof GeomBaseMapper)) {
+ GeomBaseMapper baseMapper = baseQueryService.getGeoBaseMapper(name);
+ if (baseMapper == null) {
return fail("鏌ヨ瀵硅薄涓嶅瓨鍦�", null);
}
- GeomBaseMapper baseMapper = (GeomBaseMapper) obj;
String wkt = baseMapper.selectWktById(gid);
if (!StringHelper.isEmpty(wkt)) {
wkt = AesHelper.encrypt(wkt);
--
Gitblit v1.9.3