CRM邮箱收件和发件调整

xinyb

5 天以前 56d9f6a0b1ecfce70da391d406fcc92274cc1b03

CRM邮箱收件和发件调整

 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);
                    }

 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;

 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"));  //附件处理

 src/com/yc/crm/mail/service/MailServiceImpl.java

@@ -437,10 +437,17 @@
                    result.append(bodyPart.getContent());
                }
            }
        } else {
            if (StringUtils.isBlank(result.toString())) {//没html时候把纯文本赋值过去
                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")) {//这个是获取html格式
//                    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();
    }