zelong.shao

task|task调整

...@@ -12,6 +12,7 @@ public enum EmailTypeEnum { ...@@ -12,6 +12,7 @@ public enum EmailTypeEnum {
12 PUSH_CON_FILE("emailType_01","Push Pre-Customs Clearance Files","推送预清关文件"), 12 PUSH_CON_FILE("emailType_01","Push Pre-Customs Clearance Files","推送预清关文件"),
13 NOTIFICATION_SENDER("emailType_02","Remind Sender","提醒发件人"), 13 NOTIFICATION_SENDER("emailType_02","Remind Sender","提醒发件人"),
14 SEND_FAILED_EMAIL("emailType_03", "Error Email Alert","错误邮件预警"), 14 SEND_FAILED_EMAIL("emailType_03", "Error Email Alert","错误邮件预警"),
15 + SEND_OB("ob", "ob","推送ob"),
15 16
16 ; 17 ;
17 18
......
...@@ -59,6 +59,14 @@ public class SendFailedEmailAlertServiceImpl extends BaseService implements ISen ...@@ -59,6 +59,14 @@ public class SendFailedEmailAlertServiceImpl extends BaseService implements ISen
59 */ 59 */
60 List<SendFailedEmailDto> sendFailedEmailDto = sendFailedEmailUtil.createSendFailedEmailDto(emails,obs,paramConfigMap); 60 List<SendFailedEmailDto> sendFailedEmailDto = sendFailedEmailUtil.createSendFailedEmailDto(emails,obs,paramConfigMap);
61 /** 61 /**
62 + * 无错误邮件不发送邮件
63 + */
64 + boolean dataFlag = sendFailedEmailDto.stream()
65 + .anyMatch(failedEmailDto -> failedEmailDto.getStatusCodeCount() != 0);
66 + if (!dataFlag) {
67 + return;
68 + }
69 + /**
62 * 构建邮件内容 70 * 构建邮件内容
63 */ 71 */
64 String emailBody = sendFailedEmailUtil.createEmailBody(sendFailedEmailDto,paramConfigMap); 72 String emailBody = sendFailedEmailUtil.createEmailBody(sendFailedEmailDto,paramConfigMap);
......
...@@ -228,7 +228,7 @@ public class SendFailedEmailUtil { ...@@ -228,7 +228,7 @@ public class SendFailedEmailUtil {
228 || propertiesConfig.getEnv().equalsIgnoreCase("test") 228 || propertiesConfig.getEnv().equalsIgnoreCase("test")
229 ) { 229 ) {
230 //ce接收人 230 //ce接收人
231 - mailConfigDto.setTo("zelong.shao@erry.com"); 231 + mailConfigDto.setTo("zelong.shao@erry.com,jialiang.song@erry.com");
232 mailConfigDto.setCcAccount(""); 232 mailConfigDto.setCcAccount("");
233 mailConfigDto.setReceiveAccount("zelong.shao@erry.com"); 233 mailConfigDto.setReceiveAccount("zelong.shao@erry.com");
234 //发件人 234 //发件人
......