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 | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 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 400573f..6de55a9 100644
--- a/src/main/java/com/lf/server/service/show/ExportService.java
+++ b/src/main/java/com/lf/server/service/show/ExportService.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.lf.server.entity.all.ResponseMsg;
+import com.lf.server.entity.all.StaticData;
import com.lf.server.entity.data.DownloadEntity;
import com.lf.server.entity.show.ExportEntity;
import com.lf.server.entity.sys.UserEntity;
@@ -25,7 +26,7 @@
*/
@Service
public class ExportService {
- @Value("${sys.path.exportServer}")
+ @Value("${sys.exportServer}")
private String exportServer;
@Autowired
@@ -52,7 +53,7 @@
}
ResponseMsg<String> msg = JSON.parseObject(str, ResponseMsg.class);
- if (msg == null || msg.getCode() != 200) {
+ if (msg == null || msg.getCode() != StaticData.TWO_HUNDRED) {
return null;
}
@@ -62,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;
@@ -72,12 +73,12 @@
* 鑾峰彇Map鏁版嵁
*/
private Map<String, Object> getMapData(ExportEntity entity) {
- Map<String, Object> map = new HashMap<String, Object>();
+ Map<String, Object> map = new HashMap<String, Object>(3);
Field[] fields = entity.getClass().getDeclaredFields();
for (Field field : fields) {
try {
- if (field.getName() == "serialVersionUID") {
+ if ("serialVersionUID".equals(field.getName())) {
continue;
}
@@ -96,15 +97,18 @@
/**
* 鑾峰彇涓嬭浇瀹炰綋绫�
*/
- 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)
--
Gitblit v1.9.3