From 670f36af44911c51eb2e57b230c67b585b696896 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 30 三月 2023 09:15:28 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/all/BaseQueryController.java | 79 +++++++++++++++++++++++++++------------
1 files changed, 55 insertions(+), 24 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 e57f134..1277d32 100644
--- a/src/main/java/com/lf/server/controller/all/BaseQueryController.java
+++ b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
@@ -395,7 +395,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";
@@ -535,18 +535,17 @@
})
@ResponseBody
@PostMapping(value = "/selectDbOverflowDep")
- public ResponseMsg<Object> selectDbOverflowDep(@RequestBody DownloadReqEntity reqEntity, HttpServletRequest req, HttpServletResponse res) {
+ public ResponseMsg<Object> selectDbOverflowDep(@RequestBody DownloadReqEntity dr, HttpServletRequest req, HttpServletResponse res) {
try {
- if (null == reqEntity || null == reqEntity.getEntities() || reqEntity.getEntities().isEmpty()) {
+ if (null == dr || null == dr.getEntities() || dr.getEntities().isEmpty()) {
return fail("璇烽�夋嫨瑕佷笅杞界殑瀹炰綋鍚�");
}
- reqEntity.setWkt(AesHelper.decrypt(reqEntity.getWkt()));
- if (StringHelper.isEmpty(reqEntity.getWkt())) {
- return fail("璇烽�夋嫨瑕佷笅杞界殑WKT鑼冨洿");
+ if (!StringHelper.isEmpty(dr.getWkt())) {
+ dr.setWkt(AesHelper.decrypt(dr.getWkt()));
}
UserEntity ue = tokenService.getCurrentUser(req);
- List<String> list = dataLibService.selectDbOverflowDep(ue, reqEntity.getEntities(), reqEntity.getWkt());
+ List<String> list = dataLibService.selectDbOverflowDep(ue, dr);
return success(list);
} catch (Exception ex) {
@@ -577,32 +576,65 @@
@SysLog()
@ApiOperation(value = "璇锋眰DB鏁版嵁涓嬭浇")
@ApiImplicitParams({
- @ApiImplicitParam(name = "dre", value = "璇锋眰涓嬭浇瀹炰綋", dataType = "DownloadReqEntity", paramType = "body")
+ @ApiImplicitParam(name = "dr", value = "璇锋眰涓嬭浇瀹炰綋", dataType = "DownloadReqEntity", paramType = "body")
+ })
+ @ResponseBody
+ @PostMapping(value = "/downloadDbData")
+ public ResponseMsg<Object> downloadDbData(@RequestBody DownloadReqEntity dr, HttpServletRequest req) {
+ try {
+ if (null == dr || null == dr.getEntities() || dr.getEntities().isEmpty()) {
+ return fail("璇烽�夋嫨瑕佷笅杞界殑瀹炰綋鍚�");
+ }
+ if (StringHelper.isEmpty(dr.getPwd())) {
+ return fail("瀵嗙爜涓嶈兘涓虹┖");
+ }
+ if (!DownloadService.decryptPwd(dr)) {
+ return fail("瀵嗙爜瑙ｅ瘑澶辫触", null);
+ }
+ if (StringHelper.isPwdInvalid(dr.getPwd())) {
+ return fail("瀵嗙爜涓嶇鍚堣姹�");
+ }
+ if (!StringHelper.isEmpty(dr.getWkt())) {
+ dr.setWkt(AesHelper.decrypt(dr.getWkt()));
+ }
+
+ 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 dre, HttpServletRequest req, HttpServletResponse res) {
+ public ResponseMsg<Object> downloadDbReq(@RequestBody DownloadReqEntity dr, HttpServletRequest req, HttpServletResponse res) {
try {
- if (null == dre || StringHelper.isEmpty(dre.getPwd())) {
+ if (null == dr || StringHelper.isEmpty(dr.getPwd())) {
return fail("瀵嗙爜涓嶈兘涓虹┖");
}
- if (null == dre.getEntities() || dre.getEntities().isEmpty()) {
+ if (null == dr.getEntities() || dr.getEntities().isEmpty()) {
return fail("璇烽�夋嫨瑕佷笅杞界殑瀹炰綋鍚�");
}
- dre.setWkt(AesHelper.decrypt(dre.getWkt()));
- if (StringHelper.isEmpty(dre.getWkt())) {
+ dr.setWkt(AesHelper.decrypt(dr.getWkt()));
+ if (StringHelper.isEmpty(dr.getWkt())) {
return fail("璇烽�夋嫨瑕佷笅杞界殑WKT鑼冨洿");
}
- if (!DownloadService.decryptPwd(dre)) {
+ if (!DownloadService.decryptPwd(dr)) {
return fail("瀵嗙爜瑙ｅ瘑澶辫触", null);
}
- if (StringHelper.isPwdInvalid(dre.getPwd())) {
+ if (StringHelper.isPwdInvalid(dr.getPwd())) {
return fail("瀵嗙爜涓嶇鍚堣姹�");
}
UserEntity ue = tokenService.getCurrentUser(req);
- String depcode = null == dre.getDepcodes() || dre.getDepcodes().isEmpty() ? null : dre.getDepcodes().get(0);
- String guid = dataLibService.createZipFile(ue, dre.getEntities(), depcode, dre.getDirs(), dre.getWkt(), dre.getPwd());
+ String guid = dataLibService.downloadDbReq4Wkt(ue, dr);
return success(guid);
} catch (Exception ex) {
@@ -617,24 +649,23 @@
})
@ResponseBody
@PostMapping(value = "/downloadEntityReq")
- public ResponseMsg<Object> downloadEntityReq(@RequestBody DownloadReqEntity dre, HttpServletRequest req, HttpServletResponse res) {
+ public ResponseMsg<Object> downloadEntityReq(@RequestBody DownloadReqEntity dr, HttpServletRequest req, HttpServletResponse res) {
try {
- if (null == dre || StringHelper.isEmpty(dre.getPwd())) {
+ if (null == dr || StringHelper.isEmpty(dr.getPwd())) {
return fail("瀵嗙爜涓嶈兘涓虹┖");
}
- if (null == dre.getEntities() || dre.getEntities().isEmpty()) {
+ if (null == dr.getEntities() || dr.getEntities().isEmpty()) {
return fail("璇烽�夋嫨瑕佷笅杞界殑瀹炰綋鍚�");
}
- if (!DownloadService.decryptPwd(dre)) {
+ if (!DownloadService.decryptPwd(dr)) {
return fail("瀵嗙爜瑙ｅ瘑澶辫触", null);
}
- if (StringHelper.isPwdInvalid(dre.getPwd())) {
+ if (StringHelper.isPwdInvalid(dr.getPwd())) {
return fail("瀵嗙爜涓嶇鍚堣姹�");
}
UserEntity ue = tokenService.getCurrentUser(req);
- String depcode = null == dre.getDepcodes() || dre.getDepcodes().isEmpty() ? null : dre.getDepcodes().get(0);
- String guid = dataLibService.zipDbData(ue, dre.getEntities().get(0), depcode, dre.getDirs(), dre.getFilter(), dre.getPwd());
+ String guid = dataLibService.downloadDbReq4Prop(ue, dr);
return success(guid);
} catch (Exception ex) {
--
Gitblit v1.9.3