From b1e97e3b11b6f95b9e39cd475dca027ba690598c Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 29 五月 2023 10:38:32 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/all/BaseQueryController.java | 172 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 92 insertions(+), 80 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 0138ae9..f116f94 100644
--- a/src/main/java/com/lf/server/controller/all/BaseQueryController.java
+++ b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.lf.server.annotation.SysLog;
+import com.lf.server.entity.all.BaseGeoEntity;
import com.lf.server.entity.all.ResponseMsg;
import com.lf.server.entity.all.StaticData;
import com.lf.server.entity.ctrl.DownloadReqEntity;
@@ -27,6 +28,7 @@
import com.lf.server.service.show.DataLibService;
import com.lf.server.service.sys.AttachService;
import com.lf.server.service.sys.DepService;
+import com.lf.server.service.sys.DownlogService;
import com.lf.server.service.sys.TokenService;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -36,6 +38,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -62,7 +65,10 @@
DataLibService dataLibService;
@Autowired
- DownloadService downloadService;
+ public DownlogService downlogService;
+
+ @Autowired
+ public DownloadService downloadService;
@Autowired
BaseQueryService baseQueryService;
@@ -108,14 +114,15 @@
@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")
+ @ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
+ @ApiImplicitParam(name = "hasGeom", value = "鏄�/鍚﹀寘鍚┖闂翠俊鎭�", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping(value = "/selectByPage")
@PostMapping(value = "/selectByPage")
- public ResponseMsg<List<Object>> selectByPage(String name, String depcode, String dirs, String filter, String wkt, Integer pageIndex, Integer pageSize) {
+ public ResponseMsg<List<Object>> selectByPage(String name, String depcode, String dirs, String filter, String wkt, Integer pageIndex, Integer pageSize, Integer hasGeom) {
try {
BasicMapper baseMapper = ClassHelper.getBasicMapper(name);
- if (baseMapper == null) {
+ if (null == baseMapper) {
return fail("鏌ヨ瀵硅薄涓嶅瓨鍦�", null);
}
@@ -131,13 +138,51 @@
wrapper.apply(dirs);
}
+ boolean hasWkt = null != hasGeom && hasGeom > 0 && baseMapper instanceof GeomBaseMapper;
+ if (hasWkt) {
+ wrapper.select("ST_AsText(geom) as geom, *");
+ }
+
Page<Object> page = new Page<>(pageIndex, pageSize);
page.addOrder(OrderItem.desc("gid"));
IPage<Object> paged = baseMapper.selectPage(page, wrapper);
+ if (hasWkt && null != paged.getRecords()) {
+ copeWkt(paged.getRecords());
+ }
return success(paged.getTotal(), paged.getRecords());
} catch (Exception ex) {
return fail(ex, null);
+ }
+ }
+
+ /**
+ * 澶勭悊WKT
+ */
+ private void copeWkt(List<?> list) {
+ for (int i = 0, c = list.size(); i < c; i++) {
+ Object obj = list.get(i);
+ setWktEncrypt(obj);
+ }
+ }
+
+ /**
+ * 璁剧疆WKT鍔犲瘑
+ */
+ private void setWktEncrypt(Object obj) {
+ if (obj instanceof BaseGeoEntity) {
+ BaseGeoEntity entity = (BaseGeoEntity) obj;
+ if (StringHelper.isEmpty(entity.getGeom())) {
+ return;
+ }
+
+ try {
+ String wkt = AesHelper.encrypt(entity.getGeom());
+ entity.setGeom(wkt);
+ } catch (Exception ex) {
+ entity.setGeom(null);
+ log.error(ex.getMessage(), ex);
+ }
}
}
@@ -221,13 +266,13 @@
public ResponseMsg<String> selectWktById(String name, Integer gid) {
try {
GeomBaseMapper baseMapper = ClassHelper.getGeoBaseMapper(name);
- if (baseMapper == null) {
- return fail("鏌ヨ瀵硅薄涓嶅瓨鍦�", null);
+ if (null == baseMapper) {
+ return fail("鏌ヨ瀵硅薄涓嶅瓨鍦ㄦ垨涓嶆槸绌洪棿琛�", null);
}
String tab = BaseQueryService.getTabName(baseMapper);
if (StringHelper.isNull(tab)) {
- return fail("鏌ヨ瀵硅薄涓嶅瓨鍦�", null);
+ return fail("鏌ヨ瀵硅薄鐨勮〃鍚嶄笉瀛樺湪", null);
}
String wkt = baseMapper.selectWktById(tab, gid);
@@ -250,16 +295,19 @@
@GetMapping(value = "/selectByGid")
public ResponseMsg<Object> selectByGid(String name, int gid) {
try {
- GeomBaseMapper baseMapper = ClassHelper.getGeoBaseMapper(name);
- if (baseMapper == null) {
+ BasicMapper baseMapper = ClassHelper.getBasicMapper(name);
+ if (null == baseMapper) {
return fail("鏌ヨ瀵硅薄涓嶅瓨鍦�", null);
}
QueryWrapper wrapper = new QueryWrapper();
- wrapper.select("ST_AsText(geom) as geom, *");
+ if (baseMapper instanceof GeomBaseMapper) {
+ wrapper.select("ST_AsText(geom) as geom, *");
+ }
wrapper.eq("gid", gid);
Object obj = baseMapper.selectOne(wrapper);
+ setWktEncrypt(obj);
return success(null == obj ? 0 : 1, obj);
} catch (Exception ex) {
@@ -395,7 +443,7 @@
}
dirs = DataLibService.copeCodes(dirs, "dirid");
if (dirs != null) {
- filters += String.format(" and (%s)", dirs);
+ filters += String.format(" and %s", dirs);
}
String field = null == hasGeom || !hasGeom ? "gid" : "geom";
@@ -529,6 +577,32 @@
}
@SysLog()
+ @ApiOperation(value = "鏌ヨ鍏冩暟鎹腑婧㈠嚭鐨勫崟浣岻D")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "reqEntity", value = "璇锋眰涓嬭浇瀹炰綋", dataType = "DownloadReqEntity", paramType = "body")
+ })
+ @ResponseBody
+ @PostMapping(value = "/selectMetaOverflowDep")
+ public ResponseMsg<Object> selectMetaOverflowDep(@RequestBody DownloadReqEntity dr, HttpServletRequest req, HttpServletResponse res) {
+ try {
+ if (null == dr || null == dr.getIds() || dr.getIds().isEmpty()) {
+ return fail("璇烽�夋嫨瑕佷笅杞界殑鏂囦欢ID");
+ }
+
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (StaticData.ADMIN.equals(ue.getUid())) {
+ return success(new ArrayList<String>());
+ }
+
+ List<String> list = metaService.selectMetaOverflowDep(ue, dr);
+
+ return success(list);
+ } catch (Exception ex) {
+ return fail(ex, null);
+ }
+ }
+
+ @SysLog()
@ApiOperation(value = "鏌ヨDB涓孩鍑虹殑鍗曚綅ID")
@ApiImplicitParams({
@ApiImplicitParam(name = "reqEntity", value = "璇锋眰涓嬭浇瀹炰綋", dataType = "DownloadReqEntity", paramType = "body")
@@ -545,6 +619,10 @@
}
UserEntity ue = tokenService.getCurrentUser(req);
+ if (StaticData.ADMIN.equals(ue.getUid())) {
+ return success(new ArrayList<String>());
+ }
+
List<String> list = dataLibService.selectDbOverflowDep(ue, dr);
return success(list);
@@ -574,7 +652,7 @@
}
@SysLog()
- @ApiOperation(value = "璇锋眰DB鏁版嵁涓嬭浇")
+ @ApiOperation(value = "涓嬭浇DB鏁版嵁")
@ApiImplicitParams({
@ApiImplicitParam(name = "dr", value = "璇锋眰涓嬭浇瀹炰綋", dataType = "DownloadReqEntity", paramType = "body")
})
@@ -600,72 +678,6 @@
UserEntity ue = tokenService.getCurrentUser(req);
String guid = dataLibService.downloadDbReq(ue, dr);
-
- return success(guid);
- } catch (Exception ex) {
- return fail(ex, null);
- }
- }
-
- @SysLog()
- @ApiOperation(value = "璇锋眰DB鏁版嵁涓嬭浇")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "dr", value = "璇锋眰涓嬭浇瀹炰綋", dataType = "DownloadReqEntity", paramType = "body")
- })
- @ResponseBody
- @PostMapping(value = "/downloadDbReq")
- public ResponseMsg<Object> downloadDbReq(@RequestBody DownloadReqEntity dr, HttpServletRequest req, HttpServletResponse res) {
- try {
- if (null == dr || StringHelper.isEmpty(dr.getPwd())) {
- return fail("瀵嗙爜涓嶈兘涓虹┖");
- }
- if (null == dr.getEntities() || dr.getEntities().isEmpty()) {
- return fail("璇烽�夋嫨瑕佷笅杞界殑瀹炰綋鍚�");
- }
- dr.setWkt(AesHelper.decrypt(dr.getWkt()));
- if (StringHelper.isEmpty(dr.getWkt())) {
- return fail("璇烽�夋嫨瑕佷笅杞界殑WKT鑼冨洿");
- }
- if (!DownloadService.decryptPwd(dr)) {
- return fail("瀵嗙爜瑙ｅ瘑澶辫触", null);
- }
- if (StringHelper.isPwdInvalid(dr.getPwd())) {
- return fail("瀵嗙爜涓嶇鍚堣姹�");
- }
-
- UserEntity ue = tokenService.getCurrentUser(req);
- String guid = dataLibService.downloadDbReq4Wkt(ue, dr);
-
- return success(guid);
- } catch (Exception ex) {
- return fail(ex, null);
- }
- }
-
- @SysLog()
- @ApiOperation(value = "璇锋眰瀹炰綋鏁版嵁涓嬭浇")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "dre", value = "璇锋眰涓嬭浇瀹炰綋", dataType = "DownloadReqEntity", paramType = "body")
- })
- @ResponseBody
- @PostMapping(value = "/downloadEntityReq")
- public ResponseMsg<Object> downloadEntityReq(@RequestBody DownloadReqEntity dr, HttpServletRequest req, HttpServletResponse res) {
- try {
- if (null == dr || StringHelper.isEmpty(dr.getPwd())) {
- return fail("瀵嗙爜涓嶈兘涓虹┖");
- }
- if (null == dr.getEntities() || dr.getEntities().isEmpty()) {
- return fail("璇烽�夋嫨瑕佷笅杞界殑瀹炰綋鍚�");
- }
- if (!DownloadService.decryptPwd(dr)) {
- return fail("瀵嗙爜瑙ｅ瘑澶辫触", null);
- }
- if (StringHelper.isPwdInvalid(dr.getPwd())) {
- return fail("瀵嗙爜涓嶇鍚堣姹�");
- }
-
- UserEntity ue = tokenService.getCurrentUser(req);
- String guid = dataLibService.downloadDbReq4Prop(ue, dr);
return success(guid);
} catch (Exception ex) {
@@ -702,11 +714,11 @@
return fail("鐢ㄦ埛鏈櫥褰�", null);
}
- int count = downloadService.selectCountForUser(ue.getId(), 4, name);
+ int count = downloadService.selectCountForUser(ue.getId(), "3,4", name);
if (count == 0) {
return success(0, null);
}
- List<DownloadEntity> rs = downloadService.selectByPageForUser(ue.getId(), 4, name, pageSize, pageSize * (pageIndex - 1));
+ List<DownloadEntity> rs = downloadService.selectByPageForUser(ue.getId(), "3,4", name, pageSize, pageSize * (pageIndex - 1));
return success(count, rs);
} catch (Exception ex) {
--
Gitblit v1.9.3