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 | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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 6c9b75d..68caf48 100644
--- a/src/main/java/com/lf/server/service/show/PipelineService.java
+++ b/src/main/java/com/lf/server/service/show/PipelineService.java
@@ -41,6 +41,13 @@
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() {
return pipelineMapper.selectSegNames();
}
@@ -73,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));
@@ -167,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());
@@ -207,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-绠￠亾鍒嗘瀽锛�6-缁熻鎶ュ憡
+ // 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