From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service
---
src/main/java/com/lf/server/service/show/ExportService.java | 22 +++++++---------------
1 files changed, 7 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..6de55a9 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,30 +97,22 @@
/**
* 鑾峰彇涓嬭浇瀹炰綋绫�
*/
- 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));
+ // 1-Shp鏂囦欢锛�2-涓撻鍥撅紝3-鍏冩暟鎹紝4-涓氬姟鏁版嵁锛�5-绠￠亾鍒嗘瀽锛�6-缁熻鎶ュ憡锛�7-闄勪欢鏂囦欢锛�8-鐡︾墖鏂囦欢
de.setType(2);
de.setSizes(FileHelper.sizeToMb(new File(file).length()));
de.setDepid(ue.getDepid());
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