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/show/ExportService.java | 21 ++++++---------------
1 files changed, 6 insertions(+), 15 deletions(-)
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 88424d2..b3ea46c 100644
--- a/src/main/java/com/lf/server/service/show/ExportService.java
+++ b/src/main/java/com/lf/server/service/show/ExportService.java
@@ -26,7 +26,7 @@
*/
@Service
public class ExportService {
- @Value("${sys.path.exportServer}")
+ @Value("${sys.exportServer}")
private String exportServer;
@Autowired
@@ -63,7 +63,7 @@
return null;
}
- DownloadEntity de = getDownloadEntity(ue, file);
+ DownloadEntity de = getDownloadEntity(ue, entity, file);
int rows = downloadService.insert(de);
return rows > 0 ? de.getGuid() : null;
@@ -78,7 +78,7 @@
Field[] fields = entity.getClass().getDeclaredFields();
for (Field field : fields) {
try {
- if (field.getName() == "serialVersionUID") {
+ if ("serialVersionUID".equals(field.getName())) {
continue;
}
@@ -97,7 +97,7 @@
/**
* 鑾峰彇涓嬭浇瀹炰綋绫�
*/
- private DownloadEntity getDownloadEntity(UserEntity ue, String file) throws Exception {
+ private DownloadEntity getDownloadEntity(UserEntity ue, ExportEntity entity, String file) throws Exception {
DownloadEntity de = new DownloadEntity();
de.setName(FileHelper.getFileName(file));
de.setType(2);
@@ -106,21 +106,12 @@
de.setDcount(0);
// de.setPwd(null)
de.setUrl(FileHelper.getRelativePath(file));
- de.setDescr("涓撻鍥炬枃浠�");
+ // de.setDescr("涓撻鍥炬枃浠�")
+ de.setDescr(StringHelper.isEmpty(entity.getTitle()) ? "涓撻鍥炬枃浠�" : entity.getTitle().trim());
de.setGuid(FileHelper.getFileMd5(file));
de.setCreateUser(ue.getId());
// de.setGeom(null)
return de;
- }
-
- /**
- * 鑾峰彇涓嬭浇鏂囦欢璺緞
- *
- * @param de 涓嬭浇瀹炰綋绫�
- * @return 涓嬭浇鏂囦欢璺緞
- */
- public String getDownloadFilePath(DownloadEntity de) {
- return pathHelper.getConfig().getDownloadPath() + File.separator + de.getUrl();
}
}
--
Gitblit v1.9.3