Parcourir la source

邮件 我的文件夹

24282 il y a 2 ans
Parent
commit
1c560ee163
21 fichiers modifiés avec 659 ajouts et 5 suppressions
  1. 1 5
      hx-admin/src/main/resources/application-dev.yml
  2. 1 0
      hx-mail/src/main/java/com/fjhx/mail/config/MailServiceConfig.java
  3. 74 0
      hx-mail/src/main/java/com/fjhx/mail/controller/my/MyFolderController.java
  4. 47 0
      hx-mail/src/main/java/com/fjhx/mail/controller/my/MyFolderMessageController.java
  5. 17 0
      hx-mail/src/main/java/com/fjhx/mail/entity/my/dto/MyFolderDto.java
  6. 17 0
      hx-mail/src/main/java/com/fjhx/mail/entity/my/dto/MyFolderMessageDto.java
  7. 31 0
      hx-mail/src/main/java/com/fjhx/mail/entity/my/dto/MyFolderMessageSelectDto.java
  8. 25 0
      hx-mail/src/main/java/com/fjhx/mail/entity/my/dto/MyFolderSelectDto.java
  9. 47 0
      hx-mail/src/main/java/com/fjhx/mail/entity/my/po/MyFolder.java
  10. 32 0
      hx-mail/src/main/java/com/fjhx/mail/entity/my/po/MyFolderMessage.java
  11. 52 0
      hx-mail/src/main/java/com/fjhx/mail/entity/my/vo/MessageVo.java
  12. 17 0
      hx-mail/src/main/java/com/fjhx/mail/entity/my/vo/MyFolderMessageVo.java
  13. 17 0
      hx-mail/src/main/java/com/fjhx/mail/entity/my/vo/MyFolderVo.java
  14. 21 0
      hx-mail/src/main/java/com/fjhx/mail/mapper/my/MyFolderMapper.java
  15. 28 0
      hx-mail/src/main/java/com/fjhx/mail/mapper/my/MyFolderMessageMapper.java
  16. 30 0
      hx-mail/src/main/java/com/fjhx/mail/service/my/MyFolderMessageService.java
  17. 48 0
      hx-mail/src/main/java/com/fjhx/mail/service/my/MyFolderService.java
  18. 38 0
      hx-mail/src/main/java/com/fjhx/mail/service/my/impl/MyFolderMessageServiceImpl.java
  19. 85 0
      hx-mail/src/main/java/com/fjhx/mail/service/my/impl/MyFolderServiceImpl.java
  20. 5 0
      hx-mail/src/main/resources/mapper/my/MyFolderMapper.xml
  21. 26 0
      hx-mail/src/main/resources/mapper/my/MyFolderMessageMapper.xml

+ 1 - 5
hx-admin/src/main/resources/application-dev.yml

@@ -65,10 +65,6 @@ spring:
                     url: jdbc:mysql://36.134.91.96:17330/bytesailing_kd100?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: fjhx2012mysql
                     password: 3PN-Mzn#vnP&q6d
-#                dingding:
-#                    url: jdbc:mysql://36.134.91.96:17330/bytesailing_dingding?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-#                    username: fjhx2012mysql
-#                    password: 3PN-Mzn#vnP&q6d
                 ehsd:
                     url: jdbc:mysql://36.134.91.96:17330/bytesailing_ehsd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: fjhx2012mysql
@@ -108,7 +104,7 @@ spring:
 mail:
     # 调用邮箱服务url前缀
     urlPrefix: http://localhost:8088/mailService/
-    abroadUrlPrefix:
+    abroadUrlPrefix: http://localhost:8088/mailService/
 
 hx:
     httpUrl: http://localhost:9898/

+ 1 - 0
hx-mail/src/main/java/com/fjhx/mail/config/MailServiceConfig.java

@@ -26,4 +26,5 @@ public class MailServiceConfig {
     public void setAbroadUserUrlPrefix(String abroadUserUrlPrefix) {
         MailServiceConfig.abroadUrlPrefix = abroadUserUrlPrefix;
     }
+
 }

+ 74 - 0
hx-mail/src/main/java/com/fjhx/mail/controller/my/MyFolderController.java

@@ -0,0 +1,74 @@
+package com.fjhx.mail.controller.my;
+
+import com.alibaba.fastjson.JSONObject;
+import com.fjhx.mail.entity.my.dto.MyFolderDto;
+import com.fjhx.mail.entity.my.dto.MyFolderSelectDto;
+import com.fjhx.mail.entity.my.vo.MyFolderVo;
+import com.fjhx.mail.service.my.MyFolderService;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+
+/**
+ * <p>
+ * 我的文件夹 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2023-05-29
+ */
+@RestController
+@RequestMapping("/myFolder")
+public class MyFolderController {
+
+    @Autowired
+    private MyFolderService myFolderService;
+
+    /**
+     * 我的文件树形
+     */
+    @PostMapping("/tree")
+    public List<JSONObject> tree(@Validated @RequestBody MyFolderSelectDto dto) {
+        return myFolderService.tree(dto);
+    }
+
+    /**
+     * 我的文件夹明细
+     */
+    @PostMapping("/detail")
+    public MyFolderVo detail(@RequestBody BaseSelectDto dto) {
+        return myFolderService.detail(dto.getId());
+    }
+
+    /**
+     * 我的文件夹新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody MyFolderDto myFolderDto) {
+        myFolderService.add(myFolderDto);
+    }
+
+    /**
+     * 我的文件夹编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody MyFolderDto myFolderDto) {
+        myFolderService.edit(myFolderDto);
+    }
+
+    /**
+     * 我的文件夹删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        myFolderService.delete(dto.getId());
+    }
+
+}

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

@@ -0,0 +1,47 @@
+package com.fjhx.mail.controller.my;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.mail.entity.my.dto.MyFolderMessageSelectDto;
+import com.fjhx.mail.entity.my.vo.MessageVo;
+import com.fjhx.mail.service.my.MyFolderMessageService;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * <p>
+ * 我的文件夹关联邮件 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2023-05-29
+ */
+@RestController
+@RequestMapping("/myFolderMessage")
+public class MyFolderMessageController {
+
+    @Autowired
+    private MyFolderMessageService myFolderMessageService;
+
+    /**
+     * 我的文件夹关联邮件分页
+     */
+    @PostMapping("/page")
+    public Page<MessageVo> page(@Validated @RequestBody MyFolderMessageSelectDto dto) {
+        return myFolderMessageService.getPage(dto);
+    }
+
+    /**
+     * 我的文件夹关联邮件删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        myFolderMessageService.delete(dto.getId());
+    }
+
+}

+ 17 - 0
hx-mail/src/main/java/com/fjhx/mail/entity/my/dto/MyFolderDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.mail.entity.my.dto;
+
+import com.fjhx.mail.entity.my.po.MyFolder;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 我的文件夹新增编辑入参实体
+ *
+ * @author 
+ * @since 2023-05-29
+ */
+@Getter
+@Setter
+public class MyFolderDto extends MyFolder {
+
+}

+ 17 - 0
hx-mail/src/main/java/com/fjhx/mail/entity/my/dto/MyFolderMessageDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.mail.entity.my.dto;
+
+import com.fjhx.mail.entity.my.po.MyFolderMessage;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 我的文件夹关联邮件新增编辑入参实体
+ *
+ * @author 
+ * @since 2023-05-29
+ */
+@Getter
+@Setter
+public class MyFolderMessageDto extends MyFolderMessage {
+
+}

+ 31 - 0
hx-mail/src/main/java/com/fjhx/mail/entity/my/dto/MyFolderMessageSelectDto.java

@@ -0,0 +1,31 @@
+package com.fjhx.mail.entity.my.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 我的文件夹关联邮件列表查询入参实体
+ *
+ * @author
+ * @since 2023-05-29
+ */
+@Getter
+@Setter
+public class MyFolderMessageSelectDto extends BaseSelectDto {
+
+    /**
+     * 我的文件夹id
+     */
+    @NotNull(message = "我的文件夹id不能为空")
+    private Long myFolderId;
+
+    /**
+     * 类型
+     */
+    @NotNull(message = "类型不能为空")
+    private Integer type;
+
+}

+ 25 - 0
hx-mail/src/main/java/com/fjhx/mail/entity/my/dto/MyFolderSelectDto.java

@@ -0,0 +1,25 @@
+package com.fjhx.mail.entity.my.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 我的文件夹列表查询入参实体
+ *
+ * @author
+ * @since 2023-05-29
+ */
+@Getter
+@Setter
+public class MyFolderSelectDto extends BaseSelectDto {
+
+    /**
+     * 邮箱id
+     */
+    @NotNull(message = "邮箱id不能为空")
+    private Long mailboxId;
+
+}

+ 47 - 0
hx-mail/src/main/java/com/fjhx/mail/entity/my/po/MyFolder.java

@@ -0,0 +1,47 @@
+package com.fjhx.mail.entity.my.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * <p>
+ * 我的文件夹
+ * </p>
+ *
+ * @author
+ * @since 2023-05-29
+ */
+@Getter
+@Setter
+@TableName("my_folder")
+public class MyFolder extends BasePo {
+
+    /**
+     * 类型 1个人邮箱 2企业邮箱
+     */
+    @NotNull(message = "类型不能为空")
+    private Integer type;
+
+    /**
+     * 邮箱id
+     */
+    @NotNull(message = "邮箱id不能为空")
+    private Long mailboxId;
+
+    /**
+     * 文件夹名称
+     */
+    @NotBlank(message = "文件夹id不能为空")
+    private String name;
+
+    /**
+     * 父id
+     */
+    private Long parentId;
+
+}

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

@@ -0,0 +1,32 @@
+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 lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 我的文件夹关联邮件
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-29
+ */
+@Getter
+@Setter
+@TableName("my_folder_message")
+public class MyFolderMessage extends BasePo {
+
+    /**
+     * 我的文件夹id
+     */
+    private Long myFolderId;
+
+    /**
+     * 邮件id
+     */
+    private Long messageId;
+
+}

+ 52 - 0
hx-mail/src/main/java/com/fjhx/mail/entity/my/vo/MessageVo.java

@@ -0,0 +1,52 @@
+package com.fjhx.mail.entity.my.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+@Getter
+@Setter
+public class MessageVo {
+
+    /**
+     * id
+     */
+    private Long id;
+
+    /**
+     * 邮件标题
+     */
+    private String subject;
+
+    /**
+     * 邮件标记
+     */
+    private String flags;
+
+    /**
+     * 发件人email
+     */
+    private String fromEmail;
+
+    /**
+     * 发件人名称
+     */
+    private String fromPersonalName;
+
+    /**
+     * 发件类型
+     */
+    private String fromType;
+
+    /**
+     * 发件时间
+     */
+    private Date sendDate;
+
+    /**
+     * 我的文件夹关联邮件id
+     */
+    private Long myFolderMessageId;
+
+}

+ 17 - 0
hx-mail/src/main/java/com/fjhx/mail/entity/my/vo/MyFolderMessageVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.mail.entity.my.vo;
+
+import com.fjhx.mail.entity.my.po.MyFolderMessage;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 我的文件夹关联邮件列表查询返回值实体
+ *
+ * @author 
+ * @since 2023-05-29
+ */
+@Getter
+@Setter
+public class MyFolderMessageVo extends MyFolderMessage {
+
+}

+ 17 - 0
hx-mail/src/main/java/com/fjhx/mail/entity/my/vo/MyFolderVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.mail.entity.my.vo;
+
+import com.fjhx.mail.entity.my.po.MyFolder;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 我的文件夹列表查询返回值实体
+ *
+ * @author 
+ * @since 2023-05-29
+ */
+@Getter
+@Setter
+public class MyFolderVo extends MyFolder {
+
+}

+ 21 - 0
hx-mail/src/main/java/com/fjhx/mail/mapper/my/MyFolderMapper.java

@@ -0,0 +1,21 @@
+package com.fjhx.mail.mapper.my;
+
+import com.fjhx.mail.entity.my.po.MyFolder;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.mail.entity.my.vo.MyFolderVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 我的文件夹 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-29
+ */
+public interface MyFolderMapper extends BaseMapper<MyFolder> {
+
+}

+ 28 - 0
hx-mail/src/main/java/com/fjhx/mail/mapper/my/MyFolderMessageMapper.java

@@ -0,0 +1,28 @@
+package com.fjhx.mail.mapper.my;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.mail.entity.my.po.MyFolderMessage;
+import com.fjhx.mail.entity.my.vo.MessageVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 我的文件夹关联邮件 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2023-05-29
+ */
+public interface MyFolderMessageMapper extends BaseMapper<MyFolderMessage> {
+
+    /**
+     * 我的文件夹关联邮件分页
+     */
+    Page<MessageVo> getPage(@Param("page") Page<Object> page,
+                            @Param("ew") IWrapper<MyFolderMessage> wrapper,
+                            @Param("type") Integer type);
+
+}

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

@@ -0,0 +1,30 @@
+package com.fjhx.mail.service.my;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.mail.entity.my.dto.MyFolderMessageSelectDto;
+import com.fjhx.mail.entity.my.po.MyFolderMessage;
+import com.fjhx.mail.entity.my.vo.MessageVo;
+import com.ruoyi.common.core.service.BaseService;
+
+
+/**
+ * <p>
+ * 我的文件夹关联邮件 服务类
+ * </p>
+ *
+ * @author
+ * @since 2023-05-29
+ */
+public interface MyFolderMessageService extends BaseService<MyFolderMessage> {
+
+    /**
+     * 我的文件夹关联邮件分页
+     */
+    Page<MessageVo> getPage(MyFolderMessageSelectDto dto);
+
+    /**
+     * 我的文件夹关联邮件删除
+     */
+    void delete(Long id);
+
+}

+ 48 - 0
hx-mail/src/main/java/com/fjhx/mail/service/my/MyFolderService.java

@@ -0,0 +1,48 @@
+package com.fjhx.mail.service.my;
+
+import com.alibaba.fastjson.JSONObject;
+import com.fjhx.mail.entity.my.po.MyFolder;
+import com.ruoyi.common.core.service.BaseService;
+import com.fjhx.mail.entity.my.vo.MyFolderVo;
+import com.fjhx.mail.entity.my.dto.MyFolderSelectDto;
+import com.fjhx.mail.entity.my.dto.MyFolderDto;
+
+import java.util.List;
+
+
+/**
+ * <p>
+ * 我的文件夹 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-29
+ */
+public interface MyFolderService extends BaseService<MyFolder> {
+
+    /**
+     * 树形
+     */
+    List<JSONObject> tree(MyFolderSelectDto dto);
+
+    /**
+     * 我的文件夹明细
+     */
+    MyFolderVo detail(Long id);
+
+    /**
+     * 我的文件夹新增
+     */
+    void add(MyFolderDto myFolderDto);
+
+    /**
+     * 我的文件夹编辑
+     */
+    void edit(MyFolderDto myFolderDto);
+
+    /**
+     * 我的文件夹删除
+     */
+    void delete(Long id);
+
+}

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

@@ -0,0 +1,38 @@
+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.MyFolderMessageSelectDto;
+import com.fjhx.mail.entity.my.po.MyFolderMessage;
+import com.fjhx.mail.entity.my.vo.MessageVo;
+import com.fjhx.mail.mapper.my.MyFolderMessageMapper;
+import com.fjhx.mail.service.my.MyFolderMessageService;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * <p>
+ * 我的文件夹关联邮件 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2023-05-29
+ */
+@Service
+public class MyFolderMessageServiceImpl extends ServiceImpl<MyFolderMessageMapper, MyFolderMessage> implements MyFolderMessageService {
+
+    @Override
+    public Page<MessageVo> getPage(MyFolderMessageSelectDto dto) {
+        IWrapper<MyFolderMessage> wrapper = getWrapper();
+        wrapper.eq("mfm", MyFolderMessage::getMyFolderId, dto.getMyFolderId());
+        wrapper.orderByDesc("mfm", MyFolderMessage::getId);
+        return this.baseMapper.getPage(dto.getPage(), wrapper, dto.getType());
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

+ 85 - 0
hx-mail/src/main/java/com/fjhx/mail/service/my/impl/MyFolderServiceImpl.java

@@ -0,0 +1,85 @@
+package com.fjhx.mail.service.my.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.mail.entity.my.dto.MyFolderDto;
+import com.fjhx.mail.entity.my.dto.MyFolderSelectDto;
+import com.fjhx.mail.entity.my.po.MyFolder;
+import com.fjhx.mail.entity.my.vo.MyFolderVo;
+import com.fjhx.mail.mapper.my.MyFolderMapper;
+import com.fjhx.mail.service.my.MyFolderService;
+import com.obs.services.internal.ServiceException;
+import com.ruoyi.common.core.domain.BaseIdPo;
+import com.ruoyi.common.utils.TreeUtil;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+/**
+ * <p>
+ * 我的文件夹 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2023-05-29
+ */
+@Service
+public class MyFolderServiceImpl extends ServiceImpl<MyFolderMapper, MyFolder> implements MyFolderService {
+
+    @Override
+    public List<JSONObject> tree(MyFolderSelectDto dto) {
+        List<MyFolder> list = list(q -> q.eq(MyFolder::getMailboxId, dto.getMailboxId()));
+        return TreeUtil.buildTree("name", list);
+    }
+
+    @Override
+    public MyFolderVo detail(Long id) {
+        MyFolder MyFolder = this.getById(id);
+        MyFolderVo result = BeanUtil.toBean(MyFolder, MyFolderVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(MyFolderDto myFolderDto) {
+        if (myFolderDto.getParentId() == null) {
+            myFolderDto.setParentId(0L);
+        }
+
+        MyFolder myFolder = getOne(q -> q
+                .eq(MyFolder::getParentId, myFolderDto.getParentId())
+                .eq(MyFolder::getName, myFolderDto.getName())
+        );
+        if (myFolder != null) {
+            throw new ServiceException("文件夹名称已存在");
+        }
+
+        this.save(myFolderDto);
+    }
+
+    @Override
+    public void edit(MyFolderDto myFolderDto) {
+        Long id = myFolderDto.getId();
+        if (id == null) {
+            throw new ServiceException("文件夹id不能为空");
+        }
+
+        MyFolder myFolder = getOne(q -> q
+                .eq(MyFolder::getParentId, myFolderDto.getParentId())
+                .eq(MyFolder::getName, myFolderDto.getName())
+                .ne(BaseIdPo::getId, myFolderDto.getId())
+        );
+        if (myFolder != null) {
+            throw new ServiceException("文件夹名称已存在");
+        }
+
+        this.updateById(myFolderDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

+ 5 - 0
hx-mail/src/main/resources/mapper/my/MyFolderMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fjhx.mail.mapper.my.MyFolderMapper">
+
+</mapper>

+ 26 - 0
hx-mail/src/main/resources/mapper/my/MyFolderMessageMapper.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fjhx.mail.mapper.my.MyFolderMessageMapper">
+
+    <select id="getPage" resultType="com.fjhx.mail.entity.my.vo.MessageVo">
+        select
+        m.id,
+        m.subject,
+        m.flags,
+        m.from_email,
+        m.from_personal_name,
+        m.from_type,
+        m.send_date,
+        mfm.id myFolderMessageId
+        from my_folder_message mfm
+        left join
+        <if test="type eq 1">
+            personal_message
+        </if>
+        <if test="type eq 2">
+            enterprise_message
+        </if>
+        m on m.id = mfm.message_id
+        ${ew.customSqlSegment}
+    </select>
+</mapper>