From 8f781f3cb17187a7ee58f41632c25fbb2aa81cc7 Mon Sep 17 00:00:00 2001 From: linzhijie <19970921lzj> Date: 星期二, 16 三月 2021 19:57:24 +0800 Subject: [PATCH] 补充环境配置 --- src/main/java/com/ots/project/monitor/job/task/SenderTask.java | 39 +++++++++++++++++++++++++++++++-------- 1 files changed, 31 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/ots/project/monitor/job/task/SenderTask.java b/src/main/java/com/ots/project/monitor/job/task/SenderTask.java index 638e1ab..2f752c8 100644 --- a/src/main/java/com/ots/project/monitor/job/task/SenderTask.java +++ b/src/main/java/com/ots/project/monitor/job/task/SenderTask.java @@ -1,4 +1,5 @@ package com.ots.project.monitor.job.task; + import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; import com.ots.common.enums.SenderType; @@ -23,15 +24,21 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; + import java.util.Arrays; import java.util.Date; import java.util.List; import java.util.Objects; + import static com.ots.common.enums.SmsStatusEnum.*; +/** + * 閭欢鐭俊鍙戦�佷换鍔� + */ @Component("senderTask") @Slf4j public class SenderTask { + private static final String SMS_ZJCM = "SMS_ZJCM"; private static final String SMS_ZJCM_INTERNATIONAL = "SMS_ZJCM_INTERNATIONAL"; private static final String EMAIL_126 = "EMAIL_126"; @@ -45,26 +52,29 @@ EmailMessage emailMessage; @Autowired IEntTestSendtaskMailService entTestSendtaskMailService; + @Autowired private ConfigService configService; + public void senderTask(String type) { EntTestSendtask testSendtask = new EntTestSendtask(); testSendtask.setStatus(SendtaskStatus.Untreated.getStatus()); testSendtask.setType(type); List<EntTestSendtask> entTestSendtasks = entTestSendtaskService.selectEntTestSendtaskList(testSendtask); if (SenderType.email.getType().equals(type)) { - + //鍙戦�侀偖浠� entTestSendtasks.stream().forEach(p -> sendEmail(p)); - + //閭欢閫�淇℃儏鍐靛鐞� 寮傛 bounceStatusUpdate(); } if (SenderType.sms.getType().equals(type)) { - + //鍙戦�佺煭淇� entTestSendtasks.stream().forEach(p -> sendSms(p)); - + //鐭俊涓嬪彂鐘舵�佽窡杩� 寮傛 smsDeliveryStatus(); } } + private void mailBounceInformationStorage(List<BouncedUser> bouncedUserList) { try { bouncedUserList.stream().forEach(user -> { @@ -77,6 +87,7 @@ log.error("璁板綍閫�淇′俊鎭け璐ワ細{}", e.getMessage(), e); } } + private void bounceStatusUpdate() { String mailMode = configService.getKey("MailMode"); if (Objects.equals("RushMail", mailMode)) { @@ -123,8 +134,8 @@ } } else { EmailUtil eu = new EmailUtil(EmailMessageImpl.userName, EmailMessageImpl.password); - List<BouncedUser> bouncedUserList = eu.receiveMail(DefaultConfigurer.getIMAP(), "imap"); - + List<BouncedUser> bouncedUserList = eu.receiveMail(DefaultConfigurer.getIMAP(), "imap");// imap鏀朵俊 + //閭欢閫�淇℃暟鎹叆搴� mailBounceInformationStorage(bouncedUserList); bouncedUserList.stream().forEach(user -> { EntTestSendtask entTestSendtask = new EntTestSendtask(); @@ -142,11 +153,13 @@ }); } } + public static void main(String[] args) { String str = "12321231232131 nihaodfdfdl 鏀朵欢浜洪偖浠跺湴鍧�锛坙jhua@bydq.com.cn锛変笉瀛樺湪锛岄偖浠舵棤娉曢�佽揪銆� "; String substring = str.substring(str.indexOf("鏀朵欢浜洪偖浠跺湴鍧�锛�") + "鏀朵欢浜洪偖浠跺湴鍧�锛�".length(), str.indexOf("锛変笉瀛樺湪锛岄偖浠舵棤娉曢�佽揪")); System.out.println(substring); } + private void smsDeliveryStatus() { List<Statusbox> statusboxList = shortMessage.getReport(); if (Objects.isNull(statusboxList) || statusboxList.size() == 0) { @@ -168,7 +181,12 @@ } } } - + + /** + * 鍙戦偖浠� + * + * @param testSendtask + */ public void sendEmail(EntTestSendtask testSendtask) { if (Objects.equals(EMAIL_126, testSendtask.getPlatform())) { RushMailResult result = emailMessage.sendEmail(testSendtask.getAddressee(), testSendtask.getTitle(), testSendtask.getContent()); @@ -192,7 +210,12 @@ entTestMemberService.updateEntTestMember(entTestMember); entTestSendtaskService.updateEntTestSendtask(testSendtask); } - + + /** + * 鍙戠煭淇� + * + * @param testSendtask + */ public void sendSms(EntTestSendtask testSendtask) { if (Objects.equals(SMS_ZJCM, testSendtask.getPlatform())) { Returnsms returnsms = shortMessage.sendSms(Arrays.asList(testSendtask.getAddressee()), "銆怲AI娴嬭瘎銆�", testSendtask.getContent()); -- Gitblit v1.9.1