From 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd Mon Sep 17 00:00:00 2001
From: linzhijie <19970921lzj>
Date: 星期一, 12 四月 2021 15:44:53 +0800
Subject: [PATCH] Merge branch '20210406-maqv2' into 20210412-youhua

---
 src/main/java/com/ots/project/monitor/job/task/SenderTask.java |   39 ++++++++-------------------------------
 1 files changed, 8 insertions(+), 31 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 2f752c8..638e1ab 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,5 +1,4 @@
 package com.ots.project.monitor.job.task;
-
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.ots.common.enums.SenderType;
@@ -24,21 +23,15 @@
 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";
@@ -52,29 +45,26 @@
     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 -> {
@@ -87,7 +77,6 @@
             log.error("璁板綍閫�淇′俊鎭け璐ワ細{}", e.getMessage(), e);
         }
     }
-
     private void bounceStatusUpdate() {
         String mailMode = configService.getKey("MailMode");
         if (Objects.equals("RushMail", mailMode)) {
@@ -134,8 +123,8 @@
             }
         } else {
             EmailUtil eu = new EmailUtil(EmailMessageImpl.userName, EmailMessageImpl.password);
-            List<BouncedUser> bouncedUserList = eu.receiveMail(DefaultConfigurer.getIMAP(), "imap");// imap鏀朵俊
-            //閭欢閫�淇℃暟鎹叆搴�
+            List<BouncedUser> bouncedUserList = eu.receiveMail(DefaultConfigurer.getIMAP(), "imap");
+            
             mailBounceInformationStorage(bouncedUserList);
             bouncedUserList.stream().forEach(user -> {
                 EntTestSendtask entTestSendtask = new EntTestSendtask();
@@ -153,13 +142,11 @@
             });
         }
     }
-
     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) {
@@ -181,12 +168,7 @@
             }
         }
     }
-
-    /**
-     * 鍙戦偖浠�
-     *
-     * @param testSendtask
-     */
+    
     public void sendEmail(EntTestSendtask testSendtask) {
         if (Objects.equals(EMAIL_126, testSendtask.getPlatform())) {
             RushMailResult result = emailMessage.sendEmail(testSendtask.getAddressee(), testSendtask.getTitle(), testSendtask.getContent());
@@ -210,12 +192,7 @@
         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