From d43fe8e4c939edf7810681aad17fa1deeef1b0b6 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 11 四月 2023 11:24:58 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/show/DataLibService.java | 2 --
src/main/java/com/lf/server/service/show/ApplyService.java | 8 ++++----
src/main/java/com/lf/server/controller/data/MetaController.java | 2 +-
src/main/java/com/lf/server/service/data/MetaService.java | 21 +++++++--------------
src/main/java/com/lf/server/controller/show/DataLibController.java | 4 ++--
5 files changed, 14 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/data/MetaController.java b/src/main/java/com/lf/server/controller/data/MetaController.java
index cd1fe4b..75c2560 100644
--- a/src/main/java/com/lf/server/controller/data/MetaController.java
+++ b/src/main/java/com/lf/server/controller/data/MetaController.java
@@ -415,7 +415,7 @@
}
@SysLog()
- @ApiOperation(value = "璇锋眰涓嬭浇")
+ @ApiOperation(value = "璇锋眰鍏冩暟鎹笅杞�")
@ApiImplicitParams({
@ApiImplicitParam(name = "dr", value = "璇锋眰涓嬭浇瀹炰綋绫�", dataType = "DownloadReqEntity", paramType = "body")
})
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 85a0414..0535841 100644
--- a/src/main/java/com/lf/server/controller/show/DataLibController.java
+++ b/src/main/java/com/lf/server/controller/show/DataLibController.java
@@ -161,7 +161,7 @@
@SysLog()
@ApiOperation(value = "璇锋眰鍏冩暟鎹笅杞�")
@ApiImplicitParams({
- @ApiImplicitParam(name = "reqEntity", value = "璇锋眰涓嬭浇瀹炰綋", dataType = "DownloadReqEntity", paramType = "body")
+ @ApiImplicitParam(name = "dr", value = "璇锋眰涓嬭浇瀹炰綋", dataType = "DownloadReqEntity", paramType = "body")
})
@ResponseBody
@PostMapping(value = "/downloadReq")
@@ -171,7 +171,7 @@
return fail("瀵嗙爜涓嶈兘涓虹┖");
}
if (null == dr.getIds() || dr.getIds().isEmpty()) {
- return fail("璇烽�夋嫨瑕佷笅杞界殑鏂囦欢");
+ return fail("璇烽�夋嫨瑕佷笅杞界殑鏂囦欢ID");
}
if (!DownloadService.decryptPwd(dr)) {
return fail("瀵嗙爜瑙ｅ瘑澶辫触", null);
diff --git a/src/main/java/com/lf/server/service/data/MetaService.java b/src/main/java/com/lf/server/service/data/MetaService.java
index 9d75b00..d8d2477 100644
--- a/src/main/java/com/lf/server/service/data/MetaService.java
+++ b/src/main/java/com/lf/server/service/data/MetaService.java
@@ -299,6 +299,11 @@
/**
* 璇锋眰鍏冩暟鎹笅杞�
+ *
+ * @param ue 鐢ㄦ埛瀹炰綋
+ * @param dr 璇锋眰涓嬭浇瀹炰綋
+ * @return 涓嬭浇鏂囦欢GUID
+ * @throws Exception 寮傚父
*/
public String downloadMeteReq(UserEntity ue, DownloadReqEntity dr) throws Exception {
List<MetaEntity> list = selectMetaFiles(dr.getIds());
@@ -306,18 +311,6 @@
return null;
}
- return zipFiles(ue, list, dr.getPwd());
- }
-
- /**
- * 鎵撳寘鏂囦欢
- *
- * @param ue 鐢ㄦ埛瀹炰綋
- * @param list 鍏冩暟鎹枃浠堕泦鍚�
- * @param pwd 瀵嗙爜
- * @return 涓嬭浇鏂囦欢GUID
- */
- public String zipFiles(UserEntity ue, List<MetaEntity> list, String pwd) throws Exception {
Map<String, List<String>> tabs = getTabs(list);
rmRepeatMetas(list);
@@ -338,7 +331,7 @@
}
String zipFile = pathHelper.getDownloadFullPath() + File.separator + tempName + ".zip";
- ZipFile zip = Zip4jHelper.createZipFile(zipFile, pwd);
+ ZipFile zip = Zip4jHelper.createZipFile(zipFile, dr.getPwd());
ZipParameters params = Zip4jHelper.getZipParams(true);
addMetaFiles(zip, params, list);
if (dataMap.size() > 0) {
@@ -346,7 +339,7 @@
addAnnex(zip, params, annexMap);
}
- String dbPwd = Md5Helper.reverse(Md5Helper.generate(pwd));
+ String dbPwd = Md5Helper.reverse(Md5Helper.generate(dr.getPwd()));
DownloadEntity de = getDownloadEntity(ue, zipFile, dbPwd);
int rows = downloadService.insert(de);
if (de.getId() > 0) {
diff --git a/src/main/java/com/lf/server/service/show/ApplyService.java b/src/main/java/com/lf/server/service/show/ApplyService.java
index 1ea1651..9e831de 100644
--- a/src/main/java/com/lf/server/service/show/ApplyService.java
+++ b/src/main/java/com/lf/server/service/show/ApplyService.java
@@ -8,7 +8,7 @@
import com.lf.server.helper.AesHelper;
import com.lf.server.helper.StringHelper;
import com.lf.server.mapper.show.ApplyMapper;
-import com.lf.server.service.data.DownloadService;
+import com.lf.server.service.data.MetaService;
import com.lf.server.service.sys.UserService;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -36,10 +36,10 @@
UserService userService;
@Autowired
- DataLibService dataLibService;
+ MetaService metaService;
@Autowired
- DownloadService downloadService;
+ DataLibService dataLibService;
private final static Log log = LogFactory.getLog(ApplyService.class);
@@ -220,7 +220,7 @@
dr.setIds(getIds(entity));
dr.setFilter(entity.getFilters());
- String guid = "sysmeta".equals(entity.getEntities()) ? "" : dataLibService.downloadDbReq(ue, dr);
+ String guid = "sysmeta".equals(entity.getEntities()) ? metaService.downloadMeteReq(ue, dr) : dataLibService.downloadDbReq(ue, dr);
if (!StringHelper.isEmpty(guid)) {
entity.setGuid(guid);
update(entity);
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 167c5b2..10dc956 100644
--- a/src/main/java/com/lf/server/service/show/DataLibService.java
+++ b/src/main/java/com/lf/server/service/show/DataLibService.java
@@ -10,7 +10,6 @@
import com.lf.server.mapper.all.GeomBaseMapper;
import com.lf.server.mapper.data.DownloadMapper;
import com.lf.server.service.all.BaseQueryService;
-import com.lf.server.service.data.DownloadService;
import com.lf.server.service.data.MetaService;
import net.lingala.zip4j.ZipFile;
import net.lingala.zip4j.model.ZipParameters;
@@ -129,7 +128,6 @@
}
for (String id : ids) {
- // || "00".equals(id)
if (StringHelper.isEmpty(id)) {
continue;
}
--
Gitblit v1.9.3