From 05ffa1a7f490e1e81d6fbf1ee948db50b1fff6fc Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 14 二月 2023 16:02:52 +0800
Subject: [PATCH] 修改depcode、dircode值
---
src/main/java/com/lf/server/service/data/UploadService.java | 29 +++++++++++++++++++----------
1 files changed, 19 insertions(+), 10 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 f9c9a34..3749d34 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;
@@ -33,6 +35,12 @@
@Autowired
MetaService metaService;
+
+ @Autowired
+ DepService depService;
+
+ @Autowired
+ DirService dirService;
@Override
public List<CoordEntity> selectCoords(String zoning) {
@@ -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);
@@ -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());
@@ -530,8 +539,8 @@
private MetaEntity createMeta(MetaFileEntity mf) {
MetaEntity me = new MetaEntity();
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());
--
Gitblit v1.9.3