提交

src/main/java/com/fjhx/base/BaseSelectVo.java

@@ -31,12 +31,12 @@ public class BaseSelectVo implements Serializable {
     /**
      * 通用开始时间
      */
-    private Date beginTime;
+    private String beginTime;
 
     /**
      * 通用结束时间
      */
-    private Date endTime;
+    private String endTime;
 
     /**
      * 返回分页实体
@@ -54,11 +54,19 @@ public class BaseSelectVo implements Serializable {
     }
 
     public Date getBeginTime() {
-        return ObjectUtil.isNotEmpty(beginTime) ? DateUtil.endOfDay(beginTime) : null;
+        if (ObjectUtil.isEmpty(beginTime)) {
+            return null;
+        }
+
+        return DateUtil.beginOfDay(DateUtil.parse(beginTime));
     }
 
     public Date getEndTime() {
-        return ObjectUtil.isNotEmpty(endTime) ? DateUtil.endOfDay(endTime) : null;
+        if (ObjectUtil.isEmpty(endTime)) {
+            return null;
+        }
+
+        return DateUtil.endOfDay(DateUtil.parse(endTime));
     }
 
 }

src/main/java/com/fjhx/controller/EmailMessageController.java

@@ -3,6 +3,8 @@ package com.fjhx.controller;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.base.R;
 import com.fjhx.entity.EmailMessage;
+import com.fjhx.entity.EmailMessageAttachment;
+import com.fjhx.service.IEmailMessageAttachmentService;
 import com.fjhx.service.IEmailMessageContentService;
 import com.fjhx.service.IEmailMessageService;
 import com.fjhx.vo.GetEmailMessagePageVo;
@@ -12,6 +14,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * <p>
  *  前端控制器
@@ -30,6 +34,9 @@ public class EmailMessageController {
     @Autowired
     private IEmailMessageContentService emailMessageContentService;
 
+    @Autowired
+    private IEmailMessageAttachmentService emailMessageAttachmentService;
+
     /**
      * 获取邮件分页信息
      */
@@ -42,7 +49,7 @@ public class EmailMessageController {
     /**
      * 删除邮件
      */
-    @GetMapping("delete")
+    @GetMapping("/delete")
     public R delete(@RequestParam("messageId") String messageId) {
         emailMessageService.delete(messageId);
         return R.ok();
@@ -51,11 +58,19 @@ public class EmailMessageController {
     /**
      * 获取邮件正文
      */
-    @GetMapping("content")
+    @GetMapping("/content")
     public R content(@RequestParam String email, @RequestParam("messageId") String messageId) {
         String result = emailMessageContentService.getContent(email, messageId);
         return R.ok(result);
     }
 
+    /**
+     * 邮件附件列表
+     */
+    @GetMapping("attachmentList")
+    public R attachmentList(@RequestParam("messageId") String messageId) {
+        List<EmailMessageAttachment> result = emailMessageAttachmentService.getAttachmentList(messageId);
+        return R.ok(result);
+    }
 
 }

src/main/java/com/fjhx/service/IEmailMessageAttachmentService.java

@@ -1,7 +1,9 @@
 package com.fjhx.service;
 
+import com.fjhx.base.BaseService;
 import com.fjhx.entity.EmailMessageAttachment;
-import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +13,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author zlj
  * @since 2022-12-21
  */
-public interface IEmailMessageAttachmentService extends IService<EmailMessageAttachment> {
+public interface IEmailMessageAttachmentService extends BaseService<EmailMessageAttachment> {
+
+    List<EmailMessageAttachment> getAttachmentList(String messageId);
 
 }

src/main/java/com/fjhx/service/IEmailMessageContentService.java

@@ -1,8 +1,11 @@
 package com.fjhx.service;
 
 import com.fjhx.base.BaseService;
+import com.fjhx.entity.EmailMessageAttachment;
 import com.fjhx.entity.EmailMessageContent;
 
+import java.util.List;
+
 /**
  * <p>
  * 邮件正文 服务类

src/main/java/com/fjhx/service/impl/EmailMessageAttachmentServiceImpl.java

@@ -1,11 +1,13 @@
 package com.fjhx.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.entity.EmailMessageAttachment;
 import com.fjhx.mapper.EmailMessageAttachmentMapper;
 import com.fjhx.service.IEmailMessageAttachmentService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 文件附件 服务实现类
@@ -17,4 +19,9 @@ import org.springframework.stereotype.Service;
 @Service
 public class EmailMessageAttachmentServiceImpl extends ServiceImpl<EmailMessageAttachmentMapper, EmailMessageAttachment> implements IEmailMessageAttachmentService {
 
+    @Override
+    public List<EmailMessageAttachment> getAttachmentList(String messageId) {
+        return list(q -> q.eq(EmailMessageAttachment::getMessageId, messageId));
+    }
+
 }

src/main/java/com/fjhx/service/impl/EmailMessageContentServiceImpl.java

@@ -37,8 +37,7 @@ public class EmailMessageContentServiceImpl extends ServiceImpl<EmailMessageCont
 
     @Override
     public String getContent(String email, String messageId) {
-        EmailMessageContent content = getById(email);
-
+        EmailMessageContent content = getById(messageId);
         try {
             if (content == null) {
                 // 正文内容
@@ -51,6 +50,9 @@ public class EmailMessageContentServiceImpl extends ServiceImpl<EmailMessageCont
 
                 String syncHtml = html;
                 syncExecutor.execute(() -> {
+
+                    AccountServiceImpl.syncMessageContentList.remove(email + "," + messageId);
+
                     EmailMessageContent emailMessageContent = new EmailMessageContent();
                     emailMessageContent.setMessageId(messageId);
                     emailMessageContent.setHtmlContent(syncHtml);
@@ -61,7 +63,6 @@ public class EmailMessageContentServiceImpl extends ServiceImpl<EmailMessageCont
                     emailMessage.setContentSync(true);
                     emailMessageService.updateById(emailMessage);
 
-                    AccountServiceImpl.syncMessageContentList.remove(email + "," + messageId);
                 });
 
                 return html;
@@ -71,7 +72,6 @@ public class EmailMessageContentServiceImpl extends ServiceImpl<EmailMessageCont
             throw new ServiceException("获取正文失败");
         }
 
-
         return content.getHtmlContent();
     }
 }

src/main/resources/application-dev.yml

@@ -19,9 +19,9 @@ spring:
     # 数据库索引
     database: 0
 
-#mybatis-plus:
-#  configuration:
-#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+mybatis-plus:
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 
 config:
   urlPrefix: http://localhost:3000/