fix: 邮箱配置正则表达式转换

service-base/src/main/java/com/simuwang/base/common/enums/EmailCron.java

@@ -9,18 +9,18 @@ import java.util.stream.Stream;
  * Description: ${DESCRIPTION}
  */
 public enum EmailCron {
-    EVERY_HOUR("1", "0 0 0/1 * * *"), ONE_AM("2", "0 0 1 * * *");
+    EVERY_HOUR(1, "0 0 0/1 * * *"), ONE_AM(2, "0 0 1 * * *");
 
-    private final String text;
+    private final Integer text;
     private final String cron;
 
-    EmailCron(String text, String cron)
+    EmailCron(Integer text, String cron)
     {
         this.text = text;
         this.cron = cron;
     }
 
-    public static EmailCron getEmailCronByText(String text) {
+    public static EmailCron getEmailCronByText(Integer text) {
         if (null == text){
             return null;
         }
@@ -36,7 +36,7 @@ public enum EmailCron {
         return Stream.of(EmailCron.values()).filter(e -> e.cron.equals(cron)).findFirst().orElse(null);
     }
 
-    public String getText()
+    public Integer getText()
     {
         return text;
     }

service-base/src/main/java/com/simuwang/base/pojo/dos/MailboxInfoDO.java

@@ -3,6 +3,7 @@ package com.simuwang.base.pojo.dos;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.simuwang.base.common.enums.EmailCron;
 import com.simuwang.base.pojo.vo.MailboxInfoTableVO;
 import com.simuwang.base.pojo.vo.MailboxInfoVO;
 import lombok.Data;
@@ -96,7 +97,7 @@ public class MailboxInfoDO {
 
     public MailboxInfoTableVO toTableVo() {
         MailboxInfoTableVO vo =new MailboxInfoTableVO();
-        vo.setCron(this.cron);
+        vo.setCron(EmailCron.getEmailCronByCron(this.cron).getText());
         vo.setId(this.id);
         vo.setEmail(this.email);
         vo.setDescription(this.description);
@@ -106,7 +107,7 @@ public class MailboxInfoDO {
 
     public MailboxInfoVO toVo() {
         MailboxInfoVO vo =new MailboxInfoVO();
-        vo.setCron(this.cron);
+        vo.setCron(EmailCron.getEmailCronByCron(this.cron).getText());
         vo.setId(this.id);
         vo.setEmail(this.email);
         vo.setDescription(this.description);

service-base/src/main/java/com/simuwang/base/pojo/vo/MailboxInfoTableVO.java

@@ -15,7 +15,7 @@ public class MailboxInfoTableVO {
     /**
      * cron表达式
      */
-    private String cron;
+    private Integer cron;
     /**
      * 是否开启，0-不开启，1-开启
      */

service-base/src/main/java/com/simuwang/base/pojo/vo/MailboxInfoVO.java

@@ -40,7 +40,7 @@ public class MailboxInfoVO {
     /**
      * cron表达式
      */
-    private String cron;
+    private Integer cron;
     /**
      * 是否开启，0-不开启，1-开启
      */

service-manage/src/main/java/com/simuwang/manage/service/impl/EmailConfigServiceImpl.java

@@ -46,9 +46,6 @@ public class EmailConfigServiceImpl implements EmailConfigService {
     public MybatisPage<MailboxInfoTableVO> searchEmailConfigList(EmailPageQuery emailPageQuery) {
         List<MailboxInfoDO> mailboxInfoOS = emailConfigMapper.searchEmailConfigList(emailPageQuery);
         List<MailboxInfoTableVO> mailboxInfoTableVOS = mailboxInfoOS.stream().map(MailboxInfoDO::toTableVo).collect(Collectors.toList());
-        for(MailboxInfoTableVO mailboxInfoTableVO : mailboxInfoTableVOS){  //cron表达式转文本描述
-            mailboxInfoTableVO.setCron(EmailCron.getEmailCronByCron(mailboxInfoTableVO.getCron()).getText());
-        }
         long total = emailConfigMapper.countEmailConfig(emailPageQuery);
         return MybatisPage.of(total,mailboxInfoTableVOS);
     }
@@ -113,7 +110,6 @@ public class EmailConfigServiceImpl implements EmailConfigService {
     public MailboxInfoVO searchEmailConfigById(Integer id) {
         MailboxInfoDO mailboxInfoDO = emailConfigMapper.searchEmailConfigById(id);
         MailboxInfoVO mailboxInfoVO = mailboxInfoDO.toVo();
-        mailboxInfoVO.setCron(EmailCron.getEmailCronByCron(mailboxInfoVO.getCron()).getText());
         return mailboxInfoVO;
     }