From c8bcfd9b7dc277e212468b947b5c0b757177170c Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期日, 08 一月 2023 15:07:45 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/show/MarkController.java | 3
src/main/java/com/lf/server/entity/data/MetaFileEntity.java | 138 ++++++++++++++++++++++++++++++++++
src/main/java/com/lf/server/controller/show/InquiryController.java | 3
src/main/java/com/lf/server/service/show/MarkService.java | 7 +
src/main/java/com/lf/server/service/show/InquiryService.java | 5
src/main/java/com/lf/server/helper/FileHelper.java | 5
data/update.sql | 2
src/main/resources/mapper/data/UploadMapper.xml | 2
src/main/java/com/lf/server/service/all/BaseUploadService.java | 17 ++--
src/main/java/com/lf/server/controller/data/upload/UploadController.java | 4
10 files changed, 165 insertions(+), 21 deletions(-)
diff --git a/data/update.sql b/data/update.sql
index e4edc2e..71ccaa6 100644
--- a/data/update.sql
+++ b/data/update.sql
@@ -103,7 +103,7 @@
select * from lf.sys_dir order by id;
select zoning from lf.sys_coord group by zoning;
-
+select id, name from lf.sys_dir where pid = 0 and id > 1;
diff --git a/src/main/java/com/lf/server/controller/data/upload/UploadController.java b/src/main/java/com/lf/server/controller/data/upload/UploadController.java
index e2a5abe..9bf1e71 100644
--- a/src/main/java/com/lf/server/controller/data/upload/UploadController.java
+++ b/src/main/java/com/lf/server/controller/data/upload/UploadController.java
@@ -5,6 +5,7 @@
import com.lf.server.entity.ctrl.TabMapperEntity;
import com.lf.server.entity.ctrl.UploadEntity;
import com.lf.server.entity.data.MetaEntity;
+import com.lf.server.entity.data.MetaFileEntity;
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.WebHelper;
import com.lf.server.service.all.BaseUploadService;
@@ -64,7 +65,7 @@
@PostMapping(value = "/uploadFiles")
public ResponseMsg<Object> uploadFiles(String path, HttpServletRequest req, HttpServletResponse res) {
try {
- List<MetaEntity> list = baseUploadService.uploadData(null, path, req, res);
+ List<MetaFileEntity> list = baseUploadService.uploadData(null, path, req, res);
if (null == list || list.isEmpty()) {
return fail("娌℃湁鎵惧埌涓婁紶鏂囦欢", null);
}
@@ -74,7 +75,6 @@
return fail(ex.getMessage(), null);
}
}
-
@SysLog()
@ApiOperation(value = "鏌ヨ鏄犲皠")
diff --git a/src/main/java/com/lf/server/controller/show/InquiryController.java b/src/main/java/com/lf/server/controller/show/InquiryController.java
index 5a8bebe..b7992b8 100644
--- a/src/main/java/com/lf/server/controller/show/InquiryController.java
+++ b/src/main/java/com/lf/server/controller/show/InquiryController.java
@@ -6,6 +6,7 @@
import com.lf.server.entity.all.StaticData;
import com.lf.server.entity.ctrl.ShpRecordEntity;
import com.lf.server.entity.data.MetaEntity;
+import com.lf.server.entity.data.MetaFileEntity;
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.AesHelper;
import com.lf.server.helper.StringHelper;
@@ -49,7 +50,7 @@
return fail("鐢ㄦ埛鏈櫥褰�", null);
}
- List<MetaEntity> list = uploaderService.uploadData(null, null, req, res);
+ List<MetaFileEntity> list = uploaderService.uploadData(null, null, req, res);
if (list == null || list.size() < StaticData.FOUR) {
return fail("娌℃湁鎵惧埌宸蹭笂浼犵殑鏁版嵁鎴栦笉瀹屾暣", null);
}
diff --git a/src/main/java/com/lf/server/controller/show/MarkController.java b/src/main/java/com/lf/server/controller/show/MarkController.java
index b12a1cf..64b8067 100644
--- a/src/main/java/com/lf/server/controller/show/MarkController.java
+++ b/src/main/java/com/lf/server/controller/show/MarkController.java
@@ -8,6 +8,7 @@
import com.lf.server.entity.ctrl.MarkJsonEntity;
import com.lf.server.entity.data.DownloadEntity;
import com.lf.server.entity.data.MetaEntity;
+import com.lf.server.entity.data.MetaFileEntity;
import com.lf.server.entity.show.MarkEntity;
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.StringHelper;
@@ -234,7 +235,7 @@
return fail("鐢ㄦ埛鏈櫥褰�", null);
}
- List<MetaEntity> meList = uploaderService.uploadData(null, null, req, res);
+ List<MetaFileEntity> meList = uploaderService.uploadData(null, null, req, res);
if (meList == null || meList.size() < StaticData.FOUR) {
return fail("娌℃湁鎵惧埌宸蹭笂浼犵殑鏁版嵁鎴栦笉瀹屾暣", null);
}
diff --git a/src/main/java/com/lf/server/entity/data/MetaFileEntity.java b/src/main/java/com/lf/server/entity/data/MetaFileEntity.java
index e31697e..f03fe80 100644
--- a/src/main/java/com/lf/server/entity/data/MetaFileEntity.java
+++ b/src/main/java/com/lf/server/entity/data/MetaFileEntity.java
@@ -9,5 +9,143 @@
public class MetaFileEntity implements Serializable {
private static final long serialVersionUID = -3688958480700165163L;
+ private String eventid;
+ private int metaid;
+
+ private int dirid;
+
+ private int depid;
+
+ private int verid;
+
+ private String name;
+
+ private String type;
+
+ private String guid;
+
+ private String path;
+
+ private double sizes;
+
+ private String bstab;
+
+ private int bsrows;
+
+ private String mdtab;
+
+ private int mdrows;
+
+ public String getEventid() {
+ return eventid;
+ }
+
+ public void setEventid(String eventid) {
+ this.eventid = eventid;
+ }
+
+ public int getMetaid() {
+ return metaid;
+ }
+
+ public void setMetaid(int metaid) {
+ this.metaid = metaid;
+ }
+
+ public int getDirid() {
+ return dirid;
+ }
+
+ public void setDirid(int dirid) {
+ this.dirid = dirid;
+ }
+
+ public int getDepid() {
+ return depid;
+ }
+
+ public void setDepid(int depid) {
+ this.depid = depid;
+ }
+
+ public int getVerid() {
+ return verid;
+ }
+
+ public void setVerid(int verid) {
+ this.verid = verid;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getGuid() {
+ return guid;
+ }
+
+ public void setGuid(String guid) {
+ this.guid = guid;
+ }
+
+ public String getPath() {
+ return path;
+ }
+
+ public void setPath(String path) {
+ this.path = path;
+ }
+
+ public double getSizes() {
+ return sizes;
+ }
+
+ public void setSizes(double sizes) {
+ this.sizes = sizes;
+ }
+
+ public String getBstab() {
+ return bstab;
+ }
+
+ public void setBstab(String bstab) {
+ this.bstab = bstab;
+ }
+
+ public int getBsrows() {
+ return bsrows;
+ }
+
+ public void setBsrows(int bsrows) {
+ this.bsrows = bsrows;
+ }
+
+ public String getMdtab() {
+ return mdtab;
+ }
+
+ public void setMdtab(String mdtab) {
+ this.mdtab = mdtab;
+ }
+
+ public int getMdrows() {
+ return mdrows;
+ }
+
+ public void setMdrows(int mdrows) {
+ this.mdrows = mdrows;
+ }
}
diff --git a/src/main/java/com/lf/server/helper/FileHelper.java b/src/main/java/com/lf/server/helper/FileHelper.java
index 3cb6415..b21e617 100644
--- a/src/main/java/com/lf/server/helper/FileHelper.java
+++ b/src/main/java/com/lf/server/helper/FileHelper.java
@@ -2,6 +2,7 @@
import com.lf.server.entity.all.StaticData;
import com.lf.server.entity.data.MetaEntity;
+import com.lf.server.entity.data.MetaFileEntity;
import com.twmacinta.util.MD5;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.logging.Log;
@@ -222,9 +223,9 @@
/**
* 鍒犻櫎鏂囦欢
*/
- public static void deleteFiles(List<MetaEntity> list) {
+ public static void deleteFiles(List<MetaFileEntity> list) {
try {
- for (MetaEntity mf : list) {
+ for (MetaFileEntity mf : list) {
File f = new File(mf.getPath());
if (f.exists()) {
f.delete();
diff --git a/src/main/java/com/lf/server/service/all/BaseUploadService.java b/src/main/java/com/lf/server/service/all/BaseUploadService.java
index bd4f342..c5da217 100644
--- a/src/main/java/com/lf/server/service/all/BaseUploadService.java
+++ b/src/main/java/com/lf/server/service/all/BaseUploadService.java
@@ -1,6 +1,7 @@
package com.lf.server.service.all;
import com.lf.server.entity.data.MetaEntity;
+import com.lf.server.entity.data.MetaFileEntity;
import com.lf.server.helper.FileHelper;
import com.lf.server.helper.PathHelper;
import com.lf.server.helper.StringHelper;
@@ -80,7 +81,7 @@
/**
* 涓婁紶鏂囦欢
*/
- public <T> List<MetaEntity> uploadData(T t, String path, HttpServletRequest req, HttpServletResponse res) throws Exception {
+ public <T> List<MetaFileEntity> uploadData(T t, String path, HttpServletRequest req, HttpServletResponse res) throws Exception {
StandardMultipartHttpServletRequest request = (StandardMultipartHttpServletRequest) req;
req.setCharacterEncoding("utf-8");
res.setContentType("application/json;charset=utf-8");
@@ -88,9 +89,8 @@
if (t != null) {
setEntity(t, request);
}
- List<MetaEntity> list = getFiles(path, request);
- return list;
+ return getFiles(path, request);
}
/**
@@ -133,20 +133,21 @@
/**
* 鑾峰彇鏂囦欢
*/
- public List<MetaEntity> getFiles(String subPath, StandardMultipartHttpServletRequest req) throws Exception {
- List<MetaEntity> list = new ArrayList<MetaEntity>();
+ public List<MetaFileEntity> getFiles(String subPath, StandardMultipartHttpServletRequest req) throws Exception {
+ List<MetaFileEntity> list = new ArrayList<>();
String path = pathHelper.getTempPath(subPath);
Iterator<String> iterator = req.getFileNames();
while (iterator.hasNext()) {
MultipartFile file = req.getFile(iterator.next());
- if (StringHelper.isEmpty(file.getOriginalFilename())) {
+ if (null == file || StringHelper.isEmpty(file.getOriginalFilename())) {
continue;
}
- double sizes = FileHelper.sizeToMb(file.getSize());
- MetaEntity mf = new MetaEntity();
+ MetaFileEntity mf = new MetaFileEntity();
mf.setName(file.getOriginalFilename());
+
+ double sizes = FileHelper.sizeToMb(file.getSize());
mf.setSizes(sizes);
mf.setPath(path + File.separator + mf.getName());
diff --git a/src/main/java/com/lf/server/service/show/InquiryService.java b/src/main/java/com/lf/server/service/show/InquiryService.java
index 1e8c5f5..d993c20 100644
--- a/src/main/java/com/lf/server/service/show/InquiryService.java
+++ b/src/main/java/com/lf/server/service/show/InquiryService.java
@@ -2,6 +2,7 @@
import com.lf.server.entity.ctrl.ShpRecordEntity;
import com.lf.server.entity.data.MetaEntity;
+import com.lf.server.entity.data.MetaFileEntity;
import com.lf.server.helper.FileHelper;
import com.lf.server.helper.ShpHelper;
import com.lf.server.helper.StringHelper;
@@ -21,9 +22,9 @@
* @param list
* @return
*/
- public ShpRecordEntity readShpFirstRecord(List<MetaEntity> list) {
+ public ShpRecordEntity readShpFirstRecord(List<MetaFileEntity> list) {
String fileName = null;
- for (MetaEntity mf : list) {
+ for (MetaFileEntity mf : list) {
if (mf.getName().toLowerCase().indexOf(".shp") > -1) {
fileName = mf.getPath();
break;
diff --git a/src/main/java/com/lf/server/service/show/MarkService.java b/src/main/java/com/lf/server/service/show/MarkService.java
index 13014fd..66aff19 100644
--- a/src/main/java/com/lf/server/service/show/MarkService.java
+++ b/src/main/java/com/lf/server/service/show/MarkService.java
@@ -3,6 +3,7 @@
import com.lf.server.entity.ctrl.MarkJsonEntity;
import com.lf.server.entity.data.DownloadEntity;
import com.lf.server.entity.data.MetaEntity;
+import com.lf.server.entity.data.MetaFileEntity;
import com.lf.server.entity.show.MarkEntity;
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.*;
@@ -206,10 +207,10 @@
* @param list ShapeFile鏂囦欢鍒楄〃
* @return Mark瀹炰綋绫婚泦鍚�
*/
- public List<MarkJsonEntity> readShpForMarks(List<MetaEntity> list) {
+ public List<MarkJsonEntity> readShpForMarks(List<MetaFileEntity> list) {
String fileName = null;
- for (MetaEntity mf : list) {
- if (mf.getName().toLowerCase().indexOf(".shp") > -1) {
+ for (MetaFileEntity mf : list) {
+ if (mf.getName().toLowerCase().contains(".shp")) {
fileName = mf.getPath();
break;
}
diff --git a/src/main/resources/mapper/data/UploadMapper.xml b/src/main/resources/mapper/data/UploadMapper.xml
index ebc76d9..8e24d15 100644
--- a/src/main/resources/mapper/data/UploadMapper.xml
+++ b/src/main/resources/mapper/data/UploadMapper.xml
@@ -13,6 +13,6 @@
</select>
<select id="selectProject" resultType="com.lf.server.entity.ctrl.IdNameEntity">
- select id, name from lf.sys_dir where pid = 0 and id > 0
+ select id, name from lf.sys_dir where pid = 0 and id > 1
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3