From 9bce48a9f30f7d80c43f43f46d40df20fcb00e15 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 03 二月 2023 09:39:59 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/all/BaseUploadService.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
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 17509af..103b928 100644
--- a/src/main/java/com/lf/server/service/all/BaseUploadService.java
+++ b/src/main/java/com/lf/server/service/all/BaseUploadService.java
@@ -28,10 +28,10 @@
@Service
public class BaseUploadService {
@Autowired
- private DirService dirService;
+ protected DirService dirService;
@Autowired
- private PathHelper pathHelper;
+ protected PathHelper pathHelper;
public final Log log = LogFactory.getLog(getClass());
@@ -290,7 +290,7 @@
String fileName = FileHelper.getFileName(f.getPath());
String extName = FileHelper.getExtension(fileName);
- if (!StaticData.ALL_EXTENSION.contains(extName)) {
+ if (!StaticData.ALL_EXTENSION.contains(extName) || fileName.startsWith("~")) {
continue;
}
@@ -313,7 +313,7 @@
if (isShp) {
List<String> shpFiles = getShpFiles(f.getPath());
- mf.setTab(fileName);
+ mf.setTab(fileName.replace(StaticData.SHP, ""));
mf.setSizes(getFilesSize(shpFiles));
mf.setGuid(getFilesMd5(shpFiles));
} else {
@@ -347,7 +347,7 @@
if (0 != dir.getPid() || null == dirs || dirs.isEmpty()) {
return dir.getId();
}
- if ("/".equals(File.separator)) {
+ if (StaticData.SLASH.equals(File.separator)) {
filePath = filePath.replace("/", "\\");
}
@@ -367,8 +367,8 @@
List<String> list = new ArrayList<>();
list.add(shpPath);
- for (int i = 1, c = StaticData.SHP_EXTENSION.size(); i < c; i++) {
- String path = shpPath.replace(".shp", StaticData.SHP_EXTENSION.get(i));
+ for (int i = 0, c = StaticData.SHP_EXT.size(); i < c; i++) {
+ String path = shpPath.replace(".shp", StaticData.SHP_EXT.get(i));
File f = new File(path);
if (f.exists() && !f.isDirectory()) {
--
Gitblit v1.9.3