浏览代码

fix: 公司邮箱备注长度超限问题修复,邮件解析时间区间为全部报错问题修复

chenjianhua 7 月之前
父节点
当前提交
6629c53f1e

+ 2 - 1
service-base/src/main/java/com/simuwang/base/pojo/dos/EmailParseInfoDO.java

@@ -3,6 +3,7 @@ package com.simuwang.base.pojo.dos;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.simuwang.base.common.util.DateUtils;
 import com.simuwang.base.pojo.vo.EmailParseInfoVO;
 import com.simuwang.base.pojo.vo.EmailParseInfoVO;
 import lombok.Data;
 import lombok.Data;
 
 
@@ -78,7 +79,7 @@ public class EmailParseInfoDO {
         vo.setEmailTitle(this.emailTitle);
         vo.setEmailTitle(this.emailTitle);
         vo.setEmailType(this.emailType);
         vo.setEmailType(this.emailType);
         vo.setParseStatus(this.parseStatus);
         vo.setParseStatus(this.parseStatus);
-        vo.setParseDate(this.parseDate);
+        vo.setParseDate(DateUtils.format(this.parseDate,DateUtils.YYYY_MM_DD_HH_MM_SS));
         vo.setId(this.id);
         vo.setId(this.id);
         return vo;
         return vo;
     }
     }

+ 1 - 1
service-base/src/main/java/com/simuwang/base/pojo/vo/EmailParseInfoVO.java

@@ -21,7 +21,7 @@ public class EmailParseInfoVO {
     /**
     /**
      * 解析日期
      * 解析日期
      */
      */
-    private Date parseDate;
+    private String parseDate;
     /**
     /**
      * 邮件主题
      * 邮件主题
      */
      */

+ 7 - 2
service-manage/src/main/java/com/simuwang/manage/service/impl/ParseEmailServiceImpl.java

@@ -3,6 +3,7 @@ package com.simuwang.manage.service.impl;
 import com.simuwang.base.common.enums.ParseStatus;
 import com.simuwang.base.common.enums.ParseStatus;
 import com.simuwang.base.common.support.MybatisPage;
 import com.simuwang.base.common.support.MybatisPage;
 import com.simuwang.base.common.util.DateUtils;
 import com.simuwang.base.common.util.DateUtils;
+import com.simuwang.base.common.util.StringUtil;
 import com.simuwang.base.mapper.EmailFileInfoMapper;
 import com.simuwang.base.mapper.EmailFileInfoMapper;
 import com.simuwang.base.mapper.EmailParseInfoMapper;
 import com.simuwang.base.mapper.EmailParseInfoMapper;
 import com.simuwang.base.mapper.EmailTypeRuleMapper;
 import com.simuwang.base.mapper.EmailTypeRuleMapper;
@@ -76,7 +77,10 @@ public class ParseEmailServiceImpl implements ParseEmailService {
 
 
     @Override
     @Override
     public MybatisPage<EmailParseInfoVO> searchEmailList(EmailParseQuery emailParseQuery){
     public MybatisPage<EmailParseInfoVO> searchEmailList(EmailParseQuery emailParseQuery){
-        if(!emailParseQuery.getTimeRange().equals(TimeRange.Custom)){
+        if(emailParseQuery.getTimeRange().equals(TimeRange.FromSetup)){
+            emailParseQuery.setEndDate(DateUtils.getAroundToday(1));
+        }
+        if(!emailParseQuery.getTimeRange().equals(TimeRange.Custom) && !emailParseQuery.getTimeRange().equals(TimeRange.FromSetup)){
             emailParseQuery.setEndDate(DateUtils.getAroundToday(1));
             emailParseQuery.setEndDate(DateUtils.getAroundToday(1));
             emailParseQuery.setStartDate( DateUtil.RangeTime(emailParseQuery.getTimeRange().getFloatDateSymbel(),DateUtil.getTodayDate()));
             emailParseQuery.setStartDate( DateUtil.RangeTime(emailParseQuery.getTimeRange().getFloatDateSymbel(),DateUtil.getTodayDate()));
         }else{
         }else{
@@ -84,7 +88,8 @@ public class ParseEmailServiceImpl implements ParseEmailService {
             emailParseQuery.setEndDate(DateUtil.getAroundDate(DateUtils.parse(emailParseQuery.getEndDate(),DateUtils.YYYY_MM_DD),1));
             emailParseQuery.setEndDate(DateUtil.getAroundDate(DateUtils.parse(emailParseQuery.getEndDate(),DateUtils.YYYY_MM_DD),1));
         }
         }
         List<EmailParseInfoDO> emailParseInfoDOList = emailParseInfoMapper.searchEmailList(emailParseQuery);
         List<EmailParseInfoDO> emailParseInfoDOList = emailParseInfoMapper.searchEmailList(emailParseQuery);
-        List<EmailParseInfoVO> emailParseInfoVOList = emailParseInfoDOList.stream().map(EmailParseInfoDO::toVO).collect(Collectors.toList());
+        List<EmailParseInfoVO> emailParseInfoVOList = emailParseInfoDOList.stream()
+                .map(EmailParseInfoDO::toVO).collect(Collectors.toList());
         for(EmailParseInfoVO vo : emailParseInfoVOList){
         for(EmailParseInfoVO vo : emailParseInfoVOList){
             List<EmailFileInfoDO> emailFileInfoList = emailFileInfoMapper.queryByEmailId(vo.getId());
             List<EmailFileInfoDO> emailFileInfoList = emailFileInfoMapper.queryByEmailId(vo.getId());
             List<EmailFileInfoVO> emailFileInfoVOList = emailFileInfoList.stream().map(EmailFileInfoDO::toVO).collect(Collectors.toList());
             List<EmailFileInfoVO> emailFileInfoVOList = emailFileInfoList.stream().map(EmailFileInfoDO::toVO).collect(Collectors.toList());