邮件 我的文件夹

hx-mail/src/main/java/com/fjhx/mail/controller/my/MyFolderMessageController.java

@@ -1,6 +1,7 @@
 package com.fjhx.mail.controller.my;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.mail.entity.my.dto.MyFolderMessageDto;
 import com.fjhx.mail.entity.my.dto.MyFolderMessageSelectDto;
 import com.fjhx.mail.entity.my.vo.MessageVo;
 import com.fjhx.mail.service.my.MyFolderMessageService;
@@ -37,6 +38,14 @@ public class MyFolderMessageController {
     }
 
     /**
+     * 我的文件夹关联邮件添加
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody MyFolderMessageDto dto) {
+        myFolderMessageService.add(dto);
+    }
+
+    /**
      * 我的文件夹关联邮件删除
      */
     @PostMapping("/delete")

hx-mail/src/main/java/com/fjhx/mail/entity/my/po/MyFolderMessage.java

@@ -1,11 +1,12 @@
 package com.fjhx.mail.entity.my.po;
 
-import com.ruoyi.common.core.domain.BasePo;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
+import com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
+
 /**
  * <p>
  * 我的文件夹关联邮件
@@ -22,11 +23,13 @@ public class MyFolderMessage extends BasePo {
     /**
      * 我的文件夹id
      */
+    @NotNull(message = "我的文件夹id不能为空")
     private Long myFolderId;
 
     /**
      * 邮件id
      */
+    @NotNull(message = "邮件id不能为空")
     private Long messageId;
 
 }

hx-mail/src/main/java/com/fjhx/mail/service/my/MyFolderMessageService.java

@@ -1,6 +1,7 @@
 package com.fjhx.mail.service.my;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.mail.entity.my.dto.MyFolderMessageDto;
 import com.fjhx.mail.entity.my.dto.MyFolderMessageSelectDto;
 import com.fjhx.mail.entity.my.po.MyFolderMessage;
 import com.fjhx.mail.entity.my.vo.MessageVo;
@@ -23,8 +24,15 @@ public interface MyFolderMessageService extends BaseService<MyFolderMessage> {
     Page<MessageVo> getPage(MyFolderMessageSelectDto dto);
 
     /**
+     * 我的文件夹关联邮件添加
+     */
+    void add(MyFolderMessageDto dto);
+
+
+    /**
      * 我的文件夹关联邮件删除
      */
     void delete(Long id);
 
+
 }

hx-mail/src/main/java/com/fjhx/mail/service/my/impl/MyFolderMessageServiceImpl.java

@@ -2,6 +2,7 @@ package com.fjhx.mail.service.my.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.mail.entity.my.dto.MyFolderMessageDto;
 import com.fjhx.mail.entity.my.dto.MyFolderMessageSelectDto;
 import com.fjhx.mail.entity.my.po.MyFolderMessage;
 import com.fjhx.mail.entity.my.vo.MessageVo;
@@ -26,11 +27,22 @@ public class MyFolderMessageServiceImpl extends ServiceImpl<MyFolderMessageMappe
     public Page<MessageVo> getPage(MyFolderMessageSelectDto dto) {
         IWrapper<MyFolderMessage> wrapper = getWrapper();
         wrapper.eq("mfm", MyFolderMessage::getMyFolderId, dto.getMyFolderId());
-        wrapper.orderByDesc("mfm", MyFolderMessage::getId);
+        wrapper.orderByDesc("mfm", MyFolderMessage::getUpdateTime);
         return this.baseMapper.getPage(dto.getPage(), wrapper, dto.getType());
     }
 
     @Override
+    public void add(MyFolderMessageDto dto) {
+        MyFolderMessage myFolderMessage = getOne(q -> q.eq(MyFolderMessage::getMessageId, dto.getMessageId()));
+        if (myFolderMessage != null) {
+            myFolderMessage.setMyFolderId(dto.getMyFolderId());
+            updateById(myFolderMessage);
+        } else {
+            save(dto);
+        }
+    }
+
+    @Override
     public void delete(Long id) {
         this.removeById(id);
     }