个人邮箱

hx-mail/src/main/java/com/fjhx/mail/entity/personal/po/PersonalMailbox.java

@@ -1,17 +1,19 @@
 package com.fjhx.mail.entity.personal.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.NotBlank;
+import javax.validation.constraints.NotNull;
+
 /**
  * <p>
  * 个人邮箱
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-06
  */
 @Getter
@@ -22,16 +24,19 @@ public class PersonalMailbox extends BasePo {
     /**
      * mail账号
      */
+    @NotBlank(message = "邮箱地址不能为空")
     private String mailUser;
 
     /**
      * mail授权码
      */
+    @NotBlank(message = "授权码不能为空")
     private String mailPassword;
 
     /**
      * 类型：1国内 2国外
      */
+    @NotNull(message = "是否海外邮箱不能为空")
     private Integer type;
 
     /**
@@ -52,31 +57,37 @@ public class PersonalMailbox extends BasePo {
     /**
      * 收件host
      */
+    @NotBlank(message = "收件服务器地址不能为空")
     private String receiveHost;
 
     /**
      * 收件端口
      */
+    @NotNull(message = "收件端口不能为空")
     private Integer receivePort;
 
     /**
      * 收件协议
      */
+    @NotBlank(message = "收件协议不能为空")
     private String receiveProtocol;
 
     /**
      * 发件host
      */
+    @NotBlank(message = "发件服务器地址不能为空")
     private String sendHost;
 
     /**
      * 发件端口
      */
+    @NotNull(message = "发件端口不能为空")
     private Integer sendPort;
 
     /**
      * 发件协议
      */
+    @NotBlank(message = "发件协议不能为空")
     private String sendProtocol;
 
     /**

hx-mail/src/main/java/com/fjhx/mail/service/personal/impl/PersonalMailboxServiceImpl.java

@@ -1,16 +1,19 @@
 package com.fjhx.mail.service.personal.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.personal.dto.PersonalMailboxDto;
+import com.fjhx.mail.entity.personal.dto.PersonalMailboxSelectDto;
 import com.fjhx.mail.entity.personal.po.PersonalMailbox;
+import com.fjhx.mail.entity.personal.vo.PersonalMailboxVo;
 import com.fjhx.mail.mapper.personal.PersonalMailboxMapper;
 import com.fjhx.mail.service.personal.PersonalMailboxService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.mail.entity.personal.vo.PersonalMailboxVo;
-import com.fjhx.mail.entity.personal.dto.PersonalMailboxSelectDto;
+import com.ruoyi.common.constant.StatusConstant;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
-import com.fjhx.mail.entity.personal.dto.PersonalMailboxDto;
-import cn.hutool.core.bean.BeanUtil;
+import com.ruoyi.common.utils.wrapper.SqlField;
+import org.springframework.stereotype.Service;
 
 
 /**
@@ -27,6 +30,8 @@ public class PersonalMailboxServiceImpl extends ServiceImpl<PersonalMailboxMappe
     @Override
     public Page<PersonalMailboxVo> getPage(PersonalMailboxSelectDto dto) {
         IWrapper<PersonalMailbox> wrapper = getWrapper();
+        wrapper.eq("pm", PersonalMailbox::getUserId, SecurityUtils.getUserId());
+        wrapper.keyword(dto, new SqlField("pm", PersonalMailbox::getMailUser));
         wrapper.orderByDesc("pm", PersonalMailbox::getId);
         Page<PersonalMailboxVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         return page;
@@ -41,6 +46,11 @@ public class PersonalMailboxServiceImpl extends ServiceImpl<PersonalMailboxMappe
 
     @Override
     public void add(PersonalMailboxDto personalMailboxDto) {
+        personalMailboxDto.setStatus(StatusConstant.ENABLE);
+        personalMailboxDto.setSyncStatus(1);
+        personalMailboxDto.setDefaultStatus(0);
+        personalMailboxDto.setUserId(SecurityUtils.getUserId());
+
         this.save(personalMailboxDto);
     }