From d3334bbb98a1524e67bd50aee1078a7eec40a55f Mon Sep 17 00:00:00 2001
From: xing <xingjs@qq.com>
Date: 星期日, 26 二月 2023 13:05:55 +0800
Subject: [PATCH] 20230226@xingjs@提交官网一张图相关内容接口(优化完善sql--修改数据存储sql)
---
src/main/java/com/lf/server/service/data/DownloadService.java | 136 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 114 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/lf/server/service/data/DownloadService.java b/src/main/java/com/lf/server/service/data/DownloadService.java
index 9d24f27..51ab3ae 100644
--- a/src/main/java/com/lf/server/service/data/DownloadService.java
+++ b/src/main/java/com/lf/server/service/data/DownloadService.java
@@ -1,8 +1,10 @@
package com.lf.server.service.data;
+import com.lf.server.entity.all.StaticData;
import com.lf.server.entity.ctrl.DownloadReqEntity;
import com.lf.server.entity.data.DownloadEntity;
-import com.lf.server.entity.data.MetaFileEntity;
+import com.lf.server.entity.data.MetaEntity;
+import com.lf.server.entity.show.PipelineEntity;
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.*;
import com.lf.server.mapper.data.DownloadMapper;
@@ -122,7 +124,7 @@
* @param reqEntity 璇锋眰涓嬭浇瀹炰綋绫�
* @return 鏄�/鍚﹁В瀵嗘垚鍔�
*/
- public boolean decryptPwd(DownloadReqEntity reqEntity) {
+ public static boolean decryptPwd(DownloadReqEntity reqEntity) {
try {
String pwd = RsaHelper.decrypt(reqEntity.getPwd());
if (StringHelper.isEmpty(pwd)) {
@@ -141,10 +143,32 @@
/**
* 瑙ｅ瘑
*
+ * @param pe 绠￠亾鍒嗘瀽瀹炰綋绫�
+ * @return 鏄�/鍚﹁В瀵嗘垚鍔�
+ */
+ public static boolean decryptPwd(PipelineEntity pe) {
+ try {
+ String pwd = RsaHelper.decrypt(pe.getPwd());
+ if (StringHelper.isEmpty(pwd)) {
+ return false;
+ }
+
+ pe.setPwd(pwd);
+
+ return true;
+ } catch (Exception ex) {
+ log.error(ex.getMessage(), ex);
+ return false;
+ }
+ }
+
+ /**
+ * 瑙ｅ瘑
+ *
* @param pwd 鍔犲瘑瀵嗙爜
* @return 鍘熷瀵嗙爜
*/
- public String decryptPwd(String pwd) {
+ public static String decryptPwd(String pwd) {
try {
return RsaHelper.decrypt(pwd);
} catch (Exception ex) {
@@ -157,11 +181,11 @@
* 鎵撳寘鏂囦欢
*
* @param ue 鐢ㄦ埛瀹炰綋
- * @param list 鍏冩暟鎹枃浠堕泦鍚�
+ * @param list 婧愭暟鎹枃浠堕泦鍚�
* @param pwd 瀵嗙爜
* @return 涓嬭浇鏂囦欢GUID
*/
- public String zipFiles(UserEntity ue, List<MetaFileEntity> list, String pwd) throws Exception {
+ public String zipFiles(UserEntity ue, List<MetaEntity> list, String pwd) throws Exception {
rmRepeatMetaFiles(list);
String downloadPath = pathHelper.getDownloadFullPath();
@@ -180,14 +204,14 @@
}
/**
- * 绉婚櫎閲嶅鐨勫厓鏁版嵁鏂囦欢
+ * 绉婚櫎閲嶅鐨勬簮鏁版嵁鏂囦欢
*/
- private void rmRepeatMetaFiles(List<MetaFileEntity> list) {
+ private void rmRepeatMetaFiles(List<MetaEntity> list) {
List<String> guidList = new ArrayList<>();
int i = 0;
while (i < list.size()) {
- MetaFileEntity entity = list.get(i);
+ MetaEntity entity = list.get(i);
if (guidList.contains(entity.getGuid())) {
list.remove(i);
continue;
@@ -199,21 +223,37 @@
}
/**
- * 娣诲姞鍏冩暟鎹枃浠惰嚦Zip鍖�
+ * 娣诲姞婧愭暟鎹枃浠惰嚦Zip鍖�
*/
- private void addMetaFiles(ZipFile zip, ZipParameters params, List<MetaFileEntity> list) {
- String uploadPath = pathHelper.getConfig().getUploadPath();
-
+ private void addMetaFiles(ZipFile zip, ZipParameters params, List<MetaEntity> list) {
int i = 1;
- for (MetaFileEntity entity : list) {
+ String uploadPath = pathHelper.getConfig().getUploadPath();
+ for (MetaEntity mf : list) {
try {
- File file = new File(uploadPath + File.separator + entity.getPath());
- zip.addFile(file, params);
-
- FileHeader header = zip.getFileHeader(entity.getGuid());
- if (null != header) {
- zip.renameFile(header, i++ + "_" + entity.getName());
+ switch ("." + mf.getType()) {
+ case StaticData.MPT:
+ addMultiFile(i++, uploadPath, mf, zip, params, StaticData.MPT_EXT);
+ break;
+ case StaticData.IMG:
+ addMultiFile(i++, uploadPath, mf, zip, params, StaticData.IMG_EXT);
+ break;
+ case StaticData.TIF:
+ addMultiFile(i++, uploadPath, mf, zip, params, StaticData.TIF_EXT);
+ break;
+ case StaticData.TIFF:
+ addMultiFile(i++, uploadPath, mf, zip, params, StaticData.TIFF_EXT);
+ break;
+ case StaticData.SHP:
+ addMultiFile(i++, uploadPath, mf, zip, params, StaticData.SHP_EXT);
+ break;
+ case StaticData.GDB:
+ addFolderFile(i++, uploadPath, mf, zip, params);
+ break;
+ default:
+ addSingleFile(i++, uploadPath, mf, zip, params);
+ break;
}
+
} catch (Exception ex) {
log.error(ex.getMessage(), ex);
}
@@ -221,19 +261,71 @@
}
/**
+ * 娣诲姞鐩綍鏂囦欢
+ */
+ private void addFolderFile(int i, String uploadPath, MetaEntity mf, ZipFile zip, ZipParameters params) throws Exception {
+ File file = new File(uploadPath + File.separator + mf.getPath());
+ if (!file.exists() || !file.isDirectory()) {
+ return;
+ }
+ zip.addFolder(file, params);
+
+ String fileName = FileHelper.getFileName(file.getPath());
+ FileHeader header = zip.getFileHeader(fileName);
+ if (null != header) {
+ zip.renameFile(header, i + "_" + mf.getName());
+ }
+ }
+
+ /**
+ * 娣诲姞澶氭枃浠�
+ */
+ private void addMultiFile(int i, String uploadPath, MetaEntity mf, ZipFile zip, ZipParameters params, List<String> extList) throws Exception {
+ addSingleFile(i, uploadPath, mf, zip, params);
+
+ for (String ext : extList) {
+ File file = new File(uploadPath + File.separator + mf.getPath().replace("." + mf.getType(), ext));
+ if (!file.exists() || file.isDirectory()) {
+ continue;
+ }
+ zip.addFile(file, params);
+
+ String fileName = FileHelper.getFileName(file.getPath());
+ FileHeader header = zip.getFileHeader(fileName);
+ if (null != header) {
+ zip.renameFile(header, i + "_" + mf.getName().replace("." + mf.getType(), ext));
+ }
+ }
+ }
+
+ /**
+ * 娣诲姞鍗曟枃浠�
+ */
+ private void addSingleFile(int i, String uploadPath, MetaEntity mf, ZipFile zip, ZipParameters params) throws Exception {
+ File file = new File(uploadPath + File.separator + mf.getPath());
+ zip.addFile(file, params);
+
+ String fileName = FileHelper.getFileName(file.getPath());
+ FileHeader header = zip.getFileHeader(fileName);
+ if (null != header) {
+ zip.renameFile(header, i + "_" + mf.getName());
+ }
+ }
+
+ /**
* 鑾峰彇涓嬭浇瀹炰綋绫�
*/
- private DownloadEntity getDownloadEntity(UserEntity ue, String file, String pwd) throws Exception {
+ private DownloadEntity getDownloadEntity(UserEntity ue, String file, String pwd) {
DownloadEntity de = new DownloadEntity();
de.setName(FileHelper.getFileName(file));
- // 1-Shp鏂囦欢锛�2-涓撻鍥撅紝3-鍏冩暟鎹�
+ // 1-Shp鏂囦欢锛�2-涓撻鍥撅紝3-婧愭暟鎹紝4-涓氬姟鏁版嵁锛�5-绠￠亾鍒嗘瀽锛�6-缁熻鎶ュ憡
de.setType(3);
de.setSizes(FileHelper.sizeToMb(new File(file).length()));
de.setDepid(ue.getDepid());
de.setDcount(0);
de.setPwd(pwd);
de.setUrl(FileHelper.getRelativePath(file));
- de.setDescr("鍏冩暟鎹枃浠�");
+ de.setDescr("婧愭暟鎹枃浠�");
de.setGuid(FileHelper.getFileMd5(file));
de.setCreateUser(ue.getId());
// de.setGeom(null)
--
Gitblit v1.9.3