From e26af85e049516e6ce2b082bc2bc90bf71643e95 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 24 三月 2023 09:06:30 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/data/DownloadService.java | 52 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 39 insertions(+), 13 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 51ab3ae..b5525bb 100644
--- a/src/main/java/com/lf/server/service/data/DownloadService.java
+++ b/src/main/java/com/lf/server/service/data/DownloadService.java
@@ -5,9 +5,11 @@
import com.lf.server.entity.data.DownloadEntity;
import com.lf.server.entity.data.MetaEntity;
import com.lf.server.entity.show.PipelineEntity;
+import com.lf.server.entity.sys.MetaDownEntity;
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.*;
import com.lf.server.mapper.data.DownloadMapper;
+import com.lf.server.service.sys.MetaDownService;
import net.lingala.zip4j.ZipFile;
import net.lingala.zip4j.model.FileHeader;
import net.lingala.zip4j.model.ZipParameters;
@@ -33,32 +35,35 @@
@Autowired
DownloadMapper downloadMapper;
+ @Autowired
+ MetaDownService metaDownService;
+
private final static Log log = LogFactory.getLog(DownloadService.class);
@Override
public Integer selectCount(String name) {
- name = StringHelper.getLikeStr(name);
+ name = StringHelper.getLikeUpperStr(name);
return downloadMapper.selectCount(name);
}
@Override
public List<DownloadEntity> selectByPage(String name, Integer limit, Integer offset) {
- name = StringHelper.getLikeStr(name);
+ name = StringHelper.getLikeUpperStr(name);
return downloadMapper.selectByPage(name, limit, offset);
}
@Override
public Integer selectCountForUser(Integer createUser, Integer type, String name) {
- name = StringHelper.getLikeStr(name);
+ name = StringHelper.getLikeUpperStr(name);
return downloadMapper.selectCountForUser(createUser, type, name);
}
@Override
public List<DownloadEntity> selectByPageForUser(Integer createUser, Integer type, String name, Integer limit, Integer offset) {
- name = StringHelper.getLikeStr(name);
+ name = StringHelper.getLikeUpperStr(name);
return downloadMapper.selectByPageForUser(createUser, type, name, limit, offset);
}
@@ -181,7 +186,7 @@
* 鎵撳寘鏂囦欢
*
* @param ue 鐢ㄦ埛瀹炰綋
- * @param list 婧愭暟鎹枃浠堕泦鍚�
+ * @param list 鍏冩暟鎹枃浠堕泦鍚�
* @param pwd 瀵嗙爜
* @return 涓嬭浇鏂囦欢GUID
*/
@@ -193,18 +198,22 @@
String zipFile = downloadPath + File.separator + zipName;
ZipFile zip = Zip4jHelper.createZipFile(zipFile, pwd);
- ZipParameters params = Zip4jHelper.getZipParams();
+ ZipParameters params = Zip4jHelper.getZipParams(true);
addMetaFiles(zip, params, list);
String dbPwd = Md5Helper.reverse(Md5Helper.generate(pwd));
- DownloadEntity downloadEntity = getDownloadEntity(ue, zipFile, dbPwd);
- int rows = downloadMapper.insert(downloadEntity);
+ DownloadEntity de = getDownloadEntity(ue, zipFile, dbPwd);
- return rows > 0 ? downloadEntity.getGuid() : null;
+ int rows = downloadMapper.insert(de);
+ if (de.getId() > 0) {
+ insertMetaDown(ue, list, de);
+ }
+
+ return rows > 0 ? de.getGuid() : null;
}
/**
- * 绉婚櫎閲嶅鐨勬簮鏁版嵁鏂囦欢
+ * 绉婚櫎閲嶅鐨勫厓鏁版嵁鏂囦欢
*/
private void rmRepeatMetaFiles(List<MetaEntity> list) {
List<String> guidList = new ArrayList<>();
@@ -223,7 +232,7 @@
}
/**
- * 娣诲姞婧愭暟鎹枃浠惰嚦Zip鍖�
+ * 娣诲姞鍏冩暟鎹枃浠惰嚦Zip鍖�
*/
private void addMetaFiles(ZipFile zip, ZipParameters params, List<MetaEntity> list) {
int i = 1;
@@ -318,18 +327,35 @@
private DownloadEntity getDownloadEntity(UserEntity ue, String file, String pwd) {
DownloadEntity de = new DownloadEntity();
de.setName(FileHelper.getFileName(file));
- // 1-Shp鏂囦欢锛�2-涓撻鍥撅紝3-婧愭暟鎹紝4-涓氬姟鏁版嵁锛�5-绠￠亾鍒嗘瀽锛�6-缁熻鎶ュ憡
+ // 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)
return de;
}
+
+ /**
+ * 鎻掑叆鍏冩暟鎹�-涓嬭浇琛�
+ */
+ private void insertMetaDown(UserEntity ue, List<MetaEntity> metas, DownloadEntity de) {
+ List<MetaDownEntity> list = new ArrayList<>();
+ for (MetaEntity me : metas) {
+ MetaDownEntity md = new MetaDownEntity();
+ md.setMetaid(me.getId());
+ md.setDownid(de.getId());
+ md.setCreateUser(ue.getId());
+
+ list.add(md);
+ }
+
+ metaDownService.inserts(list);
+ }
}
--
Gitblit v1.9.3