From 8efceed6603127342626ac8579ff6077c799813b Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 09 二月 2023 14:21:48 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/all/BaseQueryController.java | 50 ++++++++++++++++++++-----
src/main/java/com/lf/server/entity/ctrl/DownloadReqEntity.java | 10 +++++
src/main/resources/application.yml | 8 ++--
src/main/java/com/lf/server/controller/show/DataLibController.java | 27 -------------
4 files changed, 54 insertions(+), 41 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 1a8c47c..4c916dd 100644
--- a/src/main/java/com/lf/server/controller/all/BaseQueryController.java
+++ b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
@@ -22,7 +22,6 @@
import com.lf.server.mapper.all.GeomBaseMapper;
import com.lf.server.service.all.BaseQueryService;
import com.lf.server.service.data.DownloadService;
-import com.lf.server.service.data.UploadService;
import com.lf.server.service.show.DataLibService;
import com.lf.server.service.sys.AttachService;
import com.lf.server.service.sys.DepService;
@@ -423,31 +422,62 @@
@SysLog()
@ApiOperation(value = "璇锋眰DB鏁版嵁涓嬭浇")
@ApiImplicitParams({
- @ApiImplicitParam(name = "reqEntity", value = "璇锋眰涓嬭浇瀹炰綋", dataType = "DownloadReqEntity", paramType = "body")
+ @ApiImplicitParam(name = "dre", value = "璇锋眰涓嬭浇瀹炰綋", dataType = "DownloadReqEntity", paramType = "body")
})
@ResponseBody
@PostMapping(value = "/downloadDbReq")
- public ResponseMsg<Object> downloadDbReq(@RequestBody DownloadReqEntity reqEntity, HttpServletRequest req, HttpServletResponse res) {
+ public ResponseMsg<Object> downloadDbReq(@RequestBody DownloadReqEntity dre, HttpServletRequest req, HttpServletResponse res) {
try {
- if (null == reqEntity || StringHelper.isEmpty(reqEntity.getPwd())) {
+ if (null == dre || StringHelper.isEmpty(dre.getPwd())) {
return fail("瀵嗙爜涓嶈兘涓虹┖");
}
- if (null == reqEntity.getEntities() || reqEntity.getEntities().isEmpty()) {
+ if (null == dre.getEntities() || dre.getEntities().isEmpty()) {
return fail("璇烽�夋嫨瑕佷笅杞界殑瀹炰綋鍚�");
}
- reqEntity.setWkt(AesHelper.decrypt(reqEntity.getWkt()));
- if (StringHelper.isEmpty(reqEntity.getWkt())) {
+ dre.setWkt(AesHelper.decrypt(dre.getWkt()));
+ if (StringHelper.isEmpty(dre.getWkt())) {
return fail("璇烽�夋嫨瑕佷笅杞界殑WKT鑼冨洿");
}
- if (!DownloadService.decryptPwd(reqEntity)) {
+ if (!DownloadService.decryptPwd(dre)) {
return fail("瀵嗙爜瑙ｅ瘑澶辫触", null);
}
- if (StringHelper.isPwdInvalid(reqEntity.getPwd())) {
+ if (StringHelper.isPwdInvalid(dre.getPwd())) {
return fail("瀵嗙爜涓嶇鍚堣姹�");
}
UserEntity ue = tokenService.getCurrentUser(req);
- String guid = dataLibService.createZipFile(ue, reqEntity.getEntities(), reqEntity.getWkt(), reqEntity.getPwd());
+ String guid = dataLibService.createZipFile(ue, dre.getEntities(), dre.getWkt(), dre.getPwd());
+
+ return success(guid);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "璇锋眰瀹炰綋鏁版嵁涓嬭浇")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "dre", value = "璇锋眰涓嬭浇瀹炰綋", dataType = "DownloadReqEntity", paramType = "body")
+ })
+ @ResponseBody
+ @PostMapping(value = "/downloadEntityReq")
+ public ResponseMsg<Object> downloadEntityReq(@RequestBody DownloadReqEntity dre, HttpServletRequest req, HttpServletResponse res) {
+ try {
+ if (null == dre || StringHelper.isEmpty(dre.getPwd())) {
+ return fail("瀵嗙爜涓嶈兘涓虹┖");
+ }
+ if (null == dre.getEntities() || dre.getEntities().isEmpty()) {
+ return fail("璇烽�夋嫨瑕佷笅杞界殑瀹炰綋鍚�");
+ }
+ if (!DownloadService.decryptPwd(dre)) {
+ return fail("瀵嗙爜瑙ｅ瘑澶辫触", null);
+ }
+ if (StringHelper.isPwdInvalid(dre.getPwd())) {
+ return fail("瀵嗙爜涓嶇鍚堣姹�");
+ }
+
+ UserEntity ue = tokenService.getCurrentUser(req);
+ String guid = dataLibService.zipDbData(ue, dre.getEntities().get(0), dre.getFilter(), dre.getPwd());
return success(guid);
} catch (Exception ex) {
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 87150a8..2225019 100644
--- a/src/main/java/com/lf/server/controller/show/DataLibController.java
+++ b/src/main/java/com/lf/server/controller/show/DataLibController.java
@@ -302,31 +302,4 @@
WebHelper.writeInfo(HttpStatus.ERROR, ex.getMessage(), res);
}
}
-
- @SysLog()
- @ApiOperation(value = "璇锋眰瀹炰綋鏁版嵁涓嬭浇")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "name", value = "鏄犲皠鍚嶇О", dataType = "String", paramType = "query", example = "dlgagnp"),
- @ApiImplicitParam(name = "filter", value = "杩囨护鏉′欢", dataType = "String", paramType = "query", example = "gid >= 50 and name like '鍘�' and objectid < 5000.0"),
- @ApiImplicitParam(name = "pwd", value = "瀵嗙爜", dataType = "String", paramType = "query", example = "")
- })
- @GetMapping(value = "/downloadEntityReq")
- public ResponseMsg<Object> downloadEntityReq(String name, String filter, String pwd, HttpServletRequest req, HttpServletResponse res) {
- try {
- if (StringHelper.isEmpty(pwd)) {
- return fail("瀵嗙爜涓嶈兘涓虹┖");
- }
- pwd = RsaHelper.decrypt(pwd);
- if (StringHelper.isPwdInvalid(pwd)) {
- return fail("瀵嗙爜涓嶇鍚堣姹�");
- }
-
- UserEntity ue = tokenService.getCurrentUser(req);
- String guid = dataLibService.zipDbData(ue, name, filter, pwd);
-
- return success(guid);
- } catch (Exception ex) {
- return fail(ex.getMessage(), null);
- }
- }
}
diff --git a/src/main/java/com/lf/server/entity/ctrl/DownloadReqEntity.java b/src/main/java/com/lf/server/entity/ctrl/DownloadReqEntity.java
index ce8061c..f14af74 100644
--- a/src/main/java/com/lf/server/entity/ctrl/DownloadReqEntity.java
+++ b/src/main/java/com/lf/server/entity/ctrl/DownloadReqEntity.java
@@ -24,6 +24,8 @@
private String descr;
+ private String filter;
+
public DownloadReqEntity() {
}
@@ -82,4 +84,12 @@
public void setDescr(String descr) {
this.descr = descr;
}
+
+ public String getFilter() {
+ return filter;
+ }
+
+ public void setFilter(String filter) {
+ this.filter = filter;
+ }
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 0151845..51fde2d 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -41,11 +41,11 @@
datasource:
name: prod
# JDBC 鍩烘湰閰嶇疆 ¤tSchema=public
- #url: jdbc:postgresql://192.168.20.205:5433/langfang?useAffectedRows=true
- url: jdbc:postgresql://127.0.0.1:5433/langfang?useAffectedRows=true
+ url: jdbc:postgresql://192.168.20.205:5433/langfang?useAffectedRows=true
+ #url: jdbc:postgresql://127.0.0.1:5433/langfang?useAffectedRows=true
username : postgres
- #password: Postgres!_14_Lf
- password: postgres
+ password: Postgres!_14_Lf
+ #password: postgres
driver-class-name: org.postgresql.Driver
paltform: POSTGRESQL
type: com.alibaba.druid.pool.DruidDataSource
--
Gitblit v1.9.3