From de6163fd317d2b67a11d5b26f279613df1666db5 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 24 十一月 2022 08:49:30 +0800
Subject: [PATCH] 2022-11-24
---
src/main/java/com/lf/server/controller/data/MetaController.java | 4 ++--
src/main/java/com/lf/server/service/show/ExportService.java | 10 ----------
src/main/java/com/lf/server/controller/show/ExportController.java | 2 +-
src/main/java/com/lf/server/service/data/DownloadService.java | 15 +++++++++++++++
4 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/data/MetaController.java b/src/main/java/com/lf/server/controller/data/MetaController.java
index d5c238a..2aee7da 100644
--- a/src/main/java/com/lf/server/controller/data/MetaController.java
+++ b/src/main/java/com/lf/server/controller/data/MetaController.java
@@ -307,8 +307,8 @@
de.setDownloadUser(ue.getId());
int rows = downloadService.update(de);
- //String filePath = exportService.getDownloadFilePath(de);
- //WebHelper.download(filePath, de.getName(), res);
+ String filePath = downloadService.getDownloadFilePath(de);
+ WebHelper.download(filePath, de.getName(), res);
} catch (Exception ex) {
WebHelper.writeInfo(HttpStatus.ERROR, ex.getMessage(), res);
}
diff --git a/src/main/java/com/lf/server/controller/show/ExportController.java b/src/main/java/com/lf/server/controller/show/ExportController.java
index f1c4d80..67fc1e8 100644
--- a/src/main/java/com/lf/server/controller/show/ExportController.java
+++ b/src/main/java/com/lf/server/controller/show/ExportController.java
@@ -128,7 +128,7 @@
de.setDownloadUser(ue.getId());
int rows = downloadService.update(de);
- String filePath = exportService.getDownloadFilePath(de);
+ String filePath = downloadService.getDownloadFilePath(de);
WebHelper.download(filePath, de.getName(), res);
} catch (Exception ex) {
WebHelper.writeInfo(HttpStatus.ERROR, ex.getMessage(), res);
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 7fe1a2a..3872a74 100644
--- a/src/main/java/com/lf/server/service/data/DownloadService.java
+++ b/src/main/java/com/lf/server/service/data/DownloadService.java
@@ -1,11 +1,13 @@
package com.lf.server.service.data;
import com.lf.server.entity.data.DownloadEntity;
+import com.lf.server.helper.PathHelper;
import com.lf.server.helper.StringHelper;
import com.lf.server.mapper.data.DownloadMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.io.File;
import java.util.List;
/**
@@ -14,6 +16,9 @@
*/
@Service
public class DownloadService implements DownloadMapper {
+ @Autowired
+ PathHelper pathHelper;
+
@Autowired
DownloadMapper downloadMapper;
@@ -89,4 +94,14 @@
public Integer updates(List<DownloadEntity> list) {
return downloadMapper.updates(list);
}
+
+ /**
+ * 鑾峰彇涓嬭浇鏂囦欢璺緞
+ *
+ * @param de 涓嬭浇瀹炰綋绫�
+ * @return 涓嬭浇鏂囦欢璺緞
+ */
+ public String getDownloadFilePath(DownloadEntity de) {
+ return pathHelper.getConfig().getDownloadPath() + File.separator + de.getUrl();
+ }
}
diff --git a/src/main/java/com/lf/server/service/show/ExportService.java b/src/main/java/com/lf/server/service/show/ExportService.java
index 15d07a2..9d51ef0 100644
--- a/src/main/java/com/lf/server/service/show/ExportService.java
+++ b/src/main/java/com/lf/server/service/show/ExportService.java
@@ -113,14 +113,4 @@
return de;
}
-
- /**
- * 鑾峰彇涓嬭浇鏂囦欢璺緞
- *
- * @param de 涓嬭浇瀹炰綋绫�
- * @return 涓嬭浇鏂囦欢璺緞
- */
- public String getDownloadFilePath(DownloadEntity de) {
- return pathHelper.getConfig().getDownloadPath() + File.separator + de.getUrl();
- }
}
--
Gitblit v1.9.3