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/UploadService.java | 148 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 117 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/lf/server/service/data/UploadService.java b/src/main/java/com/lf/server/service/data/UploadService.java
index a8dcc75..dd49923 100644
--- a/src/main/java/com/lf/server/service/data/UploadService.java
+++ b/src/main/java/com/lf/server/service/data/UploadService.java
@@ -3,12 +3,14 @@
import com.lf.server.entity.all.BaseEntity;
import com.lf.server.entity.all.StaticData;
import com.lf.server.entity.data.*;
+import com.lf.server.entity.sys.DepEntity;
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.UploadMapper;
import com.lf.server.service.all.BaseQueryService;
import com.lf.server.service.all.BaseUploadService;
+import com.lf.server.service.sys.DepService;
import org.apache.commons.io.FileUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -34,6 +36,12 @@
@Autowired
MetaService metaService;
+ @Autowired
+ DepService depService;
+
+ @Autowired
+ DirService dirService;
+
@Override
public List<CoordEntity> selectCoords(String zoning) {
return uploadMapper.selectCoords(zoning);
@@ -57,17 +65,17 @@
/**
* 鎻掑叆鏂囦欢
*/
- public List<MetaEntity> insertFiles(UserEntity ue, List<MetaFileEntity> list, HttpServletRequest req) {
+ public void insertFiles(UserEntity ue, List<MetaFileEntity> list, HttpServletRequest req) {
checkMetaFiles(ue, list);
excelLoader(list, req);
loadData(list);
copyFiles(list);
-
- return insertMetas(list);
+ publishFiles(list);
+ insertMetas(list);
}
/**
- * 妫�鏌ュ厓鏁版嵁鏂囦欢
+ * 妫�鏌ユ簮鏁版嵁鏂囦欢
*/
private void checkMetaFiles(UserEntity ue, List<MetaFileEntity> list) {
Timestamp createTime = WebHelper.getCurrentTimestamp();
@@ -76,7 +84,7 @@
for (MetaFileEntity mf : list) {
mf.setCreateUser(ue.getId());
mf.setCreateTime(createTime);
- mf.setDepid(ue.getDepid());
+ mf.setDepcode(ue.getDepcode());
mf.setPath(tempPath + File.separator + mf.getPath());
mf.setMsg(null);
@@ -113,7 +121,7 @@
}
/**
- * 鑾峰彇Excel鍏冩暟鎹枃浠�
+ * 鑾峰彇Excel婧愭暟鎹枃浠�
*/
private List<MetaFileEntity> getExcelFiles(List<MetaFileEntity> list) {
List<MetaFileEntity> xlsList = new ArrayList<>();
@@ -130,7 +138,7 @@
}
/**
- * 鑾峰彇Excel鐨勫厓鏁版嵁
+ * 鑾峰彇Excel鐨勬簮鏁版嵁
*/
private MetaFileEntity getExcelMeta(List<MetaFileEntity> xlsList) {
List<String> pathList = new ArrayList<>();
@@ -144,18 +152,19 @@
String path = copyXlsFile(xlsBasePath, i, mf);
if (null != path) {
pathList.add(path);
- dirList.add(mf.getDirid() + "");
+ dirList.add(mf.getDircode());
pidList.add(mf.getEventid());
}
}
+ MetaFileEntity first = xlsList.get(0);
MetaFileEntity meta = new MetaFileEntity();
meta.setPath(StringHelper.join(pathList, ","));
- meta.setEpsgCode(xlsList.get(0).getEpsgCode());
+ meta.setEpsgCode(first.getEpsgCode());
meta.setName(StringHelper.join(dirList, ";"));
- meta.setDepid(xlsList.get(0).getDepid());
- meta.setVerid(xlsList.get(0).getVerid());
- meta.setCreateUser(xlsList.get(0).getCreateUser());
+ meta.setDepcode(first.getDepcode());
+ meta.setVerid(first.getVerid());
+ meta.setCreateUser(first.getCreateUser());
meta.setEventid(StringHelper.join(pidList, ";"));
return meta;
@@ -274,8 +283,8 @@
BaseEntity be = (BaseEntity) t;
be.setEventid(StringHelper.getGuid());
be.setParentid(mf.getEventid());
- be.setDirid(mf.getDirid());
- be.setDepid(mf.getDepid());
+ be.setDirid(mf.getDircode());
+ be.setDepid(mf.getDepcode());
be.setVerid(mf.getVerid());
be.setCreateuser(mf.getCreateUser());
be.setCreatetime(mf.getCreateTime());
@@ -291,6 +300,10 @@
private void copyFiles(List<MetaFileEntity> list) {
List<String> gdbList = new ArrayList<>();
for (MetaFileEntity mf : list) {
+ if (null != mf.getMsg()) {
+ continue;
+ }
+
switch (mf.getExtName()) {
case StaticData.MPT:
copyMultiFile(mf, StaticData.MPT_EXT);
@@ -365,7 +378,6 @@
*/
private void copyMultiFile(MetaFileEntity mf, List<String> extList) {
String path = mf.getPath();
-
int status = copySingleFile(mf);
if (status < 1) {
for (int i = 0, c = extList.size(); i < c; i++) {
@@ -451,32 +463,86 @@
}
/**
- * 鎻掑叆鍏冩暟鎹�
+ * 鍙戝竷鏂囦欢
*/
- private List<MetaEntity> insertMetas(List<MetaFileEntity> list) {
- List<MetaEntity> metas = new ArrayList<>();
+ private void publishFiles(List<MetaFileEntity> list) {
for (MetaFileEntity mf : list) {
- if (StringHelper.isEmpty(mf.getMsg())) {
- metas.add(createMeta(mf));
+ if (null != mf.getMsg()) {
+ continue;
+ }
+ switch (mf.getExtName()) {
+ case StaticData.MPT:
+ linkFiles(mf, StaticData.MPT_EXT, pathHelper.getConfig().getPublishMptPath());
+ break;
+ case StaticData.D3DML:
+ linkFiles(mf, null, pathHelper.getConfig().getPublish3dmlPath());
+ break;
+ default:
+ break;
}
}
- if (metas.isEmpty()) {
- return null;
- }
-
- int rows = metaService.inserts(metas);
-
- return rows > 0 ? metas : null;
}
/**
- * 鍒涘缓鍏冩暟鎹�
+ * 閾炬帴鏂囦欢
*/
- private MetaEntity createMeta(MetaFileEntity mf) {
+ private void linkFiles(MetaFileEntity mf, List<String> exts, String publishPath) {
+ String uploadPath = pathHelper.getConfig().getUploadPath();
+ String source = uploadPath + File.separator + mf.getPath();
+ String target = publishPath + File.separator + mf.getName();
+
+ File sourceFile = new File(source);
+ if (!sourceFile.exists() || sourceFile.isDirectory()) {
+ return;
+ }
+
+ createFileLink(source, target);
+ if (null == exts) {
+ return;
+ }
+
+ for (String ext : exts) {
+ File f = new File(source.replace(mf.getExtName(), ext));
+ if (f.exists() && !f.isDirectory()) {
+ createFileLink(source.replace(mf.getExtName(), ext), target.replace(mf.getExtName(), ext));
+ }
+ }
+ }
+
+ /**
+ * 鍒涘缓鏂囦欢閾炬帴
+ */
+ private void createFileLink(String source, String target) {
+ String cmd = String.format("cmd /c mklink \"%s\" \"%s\"", target, source);
+ WebHelper.exec(cmd);
+ }
+
+ /**
+ * 鎻掑叆婧愭暟鎹�
+ */
+ private void insertMetas(List<MetaFileEntity> list) {
+ int metaId = insertParentMeta(list);
+ for (MetaFileEntity mf : list) {
+ if (null != mf.getMsg()) {
+ continue;
+ }
+
+ MetaEntity me = createMeta(mf, metaId);
+ metaService.insert(me);
+
+ mf.setMsg(me.getId() > 0 ? "鎴愬姛" : "澶辫触");
+ }
+ }
+
+ /**
+ * 鍒涘缓婧愭暟鎹�
+ */
+ private MetaEntity createMeta(MetaFileEntity mf, int metaId) {
MetaEntity me = new MetaEntity();
+ me.setMetaid(metaId);
me.setEventid(mf.getEventid());
- me.setDirid(mf.getDirid());
- me.setDepid(mf.getDepid());
+ me.setDircode(mf.getDircode());
+ me.setDepcode(mf.getDepcode());
me.setVerid(mf.getVerid());
me.setName(mf.getName());
me.setType(mf.getType());
@@ -495,4 +561,24 @@
return me;
}
+
+ /**
+ * 鎻掑叆鐖舵簮鏁版嵁
+ */
+ private int insertParentMeta(List<MetaFileEntity> list) {
+ for (MetaFileEntity mf : list) {
+ if (null != mf.getMsg() || !mf.getIsMeta()) {
+ continue;
+ }
+
+ MetaEntity me = createMeta(mf, 0);
+ me.setIsmeta((short) 1);
+ metaService.insert(me);
+ mf.setMsg(me.getId() > 0 ? "鎴愬姛" : "澶辫触");
+
+ return me.getId();
+ }
+
+ return 0;
+ }
}
--
Gitblit v1.9.3