From 8cc2cacaa3df7f53bc3f2476c10f9924ef45e6e9 Mon Sep 17 00:00:00 2001
From: xing <xingjs@qq.com>
Date: 星期二, 21 二月 2023 10:59:59 +0800
Subject: [PATCH] 20230221@xingjs@提交官网一张图相关内容接口
---
src/main/java/com/lf/server/service/show/PipelineService.java | 20 ++++----------------
1 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/lf/server/service/show/PipelineService.java b/src/main/java/com/lf/server/service/show/PipelineService.java
index 529c7cd..e1f552d 100644
--- a/src/main/java/com/lf/server/service/show/PipelineService.java
+++ b/src/main/java/com/lf/server/service/show/PipelineService.java
@@ -1,18 +1,13 @@
package com.lf.server.service.show;
-import com.lf.server.entity.all.BaseGeoEntity;
import com.lf.server.entity.all.StaticData;
import com.lf.server.entity.data.DownloadEntity;
-import com.lf.server.entity.data.MetaFileEntity;
import com.lf.server.entity.show.PipelineEntity;
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.*;
-import com.lf.server.mapper.all.GeomBaseMapper;
import com.lf.server.mapper.data.DownloadMapper;
import com.lf.server.mapper.show.PipelineMapper;
-import com.lf.server.service.all.BaseQueryService;
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;
@@ -23,9 +18,6 @@
import java.io.File;
import java.lang.reflect.Field;
-import java.math.BigDecimal;
-import java.sql.Timestamp;
-import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -67,10 +59,6 @@
* @return 涓嬭浇鏂囦欢GUID
*/
public String createZipFile(UserEntity ue, Map<String, List<PipelineEntity>> map, String pwd) throws Exception {
- if (map.size() == 0) {
- return null;
- }
-
String tempName = StringHelper.YMDHMS2_FORMAT.format(new Date());
String tempPath = pathHelper.getTempPath(tempName);
String filePath = tempPath + File.separator + tempName + ".gdb";
@@ -104,12 +92,12 @@
try {
driver = ogr.GetDriverByName("FileGDB");
if (null == driver) {
- log.error("GdbHelper.createGdb.driver(FileGDB) is null.");
+ log.error("PipelineService.createGdb.driver(FileGDB) is null.");
return;
}
dataSource = driver.CreateDataSource(filePath, null);
if (null == dataSource) {
- log.error("GdbHelper.createGdb.dataSource is null. " + filePath);
+ log.error("PipelineService.createGdb.dataSource is null. " + filePath);
return;
}
@@ -117,7 +105,7 @@
Layer layer = null;
try {
List<PipelineEntity> list = map.get(key);
- layer = createLayer(dataSource, key, list.get(0));
+ layer = createLayer(dataSource, key.replace(".", "_"), list.get(0));
List<Field> fields = new ArrayList<>();
getFields(PipelineEntity.class, fields);
@@ -219,7 +207,7 @@
private DownloadEntity getDownloadEntity(UserEntity ue, String file, String pwd) throws Exception {
DownloadEntity de = new DownloadEntity();
de.setName(FileHelper.getFileName(file));
- // 1-Shp鏂囦欢锛�2-涓撻鍥撅紝3-鍏冩暟鎹紝4-涓氬姟鏁版嵁锛�5-绠￠亾鍒嗘瀽
+ // 1-Shp鏂囦欢锛�2-涓撻鍥撅紝3-婧愭暟鎹紝4-涓氬姟鏁版嵁锛�5-绠￠亾鍒嗘瀽锛�6-缁熻鎶ュ憡
de.setType(5);
de.setSizes(FileHelper.sizeToMb(new File(file).length()));
de.setDepid(ue.getDepid());
--
Gitblit v1.9.3