From 9fa4958a59f679df9349f65e8fc6aaded488b604 Mon Sep 17 00:00:00 2001 From: 13693261870 <252740454@qq.com> Date: 星期四, 27 十月 2022 20:53:16 +0800 Subject: [PATCH] 1 --- data/menu.xls | 0 src/main/java/com/lf/server/controller/data/DataQueryController.java | 109 ------------- src/main/java/com/lf/server/controller/show/InquiryController.java | 102 ------------ data/db_fn.sql | 6 src/main/java/com/lf/server/controller/all/BaseQueryController.java | 114 ++++++++++++++ 说明.txt | 1 src/main/java/com/lf/server/controller/show/DataLibController.java | 109 ------------- 7 files changed, 123 insertions(+), 318 deletions(-) diff --git a/data/db_fn.sql b/data/db_fn.sql index 56087ae..7d0ecec 100644 --- a/data/db_fn.sql +++ b/data/db_fn.sql @@ -238,9 +238,9 @@ select a.*,coalesce(a.native,'') from lf.sys_user a; select * from lf.sys_menu order by id; - - - +select * from lf.sys_blacklist where type = 1; +select * from lf.sys_operate where modular1 is null or modular2 is null; +select count(*) from bd.dlg_agnp; diff --git a/data/menu.xls b/data/menu.xls index 9cf3832..9427c2f 100644 --- a/data/menu.xls +++ b/data/menu.xls Binary files differ diff --git a/src/main/java/com/lf/server/controller/all/BaseQueryController.java b/src/main/java/com/lf/server/controller/all/BaseQueryController.java new file mode 100644 index 0000000..bfbaf01 --- /dev/null +++ b/src/main/java/com/lf/server/controller/all/BaseQueryController.java @@ -0,0 +1,114 @@ +package com.lf.server.controller.all; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +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.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 io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.GetMapping; + +import java.util.List; + +/** + * 鐖舵煡璇㈡帶鍒跺櫒 + * @author WWW + */ +public class BaseQueryController extends BaseController { + @SysLog() + @ApiOperation(value = "鏌ヨ璁板綍鏁�") + @ApiImplicitParams({ + @ApiImplicitParam(name = "name", value = "鏄犲皠鍚嶇О", dataType = "String", paramType = "query", example = "dlgAgnp") + }) + @GetMapping({"/selectCount"}) + public ResponseMsg<Long> selectCount(String name) { + try { + if (StringHelper.isEmpty(name)) { + return fail("鍚嶇О绌洪棿鍜屽疄浣撳悕绉颁笉鑳戒负绌�", null); + } + + Object obj = ClassHelper.getBean(name.trim() + "Mapper"); + if (!(obj instanceof BaseMapper)) { + return fail("鏌ヨ瀵硅薄涓嶅瓨鍦�", null); + } + + BaseMapper baseMapper = (BaseMapper) obj; + long count = baseMapper.selectCount(null); + + return success(count); + } catch (Exception ex) { + return fail(ex.getMessage(), null); + } + } + + @SysLog() + @ApiOperation(value = "鍒嗛〉鏌ヨ") + @ApiImplicitParams({ + @ApiImplicitParam(name = "name", value = "鏄犲皠鍚嶇О", dataType = "String", paramType = "query", example = "dlgAgnp"), + @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) { + 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)) { + return fail("鏌ヨ瀵硅薄涓嶅瓨鍦�", null); + } + + BaseMapper baseMapper = (BaseMapper) obj; + Page<Object> page = new Page<>(pageIndex, pageSize); + page.addOrder(OrderItem.asc("gid")); + + IPage<Object> paged = baseMapper.selectPage(page, null); + + return success(paged.getTotal(), paged.getRecords()); + } catch (Exception ex) { + return fail(ex.getMessage(), null); + } + } + + @SysLog() + @ApiOperation(value = "鏍规嵁ID鏌ヨWKT") + @ApiImplicitParams({ + @ApiImplicitParam(name = "name", value = "鏄犲皠鍚嶇О", dataType = "String", paramType = "query", example = "dlgAgnp"), + @ApiImplicitParam(name = "gid", value = "GID", dataType = "Integer", paramType = "query", example = "1") + }) + @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)) { + return fail("鏌ヨ瀵硅薄涓嶅瓨鍦�", null); + } + + GeomBaseMapper baseMapper = (GeomBaseMapper) obj; + String wkt = baseMapper.selectWktById(gid); + if (!StringHelper.isEmpty(wkt)) { + wkt = AesHelper.encrypt(wkt); + } + + return success(wkt); + } catch (Exception ex) { + return fail(ex.getMessage(), null); + } + } +} diff --git a/src/main/java/com/lf/server/controller/data/DataQueryController.java b/src/main/java/com/lf/server/controller/data/DataQueryController.java index 990aaae..3f5be37 100644 --- a/src/main/java/com/lf/server/controller/data/DataQueryController.java +++ b/src/main/java/com/lf/server/controller/data/DataQueryController.java @@ -1,25 +1,9 @@ package com.lf.server.controller.data; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -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.controller.all.BaseController; -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.controller.all.BaseQueryController; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; - -import java.util.List; /** * 鏁版嵁妫�绱� @@ -28,94 +12,5 @@ @Api(tags = "鏁版嵁绠$悊\\鏁版嵁妫�绱�") @RestController @RequestMapping("/dataQuery") -public class DataQueryController extends BaseController { - @SysLog() - @ApiOperation(value = "鏌ヨ璁板綍鏁�") - @ApiImplicitParams({ - @ApiImplicitParam(name = "name", value = "鏄犲皠鍚嶇О", dataType = "String", paramType = "query", example = "dlgAgnp") - }) - @GetMapping({"/selectCount"}) - public ResponseMsg<Long> selectCount(String name) { - try { - if (StringHelper.isEmpty(name)) { - return fail("鍚嶇О绌洪棿鍜屽疄浣撳悕绉颁笉鑳戒负绌�", null); - } - - Object obj = ClassHelper.getBean(name.trim() + "Mapper"); - if (!(obj instanceof BaseMapper)) { - return fail("鏌ヨ瀵硅薄涓嶅瓨鍦�", null); - } - - BaseMapper baseMapper = (BaseMapper) obj; - long count = baseMapper.selectCount(null); - - return success(count); - } catch (Exception ex) { - return fail(ex.getMessage(), null); - } - } - - @SysLog() - @ApiOperation(value = "鍒嗛〉鏌ヨ") - @ApiImplicitParams({ - @ApiImplicitParam(name = "name", value = "鏄犲皠鍚嶇О", dataType = "String", paramType = "query", example = "dlgAgnp"), - @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) { - 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)) { - return fail("鏌ヨ瀵硅薄涓嶅瓨鍦�", null); - } - - BaseMapper baseMapper = (BaseMapper) obj; - Page<Object> page = new Page<>(pageIndex, pageSize); - page.addOrder(OrderItem.asc("gid")); - - IPage<Object> paged = baseMapper.selectPage(page, null); - - return success(paged.getTotal(), paged.getRecords()); - } catch (Exception ex) { - return fail(ex.getMessage(), null); - } - } - - @SysLog() - @ApiOperation(value = "鏍规嵁ID鏌ヨWKT") - @ApiImplicitParams({ - @ApiImplicitParam(name = "name", value = "鏄犲皠鍚嶇О", dataType = "String", paramType = "query", example = "dlgAgnp"), - @ApiImplicitParam(name = "gid", value = "GID", dataType = "Integer", paramType = "query", example = "1") - }) - @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)) { - return fail("鏌ヨ瀵硅薄涓嶅瓨鍦�", null); - } - - GeomBaseMapper baseMapper = (GeomBaseMapper) obj; - String wkt = baseMapper.selectWktById(gid); - if (!StringHelper.isEmpty(wkt)) { - wkt = AesHelper.encrypt(wkt); - } - - return success(wkt); - } catch (Exception ex) { - return fail(ex.getMessage(), null); - } - } +public class DataQueryController extends BaseQueryController { } diff --git a/src/main/java/com/lf/server/controller/show/DataLibController.java b/src/main/java/com/lf/server/controller/show/DataLibController.java index 7c1b2fb..c62900e 100644 --- a/src/main/java/com/lf/server/controller/show/DataLibController.java +++ b/src/main/java/com/lf/server/controller/show/DataLibController.java @@ -1,25 +1,9 @@ package com.lf.server.controller.show; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -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.controller.all.BaseController; -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.controller.all.BaseQueryController; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; - -import java.util.List; /** * 璧勬枡棣� @@ -28,94 +12,5 @@ @Api(tags = "缁煎悎灞曠ず\\璧勬枡棣�") @RestController @RequestMapping("/dataLib") -public class DataLibController extends BaseController { - @SysLog() - @ApiOperation(value = "鏌ヨ璁板綍鏁�") - @ApiImplicitParams({ - @ApiImplicitParam(name = "name", value = "鏄犲皠鍚嶇О", dataType = "String", paramType = "query", example = "dlgAgnp") - }) - @GetMapping({"/selectCount"}) - public ResponseMsg<Long> selectCount(String name) { - try { - if (StringHelper.isEmpty(name)) { - return fail("鍚嶇О绌洪棿鍜屽疄浣撳悕绉颁笉鑳戒负绌�", null); - } - - Object obj = ClassHelper.getBean(name.trim() + "Mapper"); - if (!(obj instanceof BaseMapper)) { - return fail("鏌ヨ瀵硅薄涓嶅瓨鍦�", null); - } - - BaseMapper baseMapper = (BaseMapper) obj; - long count = baseMapper.selectCount(null); - - return success(count); - } catch (Exception ex) { - return fail(ex.getMessage(), null); - } - } - - @SysLog() - @ApiOperation(value = "鍒嗛〉鏌ヨ") - @ApiImplicitParams({ - @ApiImplicitParam(name = "name", value = "鏄犲皠鍚嶇О", dataType = "String", paramType = "query", example = "dlgAgnp"), - @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) { - 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)) { - return fail("鏌ヨ瀵硅薄涓嶅瓨鍦�", null); - } - - BaseMapper baseMapper = (BaseMapper) obj; - Page<Object> page = new Page<>(pageIndex, pageSize); - page.addOrder(OrderItem.asc("gid")); - - IPage<Object> paged = baseMapper.selectPage(page, null); - - return success(paged.getTotal(), paged.getRecords()); - } catch (Exception ex) { - return fail(ex.getMessage(), null); - } - } - - @SysLog() - @ApiOperation(value = "鏍规嵁ID鏌ヨWKT") - @ApiImplicitParams({ - @ApiImplicitParam(name = "name", value = "鏄犲皠鍚嶇О", dataType = "String", paramType = "query", example = "dlgAgnp"), - @ApiImplicitParam(name = "gid", value = "GID", dataType = "Integer", paramType = "query", example = "1") - }) - @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)) { - return fail("鏌ヨ瀵硅薄涓嶅瓨鍦�", null); - } - - GeomBaseMapper baseMapper = (GeomBaseMapper) obj; - String wkt = baseMapper.selectWktById(gid); - if (!StringHelper.isEmpty(wkt)) { - wkt = AesHelper.encrypt(wkt); - } - - return success(wkt); - } catch (Exception ex) { - return fail(ex.getMessage(), null); - } - } +public class DataLibController extends BaseQueryController { } diff --git a/src/main/java/com/lf/server/controller/show/InquiryController.java b/src/main/java/com/lf/server/controller/show/InquiryController.java index f657ed4..9845d1f 100644 --- a/src/main/java/com/lf/server/controller/show/InquiryController.java +++ b/src/main/java/com/lf/server/controller/show/InquiryController.java @@ -1,25 +1,17 @@ package com.lf.server.controller.show; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -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.controller.all.BaseController; +import com.lf.server.controller.all.BaseQueryController; import com.lf.server.entity.all.ResponseMsg; import com.lf.server.entity.ctrl.ShpRecordEntity; import com.lf.server.entity.data.MetaFileEntity; import com.lf.server.entity.sys.UserEntity; 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.data.UploaderService; import com.lf.server.service.show.InquiryService; import com.lf.server.service.sys.TokenService; import io.swagger.annotations.Api; -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.*; @@ -35,7 +27,7 @@ @Api(tags = "缁煎悎灞曠ず\\鏌ヨ") @RestController @RequestMapping("/inquiry") -public class InquiryController extends BaseController { +public class InquiryController extends BaseQueryController { private final static int FOUR = 4; @Autowired @@ -46,96 +38,6 @@ @Autowired InquiryService inquiryService; - - @SysLog() - @ApiOperation(value = "鏌ヨ璁板綍鏁�") - @ApiImplicitParams({ - @ApiImplicitParam(name = "name", value = "鏄犲皠鍚嶇О", dataType = "String", paramType = "query", example = "dlgAgnp") - }) - @GetMapping({"/selectCount"}) - public ResponseMsg<Long> selectCount(String name) { - try { - if (StringHelper.isEmpty(name)) { - return fail("鍚嶇О绌洪棿鍜屽疄浣撳悕绉颁笉鑳戒负绌�", null); - } - - Object obj = ClassHelper.getBean(name.trim() + "Mapper"); - if (!(obj instanceof BaseMapper)) { - return fail("鏌ヨ瀵硅薄涓嶅瓨鍦�", null); - } - - BaseMapper baseMapper = (BaseMapper) obj; - long count = baseMapper.selectCount(null); - - return success(count); - } catch (Exception ex) { - return fail(ex.getMessage(), null); - } - } - - @SysLog() - @ApiOperation(value = "鍒嗛〉鏌ヨ") - @ApiImplicitParams({ - @ApiImplicitParam(name = "name", value = "鏄犲皠鍚嶇О", dataType = "String", paramType = "query", example = "dlgAgnp"), - @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) { - 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)) { - return fail("鏌ヨ瀵硅薄涓嶅瓨鍦�", null); - } - - BaseMapper baseMapper = (BaseMapper) obj; - Page<Object> page = new Page<>(pageIndex, pageSize); - page.addOrder(OrderItem.asc("gid")); - - IPage<Object> paged = baseMapper.selectPage(page, null); - - return success(paged.getTotal(), paged.getRecords()); - } catch (Exception ex) { - return fail(ex.getMessage(), null); - } - } - - @SysLog() - @ApiOperation(value = "鏍规嵁ID鏌ヨWKT") - @ApiImplicitParams({ - @ApiImplicitParam(name = "name", value = "鏄犲皠鍚嶇О", dataType = "String", paramType = "query", example = "dlgAgnp"), - @ApiImplicitParam(name = "gid", value = "GID", dataType = "Integer", paramType = "query", example = "1") - }) - @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)) { - return fail("鏌ヨ瀵硅薄涓嶅瓨鍦�", null); - } - - GeomBaseMapper baseMapper = (GeomBaseMapper) obj; - String wkt = baseMapper.selectWktById(gid); - if (!StringHelper.isEmpty(wkt)) { - wkt = AesHelper.encrypt(wkt); - } - - return success(wkt); - } catch (Exception ex) { - return fail(ex.getMessage(), null); - } - } @SysLog() @ApiOperation(value = "涓婁紶Shp鏂囦欢璇诲彇绗竴鏉¤褰曠殑WKT") diff --git "a/\350\257\264\346\230\216.txt" "b/\350\257\264\346\230\216.txt" index 47d02ec..296e5b7 100644 --- "a/\350\257\264\346\230\216.txt" +++ "b/\350\257\264\346\230\216.txt" @@ -125,7 +125,6 @@ private static final String SQLSERVER_URL = "jdbc:sqlserver://192.168.0.77\\ZKZS;databaseName=xian"; ------------------------------------------------------------------------------------------------ 鏉冮檺 绠¢亾鍩虹澶ф暟鎹钩鍙帮細 鍒犻櫎 -缁煎悎灞曠ず\缁煎悎灞曠ず: 涓婁紶 缁煎悎灞曠ず\缁煎悎灞曠ず\鏌ヨ锛� 涓嬭浇銆佷笂浼� 缁煎悎灞曠ず\缁煎悎灞曠ず\鏍囩粯锛� 鏂板銆佷慨鏀广�佸垹闄� 缁煎悎灞曠ず\涓撻鍥撅細 缁熻 -- Gitblit v1.9.3