From 56d9f6a0b1ecfce70da391d406fcc92274cc1b03 Mon Sep 17 00:00:00 2001
From: xinyb <574600396@qq.com>
Date: 星期六, 28 九月 2024 17:31:26 +0800
Subject: [PATCH] CRM邮箱收件和发件调整
---
src/com/yc/crm/mail/service/MailServiceImpl.java | 13 ++++++++++---
src/com/yc/crm/mail/action/MailController.java | 9 +++++++--
src/com/yc/crm/mail/entity/t482101HEntity.java | 3 ++-
src/com/yc/crm/mail/service/MailFileImpl.java | 2 ++
4 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/src/com/yc/crm/mail/action/MailController.java b/src/com/yc/crm/mail/action/MailController.java
index fcfabb9..5c912cc 100644
--- a/src/com/yc/crm/mail/action/MailController.java
+++ b/src/com/yc/crm/mail/action/MailController.java
@@ -216,10 +216,15 @@
if (StringUtils.isNotBlank(t482101HEntity.getAttachmentList())) {//闄勪欢鐨勫鐞�
//鑾峰彇鍒伴檮浠跺唴瀹�
List<AttachmentEntity> attachmentEntities = mailFileIfc.getAttachmentEntityList(t482101HEntity.getAttachmentList());
- List<String> list = new ArrayList<>();
+ List<Map<String,Object>> list = new ArrayList<>();
if (attachmentEntities.size() > 0) {
for (AttachmentEntity a : attachmentEntities) {
- list.add(shoppingImageServer + "/uploads/email/" + dataSourceEntity.getDbId() + "/482101/" + a.getUnid() + "@p@" + a.getPhysicalFile());
+ Map<String,Object> map=new HashMap<>();
+ map.put("url",shoppingImageServer + "/uploads/email/" + dataSourceEntity.getDbId() + "/482101/" + a.getUnid() + "@p@" + a.getPhysicalFile());
+ map.put("name",a.getOriginalFileName());
+ map.put("size",a.getFileSize());
+ map.put("fileType",a.getFileType());
+ list.add(map);
}
t482101HEntity.setAttachmentPath(list);
}
diff --git a/src/com/yc/crm/mail/entity/t482101HEntity.java b/src/com/yc/crm/mail/entity/t482101HEntity.java
index 0ca7ada..51c9720 100644
--- a/src/com/yc/crm/mail/entity/t482101HEntity.java
+++ b/src/com/yc/crm/mail/entity/t482101HEntity.java
@@ -4,6 +4,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
/**
* @BelongsProject: eCoWorksV3
@@ -64,7 +65,7 @@
private String content;
private String plainText;
private String attachmentList;
- private List<String> attachmentPath;
+ private List<Map<String,Object>> attachmentPath;
private String inlineImageList;
private String summary;
private String tagList;
diff --git a/src/com/yc/crm/mail/service/MailFileImpl.java b/src/com/yc/crm/mail/service/MailFileImpl.java
index e0b5d5a..1a4e122 100644
--- a/src/com/yc/crm/mail/service/MailFileImpl.java
+++ b/src/com/yc/crm/mail/service/MailFileImpl.java
@@ -88,6 +88,8 @@
for (int i = 0; list != null && i < list.size(); i++) {
AttachmentEntity attachment = new AttachmentEntity();
attachment.setUnid(unId);
+ attachment.setFileType(list.get(i).get("FileType") == null ? null : (String) list.get(i).get("FileType"));
+ attachment.setFileSize(list.get(i).get("FileSize") == null ? 0 : (Long) list.get(i).get("FileSize"));
attachment.setPhysicalFile(list.get(i).get("PhysicalFile") == null ? null : (String) list.get(i).get("PhysicalFile"));
attachment.setOriginalFileName(list.get(i).get("OriginalFileName") == null ? null : (String) list.get(i).get("OriginalFileName"));
attachment.setOriginalPicture(list.get(i).get("OriginalPicture") == null ? null : (byte[]) list.get(i).get("OriginalPicture")); //闄勪欢澶勭悊
diff --git a/src/com/yc/crm/mail/service/MailServiceImpl.java b/src/com/yc/crm/mail/service/MailServiceImpl.java
index b3911e8..439a8da 100644
--- a/src/com/yc/crm/mail/service/MailServiceImpl.java
+++ b/src/com/yc/crm/mail/service/MailServiceImpl.java
@@ -437,10 +437,17 @@
result.append(bodyPart.getContent());
}
}
- } else {
+ if (StringUtils.isBlank(result.toString())) {//娌tml鏃跺�欐妸绾枃鏈祴鍊艰繃鍘�
+ result.append(plainText);
+ }
+ }
+// else {
for (int i = 0; i < count; i++) {
BodyPart bodyPart = mimeMultipart.getBodyPart(i);
- if (bodyPart.isMimeType("image/*")) {//鍥剧墖
+// if (bodyPart.isMimeType("text/html")) {//杩欎釜鏄幏鍙杊tml鏍煎紡
+// result.append(bodyPart.getContent());
+// }else
+ if (bodyPart.isMimeType("image/*")) {//鍥剧墖
MailFileEntity.MailBodyPart p = new MailFileEntity.MailBodyPart();
String fileName = "xxx.jpg";
if (StringUtils.isNotBlank(bodyPart.getFileName())) {
@@ -491,7 +498,7 @@
result.append(getTextFromMimeMultipart((MimeMultipart) bodyPart.getContent(), plainText, part, unId, attachment, dbId));
}
}
- }
+// }
return result.toString();
}
--
Gitblit v1.8.0