邮件 我的标签

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

@@ -51,7 +51,7 @@ public class MyFolderController {
      * 我的文件夹新增
      */
     @PostMapping("/add")
-    public void add(@RequestBody MyFolderDto myFolderDto) {
+    public void add(@Validated @RequestBody MyFolderDto myFolderDto) {
         myFolderService.add(myFolderDto);
     }
 

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

@@ -41,7 +41,7 @@ public class MyFolderMessageController {
      * 我的文件夹关联邮件添加
      */
     @PostMapping("/add")
-    public void add(@RequestBody MyFolderMessageDto dto) {
+    public void add(@Validated @RequestBody MyFolderMessageDto dto) {
         myFolderMessageService.add(dto);
     }
 

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

@@ -0,0 +1,68 @@
+package com.fjhx.mail.controller.my;
+
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.mail.entity.my.vo.MyTagVo;
+import com.fjhx.mail.entity.my.dto.MyTagSelectDto;
+import com.fjhx.mail.entity.my.dto.MyTagDto;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.mail.service.my.MyTagService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * <p>
+ * 我的标签 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-29
+ */
+@RestController
+@RequestMapping("/myTag")
+public class MyTagController {
+
+    @Autowired
+    private MyTagService myTagService;
+
+    /**
+     * 我的标签分页
+     */
+    @PostMapping("/page")
+    public Page<MyTagVo> page(@RequestBody MyTagSelectDto dto) {
+        return myTagService.getPage(dto);
+    }
+
+    /**
+     * 我的标签明细
+     */
+    @PostMapping("/detail")
+    public MyTagVo detail(@RequestBody BaseSelectDto dto) {
+        return myTagService.detail(dto.getId());
+    }
+
+    /**
+     * 我的标签新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody MyTagDto myTagDto) {
+        myTagService.add(myTagDto);
+    }
+
+    /**
+     * 我的标签编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody MyTagDto myTagDto) {
+        myTagService.edit(myTagDto);
+    }
+
+    /**
+     * 我的标签删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        myTagService.delete(dto.getId());
+    }
+
+}

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

@@ -0,0 +1,56 @@
+package com.fjhx.mail.controller.my;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.mail.entity.my.dto.MyTagMessageDto;
+import com.fjhx.mail.entity.my.dto.MyTagMessageSelectDto;
+import com.fjhx.mail.entity.my.vo.MessageVo;
+import com.fjhx.mail.service.my.MyTagMessageService;
+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("/myTagMessage")
+public class MyTagMessageController {
+
+    @Autowired
+    private MyTagMessageService myTagMessageService;
+
+    /**
+     * 我的标签关联邮件分页
+     */
+    @PostMapping("/page")
+    public Page<MessageVo> page(@Validated @RequestBody MyTagMessageSelectDto dto) {
+        return myTagMessageService.getPage(dto);
+    }
+
+    /**
+     * 我的标签关联邮件新增
+     */
+    @PostMapping("/add")
+    public void add(@Validated @RequestBody MyTagMessageDto myTagMessageDto) {
+        myTagMessageService.add(myTagMessageDto);
+    }
+
+    /**
+     * 我的标签关联邮件删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        myTagMessageService.delete(dto.getId());
+    }
+
+}

hx-mail/src/main/java/com/fjhx/mail/entity/my/dto/MyTagDto.java

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

hx-mail/src/main/java/com/fjhx/mail/entity/my/dto/MyTagMessageDto.java

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

hx-mail/src/main/java/com/fjhx/mail/entity/my/dto/MyTagMessageSelectDto.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 MyTagMessageSelectDto extends BaseSelectDto {
+
+    /**
+     * 我的标签id
+     */
+    @NotNull(message = "我的标签id不能为空")
+    private Long myTagId;
+
+    /**
+     * 类型
+     */
+    @NotNull(message = "类型不能为空")
+    private Integer type;
+
+}

hx-mail/src/main/java/com/fjhx/mail/entity/my/dto/MyTagSelectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.mail.entity.my.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 我的标签列表查询入参实体
+ *
+ * @author 
+ * @since 2023-05-29
+ */
+@Getter
+@Setter
+public class MyTagSelectDto extends BaseSelectDto {
+
+}

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

@@ -0,0 +1,37 @@
+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_tag")
+public class MyTag extends BasePo {
+
+    /**
+     * 类型 1个人邮箱 2企业邮箱
+     */
+    private Integer type;
+
+    /**
+     * 邮箱id
+     */
+    private Long mailboxId;
+
+    /**
+     * 标签名称
+     */
+    private String name;
+
+}

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

@@ -0,0 +1,36 @@
+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;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * <p>
+ * 我的标签关联邮件
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-29
+ */
+@Getter
+@Setter
+@TableName("my_tag_message")
+public class MyTagMessage extends BasePo {
+
+    /**
+     * 我的标签id
+     */
+    @NotNull(message = "我的标签id不能为空")
+    private Long myTagId;
+
+    /**
+     * 邮件id
+     */
+    @NotNull(message = "邮件id不能为空")
+    private Long messageId;
+
+}

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

@@ -49,4 +49,9 @@ public class MessageVo {
      */
     private Long myFolderMessageId;
 
+    /**
+     * 我的标签关联邮件id
+     */
+    private Long myTagMessageId;
+
 }

hx-mail/src/main/java/com/fjhx/mail/entity/my/vo/MyTagMessageVo.java

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

hx-mail/src/main/java/com/fjhx/mail/entity/my/vo/MyTagVo.java

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

hx-mail/src/main/java/com/fjhx/mail/mapper/my/MyTagMapper.java

@@ -0,0 +1,26 @@
+package com.fjhx.mail.mapper.my;
+
+import com.fjhx.mail.entity.my.po.MyTag;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.mail.entity.my.vo.MyTagVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 我的标签 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-29
+ */
+public interface MyTagMapper extends BaseMapper<MyTag> {
+
+    /**
+     * 我的标签分页
+     */
+    Page<MyTagVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<MyTag> wrapper);
+
+}

hx-mail/src/main/java/com/fjhx/mail/mapper/my/MyTagMessageMapper.java

@@ -0,0 +1,25 @@
+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.MyTagMessage;
+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 MyTagMessageMapper extends BaseMapper<MyTagMessage> {
+
+    Page<MessageVo> getPage(@Param("page") Page<Object> page,
+                            @Param("ew") IWrapper<MyTagMessage> wrapper,
+                            @Param("type") Integer type);
+
+}

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

@@ -0,0 +1,36 @@
+package com.fjhx.mail.service.my;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.mail.entity.my.dto.MyTagMessageDto;
+import com.fjhx.mail.entity.my.dto.MyTagMessageSelectDto;
+import com.fjhx.mail.entity.my.po.MyTagMessage;
+import com.fjhx.mail.entity.my.vo.MessageVo;
+import com.ruoyi.common.core.service.BaseService;
+
+
+/**
+ * <p>
+ * 我的标签关联邮件 服务类
+ * </p>
+ *
+ * @author
+ * @since 2023-05-29
+ */
+public interface MyTagMessageService extends BaseService<MyTagMessage> {
+
+    /**
+     * 我的标签关联邮件分页
+     */
+    Page<MessageVo> getPage(MyTagMessageSelectDto dto);
+
+    /**
+     * 我的标签关联邮件新增
+     */
+    void add(MyTagMessageDto myTagMessageDto);
+
+    /**
+     * 我的标签关联邮件删除
+     */
+    void delete(Long id);
+
+}

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

@@ -0,0 +1,46 @@
+package com.fjhx.mail.service.my;
+
+import com.fjhx.mail.entity.my.po.MyTag;
+import com.ruoyi.common.core.service.BaseService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.mail.entity.my.vo.MyTagVo;
+import com.fjhx.mail.entity.my.dto.MyTagSelectDto;
+import com.fjhx.mail.entity.my.dto.MyTagDto;
+
+
+/**
+ * <p>
+ * 我的标签 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-29
+ */
+public interface MyTagService extends BaseService<MyTag> {
+
+    /**
+     * 我的标签分页
+     */
+    Page<MyTagVo> getPage(MyTagSelectDto dto);
+
+    /**
+     * 我的标签明细
+     */
+    MyTagVo detail(Long id);
+
+    /**
+     * 我的标签新增
+     */
+    void add(MyTagDto myTagDto);
+
+    /**
+     * 我的标签编辑
+     */
+    void edit(MyTagDto myTagDto);
+
+    /**
+     * 我的标签删除
+     */
+    void delete(Long id);
+
+}

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

@@ -48,6 +48,7 @@ public class MyFolderServiceImpl extends ServiceImpl<MyFolderMapper, MyFolder> i
         }
 
         MyFolder myFolder = getOne(q -> q
+                .eq(MyFolder::getMailboxId, myFolderDto.getMailboxId())
                 .eq(MyFolder::getParentId, myFolderDto.getParentId())
                 .eq(MyFolder::getName, myFolderDto.getName())
         );

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

@@ -0,0 +1,54 @@
+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.MyTagMessageDto;
+import com.fjhx.mail.entity.my.dto.MyTagMessageSelectDto;
+import com.fjhx.mail.entity.my.po.MyTagMessage;
+import com.fjhx.mail.entity.my.vo.MessageVo;
+import com.fjhx.mail.mapper.my.MyTagMessageMapper;
+import com.fjhx.mail.service.my.MyTagMessageService;
+import com.obs.services.internal.ServiceException;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * <p>
+ * 我的标签关联邮件 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2023-05-29
+ */
+@Service
+public class MyTagMessageServiceImpl extends ServiceImpl<MyTagMessageMapper, MyTagMessage> implements MyTagMessageService {
+
+    @Override
+    public Page<MessageVo> getPage(MyTagMessageSelectDto dto) {
+        IWrapper<MyTagMessage> wrapper = getWrapper();
+        wrapper.eq("mtm", MyTagMessage::getMyTagId, dto.getMyTagId());
+        wrapper.orderByDesc("mtm", MyTagMessage::getUpdateTime);
+        return this.baseMapper.getPage(dto.getPage(), wrapper, dto.getType());
+    }
+
+    @Override
+    public void add(MyTagMessageDto myTagMessageDto) {
+
+        MyTagMessage myTagMessage = getOne(q -> q
+                .eq(MyTagMessage::getMessageId, myTagMessageDto.getMessageId())
+                .eq(MyTagMessage::getMyTagId, myTagMessageDto.getMyTagId())
+        );
+        if (myTagMessage != null) {
+            throw new ServiceException("标签已被添加");
+        }
+
+        this.save(myTagMessageDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

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

@@ -0,0 +1,77 @@
+package com.fjhx.mail.service.my.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.mail.entity.my.dto.MyTagDto;
+import com.fjhx.mail.entity.my.dto.MyTagSelectDto;
+import com.fjhx.mail.entity.my.po.MyTag;
+import com.fjhx.mail.entity.my.vo.MyTagVo;
+import com.fjhx.mail.mapper.my.MyTagMapper;
+import com.fjhx.mail.service.my.MyTagService;
+import com.obs.services.internal.ServiceException;
+import com.ruoyi.common.core.domain.BaseIdPo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * <p>
+ * 我的标签 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2023-05-29
+ */
+@Service
+public class MyTagServiceImpl extends ServiceImpl<MyTagMapper, MyTag> implements MyTagService {
+
+    @Override
+    public Page<MyTagVo> getPage(MyTagSelectDto dto) {
+        IWrapper<MyTag> wrapper = getWrapper();
+        wrapper.orderByDesc("mt", MyTag::getId);
+        Page<MyTagVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public MyTagVo detail(Long id) {
+        MyTag MyTag = this.getById(id);
+        MyTagVo result = BeanUtil.toBean(MyTag, MyTagVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(MyTagDto myTagDto) {
+
+        MyTag myTag = getOne(q -> q
+                .eq(MyTag::getMailboxId, myTagDto.getMailboxId())
+                .eq(MyTag::getName, myTagDto.getName())
+        );
+        if (myTag != null) {
+            throw new ServiceException("标签名称已存在");
+        }
+
+        this.save(myTagDto);
+    }
+
+    @Override
+    public void edit(MyTagDto myTagDto) {
+        MyTag myTag = getOne(q -> q
+                .ne(BaseIdPo::getId, myTagDto.getId())
+                .eq(MyTag::getMailboxId, myTagDto.getMailboxId())
+                .eq(MyTag::getName, myTagDto.getName())
+        );
+        if (myTag != null) {
+            throw new ServiceException("标签名称已存在");
+        }
+
+        this.updateById(myTagDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

hx-mail/src/main/resources/mapper/my/MyTagMapper.xml

@@ -0,0 +1,18 @@
+<?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.MyTagMapper">
+    <select id="getPage" resultType="com.fjhx.mail.entity.my.vo.MyTagVo">
+        select
+            mt.id,
+            mt.type,
+            mt.mailbox_id,
+            mt.name,
+            mt.create_user,
+            mt.create_time,
+            mt.update_user,
+            mt.update_time
+        from my_tag mt
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

hx-mail/src/main/resources/mapper/my/MyTagMessageMapper.xml

@@ -0,0 +1,25 @@
+<?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.MyTagMessageMapper">
+    <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,
+        mtm.id myTagMessageId
+        from my_tag_message mtm
+        left join
+        <if test="type eq 1">
+            personal_message
+        </if>
+        <if test="type eq 2">
+            enterprise_message
+        </if>
+        m on m.id = mtm.message_id
+        ${ew.customSqlSegment}
+    </select>
+</mapper>