Browse Source

feat: 增加邮件类型,月度,年度,季度,分红公告,基金合同,变更公告

chenjianhua 4 months ago
parent
commit
95dcede71a

+ 14 - 9
service-daq/src/main/java/com/simuwang/daq/service/EmailParseService.java

@@ -946,16 +946,21 @@ public class EmailParseService {
     public Map<Integer, List<String>> getEmailType() {
         Map<Integer, List<String>> emailTypeMap = MapUtil.newHashMap(3, true);
         EmailTypeRuleDO emailTypeRuleDO = emailTypeRuleMapper.getEmailTypeRule();
-        String nav = emailTypeRuleDO != null && StrUtil.isNotBlank(emailTypeRuleDO.getNav()) ? emailTypeRuleDO.getNav() : emailRuleConfig.getNav();
-        String valuation = emailTypeRuleDO != null && StrUtil.isNotBlank(emailTypeRuleDO.getValuation()) ? emailTypeRuleDO.getValuation() : emailRuleConfig.getValuation();
-        String report = emailTypeRuleDO != null && StrUtil.isNotBlank(emailTypeRuleDO.getReport()) ? emailTypeRuleDO.getReport() : emailRuleConfig.getReport();
+        String nav = emailTypeRuleDO != null && StrUtil.isNotBlank(emailTypeRuleDO.getNav()) ? emailTypeRuleDO.getNav() : "";
+        String valuation = emailTypeRuleDO != null && StrUtil.isNotBlank(emailTypeRuleDO.getValuation()) ? emailTypeRuleDO.getValuation() : "";
+        String monthReport = emailTypeRuleDO != null && StrUtil.isNotBlank(emailTypeRuleDO.getMonthReport()) ? emailTypeRuleDO.getMonthReport() : "";
+        String quarterReport = emailTypeRuleDO != null && StrUtil.isNotBlank(emailTypeRuleDO.getQuarterReport()) ? emailTypeRuleDO.getQuarterReport() : "";
+        String yearReport = emailTypeRuleDO != null && StrUtil.isNotBlank(emailTypeRuleDO.getYearReport()) ? emailTypeRuleDO.getYearReport() : "";
+        String changeReport = emailTypeRuleDO != null && StrUtil.isNotBlank(emailTypeRuleDO.getChangeReport()) ? emailTypeRuleDO.getChangeReport() : "";
+        String distribution = emailTypeRuleDO != null && StrUtil.isNotBlank(emailTypeRuleDO.getDistribution()) ? emailTypeRuleDO.getDistribution() : "";
+        String contract = emailTypeRuleDO != null && StrUtil.isNotBlank(emailTypeRuleDO.getContract()) ? emailTypeRuleDO.getContract() : "";
         emailTypeMap.put(EmailTypeConst.VALUATION_EMAIL_TYPE, Arrays.stream(valuation.split(",")).toList());
-        emailTypeMap.put(EmailTypeConst.MONTH_REPORT_EMAIL_TYPE, Arrays.stream(report.split(",")).toList());
-        emailTypeMap.put(EmailTypeConst.QUARTER_REPORT_EMAIL_TYPE, Arrays.stream(report.split(",")).toList());
-        emailTypeMap.put(EmailTypeConst.YEAR_REPORT_EMAIL_TYPE, Arrays.stream(report.split(",")).toList());
-        emailTypeMap.put(EmailTypeConst.CONTRACT_EMAIL_TYPE, Arrays.stream(report.split(",")).toList());
-        emailTypeMap.put(EmailTypeConst.DISTRIBUTION_EMAIL_TYPE, Arrays.stream(report.split(",")).toList());
-        emailTypeMap.put(EmailTypeConst.CHANGE_EMAIL_TYPE, Arrays.stream(report.split(",")).toList());
+        emailTypeMap.put(EmailTypeConst.MONTH_REPORT_EMAIL_TYPE, Arrays.stream(monthReport.split(",")).toList());
+        emailTypeMap.put(EmailTypeConst.QUARTER_REPORT_EMAIL_TYPE, Arrays.stream(quarterReport.split(",")).toList());
+        emailTypeMap.put(EmailTypeConst.YEAR_REPORT_EMAIL_TYPE, Arrays.stream(yearReport.split(",")).toList());
+        emailTypeMap.put(EmailTypeConst.CONTRACT_EMAIL_TYPE, Arrays.stream(contract.split(",")).toList());
+        emailTypeMap.put(EmailTypeConst.DISTRIBUTION_EMAIL_TYPE, Arrays.stream(distribution.split(",")).toList());
+        emailTypeMap.put(EmailTypeConst.CHANGE_EMAIL_TYPE, Arrays.stream(changeReport.split(",")).toList());
         emailTypeMap.put(EmailTypeConst.NAV_EMAIL_TYPE, Arrays.stream(nav.split(",")).toList());
         return emailTypeMap;
     }