From 19bc36532c48b1161fc3c4f4818a5f9f631cb426 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 30 三月 2023 12:26:47 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/all/BaseQueryController.java | 70 +----------------------------------
1 files changed, 2 insertions(+), 68 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..a08b90a 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";
@@ -574,7 +574,7 @@
}
@SysLog()
- @ApiOperation(value = "璇锋眰DB鏁版嵁涓嬭浇")
+ @ApiOperation(value = "涓嬭浇DB鏁版嵁")
@ApiImplicitParams({
@ApiImplicitParam(name = "dr", value = "璇锋眰涓嬭浇瀹炰綋", dataType = "DownloadReqEntity", paramType = "body")
})
@@ -600,72 +600,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) {
--
Gitblit v1.9.3