From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service
---
src/main/java/com/lf/server/service/show/PipelineService.java | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 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 56bcdf4..68caf48 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;
@@ -47,6 +39,13 @@
PipelineMapper pipelineMapper;
private final static Log log = LogFactory.getLog(PipelineService.class);
+
+ @Override
+ public List<PipelineEntity> selectPipelines(String name) {
+ name = StringHelper.getLikeUpperStr(name);
+
+ return pipelineMapper.selectPipelines(name);
+ }
@Override
public List<PipelineEntity> selectSegNames() {
@@ -81,7 +80,7 @@
String zipFile = pathHelper.getDownloadFullPath() + File.separator + zipName;
ZipFile zip = Zip4jHelper.createZipFile(zipFile, pwd);
- ZipParameters params = Zip4jHelper.getZipParams();
+ ZipParameters params = Zip4jHelper.getZipParams(true);
addZipFiles(zip, params, file.listFiles());
String dbPwd = Md5Helper.reverse(Md5Helper.generate(pwd));
@@ -100,12 +99,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;
}
@@ -113,7 +112,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);
@@ -175,7 +174,7 @@
/**
* 璁剧疆鍥惧眰鏁版嵁
*/
- private static void setLayerData(Layer layer, List<Field> fields, List<PipelineEntity> list) throws Exception {
+ private static void setLayerData(Layer layer, List<Field> fields, List<PipelineEntity> list) throws Exception {
for (PipelineEntity t : list) {
Feature f = new Feature(layer.GetLayerDefn());
@@ -215,7 +214,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-缁熻鎶ュ憡锛�7-闄勪欢鏂囦欢锛�8-鐡︾墖鏂囦欢
de.setType(5);
de.setSizes(FileHelper.sizeToMb(new File(file).length()));
de.setDepid(ue.getDepid());
--
Gitblit v1.9.3