From 4c882f00d9ee90d43a1c330683a612063ce64f04 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 11 四月 2023 11:13:45 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/show/DataLibService.java | 9
src/main/java/com/lf/server/service/show/ApplyService.java | 8
src/main/java/com/lf/server/controller/data/MetaController.java | 7
src/main/java/com/lf/server/service/data/MetaService.java | 376 +++++++++++++++++++++++++++-
data/db_cx.sql | 3
src/main/java/com/lf/server/service/data/DownloadService.java | 337 -------------------------
src/main/java/com/lf/server/controller/show/DataLibController.java | 17
7 files changed, 382 insertions(+), 375 deletions(-)
diff --git a/data/db_cx.sql b/data/db_cx.sql
index cf27289..59c3f1c 100644
--- a/data/db_cx.sql
+++ b/data/db_cx.sql
@@ -37,6 +37,9 @@
+
+
+
---------------------------------------------------------------------------------------------- SY1.鐓ゅ眰54琛�
-- drop table public.coal54;
create table if not exists public.coal54 (
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 d36dead..cd1fe4b 100644
--- a/src/main/java/com/lf/server/controller/data/MetaController.java
+++ b/src/main/java/com/lf/server/controller/data/MetaController.java
@@ -436,13 +436,8 @@
return fail("瀵嗙爜涓嶇鍚堣姹�");
}
- List<MetaEntity> list = metaService.selectMetaFiles(dr.getIds());
- if (null == list || list.isEmpty()) {
- return fail("娌℃湁鎵惧埌鍏冩暟鎹�");
- }
-
UserEntity ue = tokenService.getCurrentUser(req);
- String guid = downloadService.zipFiles(ue, list, dr.getPwd());
+ String guid = metaService.downloadMeteReq(ue, dr);
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 212b940..85a0414 100644
--- a/src/main/java/com/lf/server/controller/show/DataLibController.java
+++ b/src/main/java/com/lf/server/controller/show/DataLibController.java
@@ -165,28 +165,23 @@
})
@ResponseBody
@PostMapping(value = "/downloadReq")
- public ResponseMsg<Object> downloadReq(@RequestBody DownloadReqEntity reqEntity, HttpServletRequest req, HttpServletResponse res) {
+ public ResponseMsg<Object> downloadReq(@RequestBody DownloadReqEntity dr, HttpServletRequest req, HttpServletResponse res) {
try {
- if (null == reqEntity || StringHelper.isEmpty(reqEntity.getPwd())) {
+ if (null == dr || StringHelper.isEmpty(dr.getPwd())) {
return fail("瀵嗙爜涓嶈兘涓虹┖");
}
- if (null == reqEntity.getIds() || reqEntity.getIds().isEmpty()) {
+ if (null == dr.getIds() || dr.getIds().isEmpty()) {
return fail("璇烽�夋嫨瑕佷笅杞界殑鏂囦欢");
}
- if (!DownloadService.decryptPwd(reqEntity)) {
+ if (!DownloadService.decryptPwd(dr)) {
return fail("瀵嗙爜瑙ｅ瘑澶辫触", null);
}
- if (StringHelper.isPwdInvalid(reqEntity.getPwd())) {
+ if (StringHelper.isPwdInvalid(dr.getPwd())) {
return fail("瀵嗙爜涓嶇鍚堣姹�");
}
- List<MetaEntity> list = metaService.selectMetaFiles(reqEntity.getIds());
- if (null == list || list.isEmpty()) {
- return fail("娌℃湁鎵惧埌鍏冩暟鎹�");
- }
-
UserEntity ue = tokenService.getCurrentUser(req);
- String guid = downloadService.zipFiles(ue, list, reqEntity.getPwd());
+ String guid = metaService.downloadMeteReq(ue, dr);
return success(guid);
} catch (Exception ex) {
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 7aee659..6e26e95 100644
--- a/src/main/java/com/lf/server/service/data/DownloadService.java
+++ b/src/main/java/com/lf/server/service/data/DownloadService.java
@@ -1,29 +1,16 @@
package com.lf.server.service.data;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-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.MetaEntity;
import com.lf.server.entity.show.PipelineEntity;
-import com.lf.server.entity.sys.AttachEntity;
-import com.lf.server.entity.sys.MetaDownEntity;
-import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.*;
-import com.lf.server.mapper.all.BasicMapper;
import com.lf.server.mapper.data.DownloadMapper;
-import com.lf.server.service.all.BaseQueryService;
-import com.lf.server.service.sys.MetaDownService;
-import net.lingala.zip4j.ZipFile;
-import net.lingala.zip4j.model.FileHeader;
-import net.lingala.zip4j.model.ZipParameters;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.io.File;
-import java.io.FileInputStream;
import java.util.*;
/**
@@ -37,9 +24,6 @@
@Autowired
DownloadMapper downloadMapper;
-
- @Autowired
- MetaDownService metaDownService;
private final static Log log = LogFactory.getLog(DownloadService.class);
@@ -183,326 +167,5 @@
log.error(ex.getMessage(), ex);
return null;
}
- }
-
- /**
- * 鎵撳寘鏂囦欢
- *
- * @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);
-
- Map<String, List<?>> dataMap = new HashMap<>(2);
- Map<String, List<AttachEntity>> annexMap = new HashMap<>(2);
- queryData(tabs, dataMap, annexMap);
-
- String tempName = StringHelper.YMDHMS2_FORMAT.format(new Date());
- String tempPath = pathHelper.getTempPath(tempName);
- String gdbPath = tempPath + File.separator + "tabs.gdb";
-
- File gdbFile = new File(gdbPath);
- if (gdbFile.exists() && gdbFile.isDirectory()) {
- FileHelper.deleteDir(gdbPath);
- }
- if (dataMap.size() > 0) {
- GdbHelper.createGdb(gdbPath, dataMap);
- }
-
- String zipFile = pathHelper.getDownloadFullPath() + File.separator + tempName + ".zip";
- ZipFile zip = Zip4jHelper.createZipFile(zipFile, pwd);
- ZipParameters params = Zip4jHelper.getZipParams(true);
- addMetaFiles(zip, params, list);
- if (dataMap.size() > 0) {
- zip.addFolder(new File(gdbPath), params);
- addAnnex(zip, params, annexMap);
- }
-
- String dbPwd = Md5Helper.reverse(Md5Helper.generate(pwd));
- DownloadEntity de = getDownloadEntity(ue, zipFile, dbPwd);
- int rows = downloadMapper.insert(de);
- if (de.getId() > 0) {
- insertMetaDown(ue, list, de);
- }
-
- return rows > 0 ? de.getGuid() : null;
- }
-
- /**
- * 鑾峰彇鏁版嵁琛�
- */
- private Map<String, List<String>> getTabs(List<MetaEntity> list) {
- Map<String, List<String>> tabs = new HashMap<>(2);
- for (MetaEntity meta : list) {
- if (StringHelper.isEmpty(meta.getTab()) || meta.getRows() == 0 || StringHelper.isEmpty(meta.getEventid())) {
- continue;
- }
-
- if (!tabs.containsKey(meta.getTab())) {
- tabs.put(meta.getTab(), new ArrayList<>());
- }
-
- List<String> ids = tabs.get(meta.getTab());
- if (!ids.contains(meta.getEventid())) {
- ids.add(meta.getEventid());
- }
- }
-
- return tabs;
- }
-
- /**
- * 绉婚櫎閲嶅鐨勫厓鏁版嵁鏂囦欢
- */
- private void rmRepeatMetas(List<MetaEntity> list) {
- List<String> guidList = new ArrayList<>();
-
- int i = 0;
- while (i < list.size()) {
- MetaEntity entity = list.get(i);
- if (guidList.contains(entity.getGuid())) {
- list.remove(i);
- continue;
- }
-
- guidList.add(entity.getGuid());
- i++;
- }
- }
-
- /**
- * 鏌ヨ鏁版嵁
- */
- private void queryData(Map<String, List<String>> tabs, Map<String, List<?>> dataMap, Map<String, List<AttachEntity>> annexMap) {
- for (String tab : tabs.keySet()) {
- try {
- String entity = tab.toLowerCase().replace("_", "").split("\\.")[1];
- BasicMapper baseMapper = ClassHelper.getBasicMapper(entity);
- if (null == baseMapper) {
- continue;
- }
-
- QueryWrapper wrapper = createQueryWrapper(baseMapper, tabs.get(tab));
- addData(entity, baseMapper, wrapper, dataMap, annexMap);
- } catch (Exception ex) {
- log.error(ex.getMessage(), ex);
- }
- }
- }
-
- /**
- * 娣诲姞鏁版嵁
- */
- public void addData(String entity, BasicMapper baseMapper, QueryWrapper wrapper, Map<String, List<?>> dataMap, Map<String, List<AttachEntity>> annexMap) {
- List list = baseMapper.selectList(wrapper);
- if (null == list || list.size() == 0) {
- return;
- }
-
- if (!dataMap.containsKey(entity)) {
- dataMap.put(entity, list);
- } else {
- dataMap.get(entity).addAll(list);
- }
- if (wrapper.isEmptyOfWhere()) {
- wrapper.apply("1 = 1");
- }
- if (StaticData.BBOREHOLE.equals(entity)) {
- wrapper.last("limit 100");
- }
-
- String tab = BaseQueryService.getTabName(baseMapper);
- List<AttachEntity> annex = baseMapper.selectAnnex(tab, wrapper);
- if (null == annex || annex.isEmpty()) {
- return;
- }
-
- if (!annexMap.containsKey(entity)) {
- annexMap.put(tab.replace(StaticData.POINT, "_"), annex);
- } else {
- annexMap.get(tab.replace(StaticData.POINT, "_")).addAll(annex);
- }
- }
-
- /**
- * 鍒涘缓鏌ヨ鍖呰鍣�
- */
- private <T> QueryWrapper<T> createQueryWrapper(BasicMapper baseMapper, List<String> ids) {
- for (int i = 0, c = ids.size(); i < c; i++) {
- ids.set(i, "'" + ids.get(i) + "'");
- }
- String filter = String.format("parentid in (%s)", StringHelper.join(ids, ","));
-
- QueryWrapper<T> wrapper = new QueryWrapper<T>();
- wrapper.apply(filter);
-
- return wrapper;
- }
-
- /**
- * 娣诲姞闄勪欢
- */
- public void addAnnex(ZipFile zip, ZipParameters params, Map<String, List<AttachEntity>> annexMap) {
- List<String> files = new ArrayList<>();
- String uploadPath = pathHelper.getConfig().getUploadPath();
- for (String key : annexMap.keySet()) {
- for (AttachEntity ae : annexMap.get(key)) {
- try {
- File srcFile = new File(uploadPath + File.separator + ae.getPath());
- if (!srcFile.exists() || srcFile.isDirectory()) {
- continue;
- }
- if (files.contains(srcFile.getPath())) {
- continue;
- }
-
- files.add(srcFile.getPath());
- params.setFileNameInZip("annex" + File.separator + key + File.separator + ae.getName());
- zip.addStream(new FileInputStream(srcFile), params);
- } catch (Exception ex) {
- log.error(ex.getMessage(), ex);
- }
- }
- }
- }
-
- /**
- * 娣诲姞鍏冩暟鎹枃浠惰嚦Zip鍖�
- */
- private void addMetaFiles(ZipFile zip, ZipParameters params, List<MetaEntity> list) {
- List<String> names = new ArrayList<>();
- String uploadPath = pathHelper.getConfig().getUploadPath();
- for (MetaEntity mf : list) {
- if (names.contains(mf.getName())) {
- mf.setName(mf.getId() + "_" + mf.getName());
- } else {
- names.add(mf.getName());
- }
-
- try {
- switch ("." + mf.getType()) {
- case StaticData.MPT:
- addMultiFile(uploadPath, mf, zip, params, StaticData.MPT_EXT);
- break;
- case StaticData.IMG:
- addMultiFile(uploadPath, mf, zip, params, StaticData.IMG_EXT);
- break;
- case StaticData.TIF:
- addMultiFile(uploadPath, mf, zip, params, StaticData.TIF_EXT);
- break;
- case StaticData.TIFF:
- addMultiFile(uploadPath, mf, zip, params, StaticData.TIFF_EXT);
- break;
- case StaticData.SHP:
- addMultiFile(uploadPath, mf, zip, params, StaticData.SHP_EXT);
- break;
- case StaticData.GDB:
- addFolderFile(uploadPath, mf, zip, params);
- break;
- default:
- addSingleFile(uploadPath, mf, zip, params);
- break;
- }
- } catch (Exception ex) {
- log.error(ex.getMessage(), ex);
- }
- }
- }
-
- /**
- * 娣诲姞鐩綍鏂囦欢
- */
- private void addFolderFile(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, mf.getName());
- }
- }
-
- /**
- * 娣诲姞澶氭枃浠�
- */
- private void addMultiFile(String uploadPath, MetaEntity mf, ZipFile zip, ZipParameters params, List<String> extList) throws Exception {
- addSingleFile(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, mf.getName().replace("." + mf.getType(), ext));
- }
- }
- }
-
- /**
- * 娣诲姞鍗曟枃浠�
- */
- private void addSingleFile(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.addFile(file, params);
-
- String fileName = FileHelper.getFileName(file.getPath());
- FileHeader header = zip.getFileHeader(fileName);
- if (null != header) {
- zip.renameFile(header, mf.getName());
- }
- }
-
- /**
- * 鑾峰彇涓嬭浇瀹炰綋绫�
- */
- 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-缁熻鎶ュ憡
- 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.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);
}
}
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 1e195b2..9d75b00 100644
--- a/src/main/java/com/lf/server/service/data/MetaService.java
+++ b/src/main/java/com/lf/server/service/data/MetaService.java
@@ -1,13 +1,21 @@
package com.lf.server.service.data;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.MetaEntity;
+import com.lf.server.entity.sys.AttachEntity;
+import com.lf.server.entity.sys.MetaDownEntity;
import com.lf.server.entity.sys.UserEntity;
-import com.lf.server.helper.PathHelper;
-import com.lf.server.helper.StringHelper;
-import com.lf.server.helper.WebHelper;
+import com.lf.server.helper.*;
+import com.lf.server.mapper.all.BasicMapper;
import com.lf.server.mapper.data.MetaMapper;
+import com.lf.server.service.all.BaseQueryService;
+import com.lf.server.service.sys.MetaDownService;
+import net.lingala.zip4j.ZipFile;
+import net.lingala.zip4j.model.FileHeader;
+import net.lingala.zip4j.model.ZipParameters;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -15,9 +23,8 @@
import javax.servlet.http.HttpServletResponse;
import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import java.io.FileInputStream;
+import java.util.*;
/**
* 鍏冩暟鎹�
@@ -30,6 +37,12 @@
@Autowired
MetaMapper metaMapper;
+
+ @Autowired
+ MetaDownService metaDownService;
+
+ @Autowired
+ DownloadService downloadService;
private final static Log log = LogFactory.getLog(MetaService.class);
@@ -132,15 +145,6 @@
depcode = StringHelper.getRightLike(depcode);
return metaMapper.selectMetaOverflowDep(ids, depcode);
- }
-
- /**
- * 鏌ヨ鍏冩暟鎹腑婧㈠嚭鐨勫崟浣岻D
- */
- public List<String> selectMetaOverflowDep(UserEntity ue, DownloadReqEntity dr) {
- String ids = StringHelper.join(dr.getIds(), ",");
-
- return selectMetaOverflowDep(ids, ue.getDepcode());
}
@Override
@@ -283,4 +287,346 @@
log.error(ex.getMessage(), ex);
}
}
+
+ /**
+ * 鏌ヨ鍏冩暟鎹腑婧㈠嚭鐨勫崟浣岻D
+ */
+ public List<String> selectMetaOverflowDep(UserEntity ue, DownloadReqEntity dr) {
+ String ids = StringHelper.join(dr.getIds(), ",");
+
+ return selectMetaOverflowDep(ids, ue.getDepcode());
+ }
+
+ /**
+ * 璇锋眰鍏冩暟鎹笅杞�
+ */
+ public String downloadMeteReq(UserEntity ue, DownloadReqEntity dr) throws Exception {
+ List<MetaEntity> list = selectMetaFiles(dr.getIds());
+ if (null == list || list.isEmpty()) {
+ 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);
+
+ Map<String, List<?>> dataMap = new HashMap<>(2);
+ Map<String, List<AttachEntity>> annexMap = new HashMap<>(2);
+ queryData(tabs, dataMap, annexMap);
+
+ String tempName = StringHelper.YMDHMS2_FORMAT.format(new Date());
+ String tempPath = pathHelper.getTempPath(tempName);
+ String gdbPath = tempPath + File.separator + "tabs.gdb";
+
+ File gdbFile = new File(gdbPath);
+ if (gdbFile.exists() && gdbFile.isDirectory()) {
+ FileHelper.deleteDir(gdbPath);
+ }
+ if (dataMap.size() > 0) {
+ GdbHelper.createGdb(gdbPath, dataMap);
+ }
+
+ String zipFile = pathHelper.getDownloadFullPath() + File.separator + tempName + ".zip";
+ ZipFile zip = Zip4jHelper.createZipFile(zipFile, pwd);
+ ZipParameters params = Zip4jHelper.getZipParams(true);
+ addMetaFiles(zip, params, list);
+ if (dataMap.size() > 0) {
+ zip.addFolder(new File(gdbPath), params);
+ addAnnex(zip, params, annexMap);
+ }
+
+ String dbPwd = Md5Helper.reverse(Md5Helper.generate(pwd));
+ DownloadEntity de = getDownloadEntity(ue, zipFile, dbPwd);
+ int rows = downloadService.insert(de);
+ if (de.getId() > 0) {
+ insertMetaDown(ue, list, de);
+ }
+
+ return rows > 0 ? de.getGuid() : null;
+ }
+
+ /**
+ * 鑾峰彇鏁版嵁琛�
+ */
+ private Map<String, List<String>> getTabs(List<MetaEntity> list) {
+ Map<String, List<String>> tabs = new HashMap<>(2);
+ for (MetaEntity meta : list) {
+ if (StringHelper.isEmpty(meta.getTab()) || meta.getRows() == 0 || StringHelper.isEmpty(meta.getEventid())) {
+ continue;
+ }
+
+ if (!tabs.containsKey(meta.getTab())) {
+ tabs.put(meta.getTab(), new ArrayList<>());
+ }
+
+ List<String> ids = tabs.get(meta.getTab());
+ if (!ids.contains(meta.getEventid())) {
+ ids.add(meta.getEventid());
+ }
+ }
+
+ return tabs;
+ }
+
+ /**
+ * 绉婚櫎閲嶅鐨勫厓鏁版嵁鏂囦欢
+ */
+ private void rmRepeatMetas(List<MetaEntity> list) {
+ List<String> guidList = new ArrayList<>();
+
+ int i = 0;
+ while (i < list.size()) {
+ MetaEntity entity = list.get(i);
+ if (guidList.contains(entity.getGuid())) {
+ list.remove(i);
+ continue;
+ }
+
+ guidList.add(entity.getGuid());
+ i++;
+ }
+ }
+
+ /**
+ * 鏌ヨ鏁版嵁
+ */
+ private void queryData(Map<String, List<String>> tabs, Map<String, List<?>> dataMap, Map<String, List<AttachEntity>> annexMap) {
+ for (String tab : tabs.keySet()) {
+ try {
+ String entity = tab.toLowerCase().replace("_", "").split("\\.")[1];
+ BasicMapper baseMapper = ClassHelper.getBasicMapper(entity);
+ if (null == baseMapper) {
+ continue;
+ }
+
+ QueryWrapper wrapper = createQueryWrapper(baseMapper, tabs.get(tab));
+ addData(entity, baseMapper, wrapper, dataMap, annexMap);
+ } catch (Exception ex) {
+ log.error(ex.getMessage(), ex);
+ }
+ }
+ }
+
+ /**
+ * 娣诲姞鏁版嵁
+ */
+ public void addData(String entity, BasicMapper baseMapper, QueryWrapper wrapper, Map<String, List<?>> dataMap, Map<String, List<AttachEntity>> annexMap) {
+ List list = baseMapper.selectList(wrapper);
+ if (null == list || list.size() == 0) {
+ return;
+ }
+
+ if (!dataMap.containsKey(entity)) {
+ dataMap.put(entity, list);
+ } else {
+ dataMap.get(entity).addAll(list);
+ }
+ if (wrapper.isEmptyOfWhere()) {
+ wrapper.apply("1 = 1");
+ }
+ if (StaticData.BBOREHOLE.equals(entity)) {
+ wrapper.last("limit 100");
+ }
+
+ String tab = BaseQueryService.getTabName(baseMapper);
+ List<AttachEntity> annex = baseMapper.selectAnnex(tab, wrapper);
+ if (null == annex || annex.isEmpty()) {
+ return;
+ }
+
+ if (!annexMap.containsKey(entity)) {
+ annexMap.put(tab.replace(StaticData.POINT, "_"), annex);
+ } else {
+ annexMap.get(tab.replace(StaticData.POINT, "_")).addAll(annex);
+ }
+ }
+
+ /**
+ * 鍒涘缓鏌ヨ鍖呰鍣�
+ */
+ private <T> QueryWrapper<T> createQueryWrapper(BasicMapper baseMapper, List<String> ids) {
+ for (int i = 0, c = ids.size(); i < c; i++) {
+ ids.set(i, "'" + ids.get(i) + "'");
+ }
+ String filter = String.format("parentid in (%s)", StringHelper.join(ids, ","));
+
+ QueryWrapper<T> wrapper = new QueryWrapper<T>();
+ wrapper.apply(filter);
+
+ return wrapper;
+ }
+
+ /**
+ * 娣诲姞闄勪欢
+ */
+ public void addAnnex(ZipFile zip, ZipParameters params, Map<String, List<AttachEntity>> annexMap) {
+ List<String> files = new ArrayList<>();
+ String uploadPath = pathHelper.getConfig().getUploadPath();
+ for (String key : annexMap.keySet()) {
+ for (AttachEntity ae : annexMap.get(key)) {
+ try {
+ File srcFile = new File(uploadPath + File.separator + ae.getPath());
+ if (!srcFile.exists() || srcFile.isDirectory()) {
+ continue;
+ }
+ if (files.contains(srcFile.getPath())) {
+ continue;
+ }
+
+ files.add(srcFile.getPath());
+ params.setFileNameInZip("annex" + File.separator + key + File.separator + ae.getName());
+ zip.addStream(new FileInputStream(srcFile), params);
+ } catch (Exception ex) {
+ log.error(ex.getMessage(), ex);
+ }
+ }
+ }
+ }
+
+ /**
+ * 娣诲姞鍏冩暟鎹枃浠惰嚦Zip鍖�
+ */
+ private void addMetaFiles(ZipFile zip, ZipParameters params, List<MetaEntity> list) {
+ List<String> names = new ArrayList<>();
+ String uploadPath = pathHelper.getConfig().getUploadPath();
+ for (MetaEntity mf : list) {
+ if (names.contains(mf.getName())) {
+ mf.setName(mf.getId() + "_" + mf.getName());
+ } else {
+ names.add(mf.getName());
+ }
+
+ try {
+ switch ("." + mf.getType()) {
+ case StaticData.MPT:
+ addMultiFile(uploadPath, mf, zip, params, StaticData.MPT_EXT);
+ break;
+ case StaticData.IMG:
+ addMultiFile(uploadPath, mf, zip, params, StaticData.IMG_EXT);
+ break;
+ case StaticData.TIF:
+ addMultiFile(uploadPath, mf, zip, params, StaticData.TIF_EXT);
+ break;
+ case StaticData.TIFF:
+ addMultiFile(uploadPath, mf, zip, params, StaticData.TIFF_EXT);
+ break;
+ case StaticData.SHP:
+ addMultiFile(uploadPath, mf, zip, params, StaticData.SHP_EXT);
+ break;
+ case StaticData.GDB:
+ addFolderFile(uploadPath, mf, zip, params);
+ break;
+ default:
+ addSingleFile(uploadPath, mf, zip, params);
+ break;
+ }
+ } catch (Exception ex) {
+ log.error(ex.getMessage(), ex);
+ }
+ }
+ }
+
+ /**
+ * 娣诲姞鐩綍鏂囦欢
+ */
+ private void addFolderFile(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, mf.getName());
+ }
+ }
+
+ /**
+ * 娣诲姞澶氭枃浠�
+ */
+ private void addMultiFile(String uploadPath, MetaEntity mf, ZipFile zip, ZipParameters params, List<String> extList) throws Exception {
+ addSingleFile(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, mf.getName().replace("." + mf.getType(), ext));
+ }
+ }
+ }
+
+ /**
+ * 娣诲姞鍗曟枃浠�
+ */
+ private void addSingleFile(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.addFile(file, params);
+
+ String fileName = FileHelper.getFileName(file.getPath());
+ FileHeader header = zip.getFileHeader(fileName);
+ if (null != header) {
+ zip.renameFile(header, mf.getName());
+ }
+ }
+
+ /**
+ * 鑾峰彇涓嬭浇瀹炰綋绫�
+ */
+ 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-缁熻鎶ュ憡
+ 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.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);
+ }
}
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 9d053b9..1ea1651 100644
--- a/src/main/java/com/lf/server/service/show/ApplyService.java
+++ b/src/main/java/com/lf/server/service/show/ApplyService.java
@@ -8,6 +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.sys.UserService;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -36,6 +37,9 @@
@Autowired
DataLibService dataLibService;
+
+ @Autowired
+ DownloadService downloadService;
private final static Log log = LogFactory.getLog(ApplyService.class);
@@ -216,8 +220,8 @@
dr.setIds(getIds(entity));
dr.setFilter(entity.getFilters());
- String guid = dataLibService.downloadDbReq(ue, dr);
- if (!StringHelper.isEmpty(guid)){
+ String guid = "sysmeta".equals(entity.getEntities()) ? "" : 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 da47e84..167c5b2 100644
--- a/src/main/java/com/lf/server/service/show/DataLibService.java
+++ b/src/main/java/com/lf/server/service/show/DataLibService.java
@@ -11,6 +11,7 @@
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;
import org.apache.commons.logging.Log;
@@ -31,10 +32,10 @@
PathHelper pathHelper;
@Autowired
- DownloadMapper downloadMapper;
+ MetaService metaService;
@Autowired
- DownloadService downloadService;
+ DownloadMapper downloadMapper;
@Autowired
BaseQueryService baseQueryService;
@@ -164,7 +165,7 @@
ZipParameters params = Zip4jHelper.getZipParams(true);
zip.addFolder(new File(gdbPath), params);
// zip.addFolder(new File(annexPath), params)
- downloadService.addAnnex(zip, params, annexMap);
+ metaService.addAnnex(zip, params, annexMap);
String dbPwd = Md5Helper.reverse(Md5Helper.generate(dr.getPwd()));
DownloadEntity de = getDownloadEntity(ue, zipFile, dbPwd);
@@ -185,7 +186,7 @@
}
QueryWrapper wrapper = createQueryWrapper(baseMapper, dr);
- downloadService.addData(entity, baseMapper, wrapper, dataMap, annexMap);
+ metaService.addData(entity, baseMapper, wrapper, dataMap, annexMap);
} catch (Exception ex) {
log.error(ex.getMessage(), ex);
}
--
Gitblit v1.9.3