From 3408c978f758f0a463d2f143398d66ed6aaf3c21 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 12 一月 2023 20:47:55 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/entity/bs/UundergroundhydrologicalmonitoringEntity.java | 8 +-
src/main/java/com/lf/server/entity/bs/MdetactionpipelinepointEntity.java | 8 +-
src/main/java/com/lf/server/entity/bs/MmarkerEntity.java | 8 +-
src/main/java/com/lf/server/entity/bs/MscatterpointEntity.java | 8 +-
src/main/java/com/lf/server/entity/bd/BgeologichazardEntity.java | 8 +-
src/main/java/com/lf/server/entity/bs/SboreholeEntity.java | 8 +-
src/main/java/com/lf/server/entity/bs/MequipmentnameplateEntity.java | 8 +-
src/main/java/com/lf/server/entity/bs/SexplorationpointEntity.java | 8 +-
src/main/java/com/lf/server/entity/bs/MsurfacedeformationdataEntity.java | 8 +-
src/main/java/com/lf/server/entity/bs/MpipelinepointEntity.java | 8 +-
src/main/java/com/lf/server/entity/bd/BboreholeEntity.java | 8 +-
src/main/java/com/lf/server/entity/bs/MgeocontrolpointEntity.java | 8 +-
src/main/java/com/lf/server/entity/bs/MhydraulicprotectionEntity.java | 8 +-
src/main/java/com/lf/server/service/data/DownloadService.java | 77 +++++++++++++++++--
14 files changed, 120 insertions(+), 61 deletions(-)
diff --git a/src/main/java/com/lf/server/entity/bd/BboreholeEntity.java b/src/main/java/com/lf/server/entity/bd/BboreholeEntity.java
index f901c96..ca60428 100644
--- a/src/main/java/com/lf/server/entity/bd/BboreholeEntity.java
+++ b/src/main/java/com/lf/server/entity/bd/BboreholeEntity.java
@@ -179,19 +179,19 @@
this.path = path;
}
- public BigDecimal getx() {
+ public BigDecimal getX() {
return x;
}
- public void setx(BigDecimal x) {
+ public void setX(BigDecimal x) {
this.x = x;
}
- public BigDecimal gety() {
+ public BigDecimal getY() {
return y;
}
- public void sety(BigDecimal y) {
+ public void setY(BigDecimal y) {
this.y = y;
}
diff --git a/src/main/java/com/lf/server/entity/bd/BgeologichazardEntity.java b/src/main/java/com/lf/server/entity/bd/BgeologichazardEntity.java
index 7d54531..40b6335 100644
--- a/src/main/java/com/lf/server/entity/bd/BgeologichazardEntity.java
+++ b/src/main/java/com/lf/server/entity/bd/BgeologichazardEntity.java
@@ -114,19 +114,19 @@
this.pipename = pipename;
}
- public BigDecimal getx() {
+ public BigDecimal getX() {
return x;
}
- public void setx(BigDecimal x) {
+ public void setX(BigDecimal x) {
this.x = x;
}
- public BigDecimal gety() {
+ public BigDecimal getY() {
return y;
}
- public void sety(BigDecimal y) {
+ public void setY(BigDecimal y) {
this.y = y;
}
diff --git a/src/main/java/com/lf/server/entity/bs/MdetactionpipelinepointEntity.java b/src/main/java/com/lf/server/entity/bs/MdetactionpipelinepointEntity.java
index fc6765a..f8e774c 100644
--- a/src/main/java/com/lf/server/entity/bs/MdetactionpipelinepointEntity.java
+++ b/src/main/java/com/lf/server/entity/bs/MdetactionpipelinepointEntity.java
@@ -219,19 +219,19 @@
this.surveydate = surveydate;
}
- public BigDecimal getx() {
+ public BigDecimal getX() {
return x;
}
- public void setx(BigDecimal x) {
+ public void setX(BigDecimal x) {
this.x = x;
}
- public BigDecimal gety() {
+ public BigDecimal getY() {
return y;
}
- public void sety(BigDecimal y) {
+ public void setY(BigDecimal y) {
this.y = y;
}
diff --git a/src/main/java/com/lf/server/entity/bs/MequipmentnameplateEntity.java b/src/main/java/com/lf/server/entity/bs/MequipmentnameplateEntity.java
index 94465e8..de55c2e 100644
--- a/src/main/java/com/lf/server/entity/bs/MequipmentnameplateEntity.java
+++ b/src/main/java/com/lf/server/entity/bs/MequipmentnameplateEntity.java
@@ -90,19 +90,19 @@
this.pipename = pipename;
}
- public BigDecimal getx() {
+ public BigDecimal getX() {
return x;
}
- public void setx(BigDecimal x) {
+ public void setX(BigDecimal x) {
this.x = x;
}
- public BigDecimal gety() {
+ public BigDecimal getY() {
return y;
}
- public void sety(BigDecimal y) {
+ public void setY(BigDecimal y) {
this.y = y;
}
diff --git a/src/main/java/com/lf/server/entity/bs/MgeocontrolpointEntity.java b/src/main/java/com/lf/server/entity/bs/MgeocontrolpointEntity.java
index cf8256c..db970cb 100644
--- a/src/main/java/com/lf/server/entity/bs/MgeocontrolpointEntity.java
+++ b/src/main/java/com/lf/server/entity/bs/MgeocontrolpointEntity.java
@@ -80,19 +80,19 @@
this.pipename = pipename;
}
- public BigDecimal getx() {
+ public BigDecimal getX() {
return x;
}
- public void setx(BigDecimal x) {
+ public void setX(BigDecimal x) {
this.x = x;
}
- public BigDecimal gety() {
+ public BigDecimal getY() {
return y;
}
- public void sety(BigDecimal y) {
+ public void setY(BigDecimal y) {
this.y = y;
}
diff --git a/src/main/java/com/lf/server/entity/bs/MhydraulicprotectionEntity.java b/src/main/java/com/lf/server/entity/bs/MhydraulicprotectionEntity.java
index d62f735..16fc366 100644
--- a/src/main/java/com/lf/server/entity/bs/MhydraulicprotectionEntity.java
+++ b/src/main/java/com/lf/server/entity/bs/MhydraulicprotectionEntity.java
@@ -245,19 +245,19 @@
this.pipename = pipename;
}
- public BigDecimal getx() {
+ public BigDecimal getX() {
return x;
}
- public void setx(BigDecimal x) {
+ public void setX(BigDecimal x) {
this.x = x;
}
- public BigDecimal gety() {
+ public BigDecimal getY() {
return y;
}
- public void sety(BigDecimal y) {
+ public void setY(BigDecimal y) {
this.y = y;
}
diff --git a/src/main/java/com/lf/server/entity/bs/MmarkerEntity.java b/src/main/java/com/lf/server/entity/bs/MmarkerEntity.java
index 4c52809..058caa3 100644
--- a/src/main/java/com/lf/server/entity/bs/MmarkerEntity.java
+++ b/src/main/java/com/lf/server/entity/bs/MmarkerEntity.java
@@ -121,19 +121,19 @@
this.meadate = meadate;
}
- public BigDecimal getx() {
+ public BigDecimal getX() {
return x;
}
- public void setx(BigDecimal x) {
+ public void setX(BigDecimal x) {
this.x = x;
}
- public BigDecimal gety() {
+ public BigDecimal getY() {
return y;
}
- public void sety(BigDecimal y) {
+ public void setY(BigDecimal y) {
this.y = y;
}
diff --git a/src/main/java/com/lf/server/entity/bs/MpipelinepointEntity.java b/src/main/java/com/lf/server/entity/bs/MpipelinepointEntity.java
index 2d5f675..619778b 100644
--- a/src/main/java/com/lf/server/entity/bs/MpipelinepointEntity.java
+++ b/src/main/java/com/lf/server/entity/bs/MpipelinepointEntity.java
@@ -104,19 +104,19 @@
this.stavalue = stavalue;
}
- public BigDecimal getx() {
+ public BigDecimal getX() {
return x;
}
- public void setx(BigDecimal x) {
+ public void setX(BigDecimal x) {
this.x = x;
}
- public BigDecimal gety() {
+ public BigDecimal getY() {
return y;
}
- public void sety(BigDecimal y) {
+ public void setY(BigDecimal y) {
this.y = y;
}
diff --git a/src/main/java/com/lf/server/entity/bs/MscatterpointEntity.java b/src/main/java/com/lf/server/entity/bs/MscatterpointEntity.java
index b931ede..9870162 100644
--- a/src/main/java/com/lf/server/entity/bs/MscatterpointEntity.java
+++ b/src/main/java/com/lf/server/entity/bs/MscatterpointEntity.java
@@ -56,19 +56,19 @@
this.pointnum = pointnum;
}
- public BigDecimal getx() {
+ public BigDecimal getX() {
return x;
}
- public void setx(BigDecimal x) {
+ public void setX(BigDecimal x) {
this.x = x;
}
- public BigDecimal gety() {
+ public BigDecimal getY() {
return y;
}
- public void sety(BigDecimal y) {
+ public void setY(BigDecimal y) {
this.y = y;
}
diff --git a/src/main/java/com/lf/server/entity/bs/MsurfacedeformationdataEntity.java b/src/main/java/com/lf/server/entity/bs/MsurfacedeformationdataEntity.java
index 492dbf1..f6ba638 100644
--- a/src/main/java/com/lf/server/entity/bs/MsurfacedeformationdataEntity.java
+++ b/src/main/java/com/lf/server/entity/bs/MsurfacedeformationdataEntity.java
@@ -108,19 +108,19 @@
this.pipename = pipename;
}
- public BigDecimal getx() {
+ public BigDecimal getX() {
return x;
}
- public void setx(BigDecimal x) {
+ public void setX(BigDecimal x) {
this.x = x;
}
- public BigDecimal gety() {
+ public BigDecimal getY() {
return y;
}
- public void sety(BigDecimal y) {
+ public void setY(BigDecimal y) {
this.y = y;
}
diff --git a/src/main/java/com/lf/server/entity/bs/SboreholeEntity.java b/src/main/java/com/lf/server/entity/bs/SboreholeEntity.java
index 4deb656..ce80c4d 100644
--- a/src/main/java/com/lf/server/entity/bs/SboreholeEntity.java
+++ b/src/main/java/com/lf/server/entity/bs/SboreholeEntity.java
@@ -319,19 +319,19 @@
this.projname = projname;
}
- public BigDecimal getx() {
+ public BigDecimal getX() {
return x;
}
- public void setx(BigDecimal x) {
+ public void setX(BigDecimal x) {
this.x = x;
}
- public BigDecimal gety() {
+ public BigDecimal getY() {
return y;
}
- public void sety(BigDecimal y) {
+ public void setY(BigDecimal y) {
this.y = y;
}
diff --git a/src/main/java/com/lf/server/entity/bs/SexplorationpointEntity.java b/src/main/java/com/lf/server/entity/bs/SexplorationpointEntity.java
index 3c43e84..2ca266d 100644
--- a/src/main/java/com/lf/server/entity/bs/SexplorationpointEntity.java
+++ b/src/main/java/com/lf/server/entity/bs/SexplorationpointEntity.java
@@ -64,19 +64,19 @@
this.exppointid = exppointid;
}
- public BigDecimal getx() {
+ public BigDecimal getX() {
return x;
}
- public void setx(BigDecimal x) {
+ public void setX(BigDecimal x) {
this.x = x;
}
- public BigDecimal gety() {
+ public BigDecimal getY() {
return y;
}
- public void sety(BigDecimal y) {
+ public void setY(BigDecimal y) {
this.y = y;
}
diff --git a/src/main/java/com/lf/server/entity/bs/UundergroundhydrologicalmonitoringEntity.java b/src/main/java/com/lf/server/entity/bs/UundergroundhydrologicalmonitoringEntity.java
index 72b731c..2d07353 100644
--- a/src/main/java/com/lf/server/entity/bs/UundergroundhydrologicalmonitoringEntity.java
+++ b/src/main/java/com/lf/server/entity/bs/UundergroundhydrologicalmonitoringEntity.java
@@ -178,19 +178,19 @@
this.projname = projname;
}
- public BigDecimal getx() {
+ public BigDecimal getX() {
return x;
}
- public void setx(BigDecimal x) {
+ public void setX(BigDecimal x) {
this.x = x;
}
- public BigDecimal gety() {
+ public BigDecimal getY() {
return y;
}
- public void sety(BigDecimal y) {
+ public void setY(BigDecimal y) {
this.y = y;
}
diff --git a/src/main/java/com/lf/server/service/data/DownloadService.java b/src/main/java/com/lf/server/service/data/DownloadService.java
index 685ddb2..2f17e20 100644
--- a/src/main/java/com/lf/server/service/data/DownloadService.java
+++ b/src/main/java/com/lf/server/service/data/DownloadService.java
@@ -1,5 +1,6 @@
package com.lf.server.service.data;
+import com.lf.server.entity.all.StaticData;
import com.lf.server.entity.ctrl.DownloadReqEntity;
import com.lf.server.entity.data.DownloadEntity;
import com.lf.server.entity.data.MetaEntity;
@@ -225,18 +226,34 @@
* 娣诲姞鍏冩暟鎹枃浠惰嚦Zip鍖�
*/
private void addMetaFiles(ZipFile zip, ZipParameters params, List<MetaEntity> list) {
- String uploadPath = pathHelper.getConfig().getUploadPath();
-
int i = 1;
- for (MetaEntity entity : list) {
+ String uploadPath = pathHelper.getConfig().getUploadPath();
+ for (MetaEntity mf : list) {
try {
- File file = new File(uploadPath + File.separator + entity.getPath());
- zip.addFile(file, params);
-
- FileHeader header = zip.getFileHeader(entity.getGuid());
- if (null != header) {
- zip.renameFile(header, i++ + "_" + entity.getName());
+ switch ("." + mf.getType()) {
+ case StaticData.MPT:
+ addMultiFile(i++, uploadPath, mf, zip, params, StaticData.MPT_EXT);
+ break;
+ case StaticData.IMG:
+ addMultiFile(i++, uploadPath, mf, zip, params, StaticData.IMG_EXT);
+ break;
+ case StaticData.TIF:
+ addMultiFile(i++, uploadPath, mf, zip, params, StaticData.TIF_EXT);
+ break;
+ case StaticData.TIFF:
+ addMultiFile(i++, uploadPath, mf, zip, params, StaticData.TIFF_EXT);
+ break;
+ case StaticData.SHP:
+ addMultiFile(i++, uploadPath, mf, zip, params, StaticData.SHP_EXT);
+ break;
+ case StaticData.GDB:
+ addFolderFile(i++, uploadPath, mf, zip, params);
+ break;
+ default:
+ addSingleFile(i++, uploadPath, mf, zip, params);
+ break;
}
+
} catch (Exception ex) {
log.error(ex.getMessage(), ex);
}
@@ -244,6 +261,48 @@
}
/**
+ * 娣诲姞鐩綍鏂囦欢
+ */
+ private void addFolderFile(int i, String uploadPath, MetaEntity mf, ZipFile zip, ZipParameters params) throws Exception {
+
+ }
+
+ /**
+ * 娣诲姞澶氭枃浠�
+ */
+ private void addMultiFile(int i, String uploadPath, MetaEntity mf, ZipFile zip, ZipParameters params, List<String> extList) throws Exception {
+ addSingleFile(i, uploadPath, mf, zip, params);
+
+ for (String ext : extList) {
+ File file = new File(uploadPath + File.separator + mf.getPath().replace("." + mf.getType(), ext));
+ if (!file.exists() || !file.isDirectory()) {
+ continue;
+ }
+ zip.addFile(file, params);
+
+ String fileName = FileHelper.getFileName(file.getPath());
+ FileHeader header = zip.getFileHeader(fileName);
+ if (null != header) {
+ zip.renameFile(header, i + "_" + mf.getName().replace("." + mf.getType(), ext));
+ }
+ }
+ }
+
+ /**
+ * 娣诲姞鍗曟枃浠�
+ */
+ private void addSingleFile(int i, String uploadPath, MetaEntity mf, ZipFile zip, ZipParameters params) throws Exception {
+ File file = new File(uploadPath + File.separator + mf.getPath());
+ zip.addFile(file, params);
+
+ String fileName = FileHelper.getFileName(file.getPath());
+ FileHeader header = zip.getFileHeader(fileName);
+ if (null != header) {
+ zip.renameFile(header, i + "_" + mf.getName());
+ }
+ }
+
+ /**
* 鑾峰彇涓嬭浇瀹炰綋绫�
*/
private DownloadEntity getDownloadEntity(UserEntity ue, String file, String pwd) throws Exception {
--
Gitblit v1.9.3