From 941e712345732219eb2437d123d39e3ed15cd83e Mon Sep 17 00:00:00 2001 From: 13693261870 <252740454@qq.com> Date: 星期一, 27 三月 2023 16:48:55 +0800 Subject: [PATCH] 1 --- src/main/java/com/lf/server/service/show/DataLibService.java | 55 +++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 35 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/lf/server/service/show/DataLibService.java b/src/main/java/com/lf/server/service/show/DataLibService.java index 5f43fca..24a644a 100644 --- a/src/main/java/com/lf/server/service/show/DataLibService.java +++ b/src/main/java/com/lf/server/service/show/DataLibService.java @@ -47,33 +47,28 @@ */ public List<String> selectDbOverflowDep(UserEntity ue, DownloadReqEntity dr) { if (!StringHelper.isEmpty(dr.getWkt())) { - return selectDbOverflowDep4Wkt(ue, dr.getEntities(), dr.getWkt()); + return selectDbOverflowDep4Wkt(ue, dr); } - return selectDbOverflowDep4Prop(ue, dr.getEntities().get(0), dr.getIds(), dr.getFilter()); + return selectDbOverflowDep4Prop(ue, dr); } /** * 鏌ヨDB涓孩鍑虹殑鍗曚綅缂栫爜-绌洪棿鏌ヨ */ - public List<String> selectDbOverflowDep4Wkt(UserEntity ue, List<String> entities, String wkt) { + public List<String> selectDbOverflowDep4Wkt(UserEntity ue, DownloadReqEntity dr) { List<String> rs = new ArrayList<>(); - for (String entity : entities) { + for (String entity : dr.getEntities()) { try { GeomBaseMapper<?> baseMapper = ClassHelper.getGeoBaseMapper(entity); if (null == baseMapper) { continue; } - QueryWrapper wrapper = new QueryWrapper(); - wrapper.select("depid"); - // wrapper.gt("depid", 0); wrapper.apply(String.format("depid != ALL(fn_rec_array(%d, 'dep'))", ue.getDepid())) - wrapper.apply("depid is not null and depid not like '" + ue.getDepcode() + "%'"); - wrapper.groupBy("depid"); - + QueryWrapper wrapper = getWrapper4DbOverflow(ue, dr); Integer srid = baseQueryService.getSrid(baseMapper); if (null != srid) { - wrapper.apply(String.format("ST_Intersects(ST_PolygonFromText('%s', %d), geom)", wkt, srid)); + wrapper.apply(String.format("ST_Intersects(ST_PolygonFromText('%s', %d), geom)", dr.getWkt(), srid)); } List<String> ids = baseMapper.selectObjs(wrapper); @@ -89,21 +84,15 @@ /** * 鏌ヨDB涓孩鍑虹殑鍗曚綅缂栫爜-灞炴�ф煡璇� */ - public List<String> selectDbOverflowDep4Prop(UserEntity ue, String entity, List<Integer> gids, String filter) { + public List<String> selectDbOverflowDep4Prop(UserEntity ue, DownloadReqEntity dr) { List<String> rs = new ArrayList<>(); try { - BasicMapper<?> baseMapper = ClassHelper.getBasicMapper(entity); + BasicMapper<?> baseMapper = ClassHelper.getBasicMapper(dr.getEntities().get(0)); if (null == baseMapper) { return rs; } - QueryWrapper wrapper = new QueryWrapper(); - wrapper.select("depid"); - baseQueryService.addFilterWrapper(wrapper, filter); - if (null != gids && gids.size() > 0) { - wrapper.apply(String.format("gid in (%s)", StringHelper.join(gids, ","))); - } - wrapper.groupBy("depid"); + QueryWrapper wrapper = getWrapper4DbOverflow(ue, dr); List<String> ids = baseMapper.selectObjs(wrapper); addDepCodes(rs, ids); @@ -115,6 +104,32 @@ } /** + * 鏌ヨDB涓孩鍑哄崟浣嶇紪鐮佺殑鏌ヨ鍖呰 + */ + private <T> QueryWrapper<T> getWrapper4DbOverflow(UserEntity ue, DownloadReqEntity dr) { + QueryWrapper<T> wrapper = new QueryWrapper<T>(); + wrapper.select("depid"); + wrapper.groupBy("depid"); + wrapper.apply("depid is not null and depid not like '" + ue.getDepcode() + "%'"); + + if (null != dr.getIds() && dr.getIds().size() > 0) { + wrapper.apply(String.format("gid in (%s)", StringHelper.join(dr.getIds(), ","))); + } else { + baseQueryService.addFilterWrapper(wrapper, dr.getFilter()); + } + + String dirs = copeCodes(dr.getDirs(), "dirid"); + if (!StringHelper.isEmpty(dirs)) { + wrapper.apply(dirs); + } + if (!StringHelper.isEmpty(dr.getDepcode())) { + wrapper.likeRight("depid", dr.getDepcode()); + } + + return wrapper; + } + + /** * 娣诲姞鍗曚綅缂栫爜 */ private void addDepCodes(List<String> rs, List<String> ids) { -- Gitblit v1.9.3