From 3cdd0dd684052517ee0e90daf4b03ad41b8f2771 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 03 四月 2023 15:04:47 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/show/DataLibService.java | 29 ---------
src/main/java/com/lf/server/controller/show/ApplyController.java | 35 ++++++-----
src/main/java/com/lf/server/entity/all/StaticData.java | 2
src/main/java/com/lf/server/service/data/DownloadService.java | 65 +++++++++++++++++++++
4 files changed, 86 insertions(+), 45 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/show/ApplyController.java b/src/main/java/com/lf/server/controller/show/ApplyController.java
index 6e9c262..92c71e5 100644
--- a/src/main/java/com/lf/server/controller/show/ApplyController.java
+++ b/src/main/java/com/lf/server/controller/show/ApplyController.java
@@ -10,6 +10,7 @@
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.AesHelper;
import com.lf.server.helper.StringHelper;
+import com.lf.server.service.data.DownloadService;
import com.lf.server.service.show.ApplyService;
import com.lf.server.service.show.FlowService;
import com.lf.server.service.sys.TokenService;
@@ -48,34 +49,36 @@
@SysLog()
@ApiOperation(value = "鎻掑叆鏁版嵁鐢宠")
@ApiImplicitParams({
- @ApiImplicitParam(name = "reqEntity", value = "璇锋眰涓嬭浇瀹炰綋", dataType = "DownloadReqEntity", paramType = "body")
+ @ApiImplicitParam(name = "dr", value = "璇锋眰涓嬭浇瀹炰綋", dataType = "DownloadReqEntity", paramType = "body")
})
@ResponseBody
@PostMapping(value = "/insertApply")
- public ResponseMsg<Object> insertApply(@RequestBody DownloadReqEntity reqEntity, HttpServletRequest req) {
+ public ResponseMsg<Object> insertApply(@RequestBody DownloadReqEntity dr, HttpServletRequest req) {
try {
- if (null == reqEntity || StringHelper.isEmpty(reqEntity.getPwd())) {
- return fail("瀵嗙爜涓嶈兘涓虹┖");
- }
- if (null == reqEntity.getTabs() || null == reqEntity.getEntities() || reqEntity.getTabs().size() != reqEntity.getEntities().size()) {
+ if (null == dr || null == dr.getEntities() || dr.getEntities().isEmpty()) {
return fail("璇烽�夋嫨瑕佷笅杞界殑瀹炰綋鍚�");
}
- if (null == reqEntity.getDepcodes() || reqEntity.getDepcodes().isEmpty()) {
- return fail("璇烽�夋嫨鍗曚綅缂栫爜");
+ if (StringHelper.isEmpty(dr.getPwd())) {
+ return fail("瀵嗙爜涓嶈兘涓虹┖");
}
-
- reqEntity.setWkt(AesHelper.decrypt(reqEntity.getWkt()));
- if (StringHelper.isEmpty(reqEntity.getWkt())) {
- return fail("璇烽�夋嫨瑕佷笅杞界殑WKT鑼冨洿");
+ if (!DownloadService.decryptPwd(dr)) {
+ return fail("瀵嗙爜瑙ｅ瘑澶辫触", null);
}
-
- reqEntity.setPwd(AesHelper.decrypt(reqEntity.getPwd()));
- if (StringHelper.isPwdInvalid(reqEntity.getPwd())) {
+ if (StringHelper.isPwdInvalid(dr.getPwd())) {
return fail("瀵嗙爜涓嶇鍚堣姹�");
+ }
+ if (!StringHelper.isEmpty(dr.getWkt())) {
+ dr.setWkt(AesHelper.decrypt(dr.getWkt()));
+ }
+ if (null == dr.getTabs() || dr.getTabs().isEmpty()) {
+ return fail("璇烽�夋嫨瑕佷笅杞界殑琛ㄥ悕");
+ }
+ if (null == dr.getDepcodes() || dr.getDepcodes().isEmpty()) {
+ return fail("璇烽�夋嫨寰呯敵璇风殑鍗曚綅缂栫爜(澶氫釜浠ラ�楀彿闅斿紑)");
}
UserEntity ue = tokenService.getCurrentUser(req);
- int rows = applyService.insertApply(ue, reqEntity);
+ int rows = applyService.insertApply(ue, dr);
return success(rows);
} catch (Exception ex) {
diff --git a/src/main/java/com/lf/server/entity/all/StaticData.java b/src/main/java/com/lf/server/entity/all/StaticData.java
index 3ea7fe2..eb5f2f4 100644
--- a/src/main/java/com/lf/server/entity/all/StaticData.java
+++ b/src/main/java/com/lf/server/entity/all/StaticData.java
@@ -90,6 +90,8 @@
*/
public final static String COMMA = ",";
+ public final static String BBOREHOLE = "bborehole";
+
/**
* 姝ｆ枩鏉�
*/
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 9a0a4b1..3050e91 100644
--- a/src/main/java/com/lf/server/service/data/DownloadService.java
+++ b/src/main/java/com/lf/server/service/data/DownloadService.java
@@ -1,5 +1,6 @@
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;
@@ -9,7 +10,9 @@
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;
@@ -273,7 +276,64 @@
* 鏌ヨ鏁版嵁
*/
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.split(StaticData.POINT)[1].replace("_", "");
+ 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) {
+ QueryWrapper<T> wrapper = new QueryWrapper<T>();
+
+
+ return wrapper;
}
/**
@@ -389,6 +449,9 @@
*/
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());
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 f6f1fe3..c029ddf 100644
--- a/src/main/java/com/lf/server/service/show/DataLibService.java
+++ b/src/main/java/com/lf/server/service/show/DataLibService.java
@@ -184,34 +184,7 @@
}
QueryWrapper wrapper = createQueryWrapper(baseMapper, dr);
- List list = baseMapper.selectList(wrapper);
- if (null == list || list.size() == 0) {
- continue;
- }
-
- if (!dataMap.containsKey(entity)) {
- dataMap.put(entity, list);
- } else {
- dataMap.get(entity).addAll(list);
- }
- if (wrapper.isEmptyOfWhere()) {
- wrapper.apply("1 = 1");
- }
- if ("bborehole".equals(entity)) {
- wrapper.last("limit 100");
- }
-
- String tab = BaseQueryService.getTabName(baseMapper);
- List<AttachEntity> annex = baseMapper.selectAnnex(tab, wrapper);
- if (null == annex || annex.isEmpty()) {
- continue;
- }
-
- if (!annexMap.containsKey(entity)) {
- annexMap.put(tab.replace(".", "_"), annex);
- } else {
- annexMap.get(tab.replace(".", "_")).addAll(annex);
- }
+ downloadService.addData(entity, baseMapper, wrapper, dataMap, annexMap);
} catch (Exception ex) {
log.error(ex.getMessage(), ex);
}
--
Gitblit v1.9.3