From 2f55cebbad3dea187a5f91d16ec80a9677dab699 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 13 十一月 2024 11:16:53 +0800
Subject: [PATCH] 1
---
src/main/java/com/yssh/service/EmailService.java | 69 ++++++++++++++++++++--------------
1 files changed, 41 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/yssh/service/EmailService.java b/src/main/java/com/yssh/service/EmailService.java
index 09a4457..2729437 100644
--- a/src/main/java/com/yssh/service/EmailService.java
+++ b/src/main/java/com/yssh/service/EmailService.java
@@ -15,12 +15,6 @@
import java.text.SimpleDateFormat;
import java.util.*;
-/**
- * 閭欢鏈嶅姟绫�
- *
- * @author www
- * @date 2024-03-21
- */
@Service
public class EmailService {
@Value("${email.userName}")
@@ -71,8 +65,13 @@
@Value("${email.enable}")
private Boolean enable;
+ @Value("${email.debug}")
+ private Boolean debug;
+
@Resource
private QxshMapper qxshMapper;
+
+ private static boolean isBusy = false;
private final static SimpleDateFormat YMDH = new SimpleDateFormat("yyyyMMddHH");
@@ -81,14 +80,13 @@
protected final Logger logger = LoggerFactory.getLogger(this.getClass());
public Session createSession() {
- // 鍒涘缓涓�涓厤缃枃浠讹紝骞朵繚瀛�
Properties props = new Properties();
- // SMTP鏈嶅姟鍣ㄨ繛鎺ヤ俊鎭細126鈥攕mtp.126.com锛�163鈥攕mtp.163.com锛宷q-smtp.qq.com"
- props.put("mail.smtp.host", smtpHost); // SMTP涓绘満鍚�
- props.put("mail.smtp.port", smtpPort); // 涓绘満绔彛鍙凤細126鈥�25锛�163鈥�645锛宷q-587
- props.put("mail.smtp.auth", smtpAuth); // 鏄惁闇�瑕佺敤鎴疯璇�
- props.put("mail.smtp.starttls.enale", smtpTls); // 鍚敤TlS鍔犲瘑
+ // 126鈥攕mtp.126.com锛�163鈥攕mtp.163.com锛宷q-smtp.qq.com"
+ props.put("mail.smtp.host", smtpHost);
+ props.put("mail.smtp.port", smtpPort);
+ props.put("mail.smtp.auth", smtpAuth);
+ props.put("mail.smtp.starttls.enale", smtpTls);
Session session = Session.getInstance(props, new Authenticator() {
@Override
@@ -97,8 +95,7 @@
}
});
- // 鎺у埗鍙版墦鍗拌皟璇曚俊鎭�
- session.setDebug(true);
+ session.setDebug(debug);
return session;
}
@@ -109,10 +106,8 @@
return null;
}
- // 鍒涘缓Session浼氳瘽
Session session = createSession();
- // 鍒涘缓閭欢瀵硅薄
MimeMessage message = new MimeMessage(session);
message.setSubject(title);
message.setText(text);
@@ -128,7 +123,6 @@
message.setRecipients(Message.RecipientType.CC, ias);
}
- // 鍙戦��
Transport.send(message);
return true;
@@ -138,9 +132,33 @@
}
}
- public int calcData() {
- List<String> list = new ArrayList<>();
+ public Integer calcData() {
+ try {
+ if (isBusy) {
+ return null;
+ }
+ isBusy = true;
+ List<String> list = new ArrayList<>();
+ calcCsvData(list);
+ calcDbData(list);
+
+ int size = list.size();
+ if (size > 0) {
+ String text = String.join("銆�", list.toArray(new String[list.size()])) + "锛岃繎" + hours + "灏忔椂鍐呭瓨鍦ㄦ暟鎹己澶便��";
+ send(title, text);
+ }
+ isBusy = false;
+
+ return size;
+ } catch (Exception ex) {
+ logger.error(ex.getMessage(), ex);
+ isBusy = false;
+ return null;
+ }
+ }
+
+ private void calcCsvData(List<String> list) {
String[] strs = names.split(",");
int count = countCsv(bigPath, hours);
if (0 == count) {
@@ -154,7 +172,9 @@
if (0 == count) {
list.add(strs[2]);
}
+ }
+ private void calcDbData(List<String> list) {
Calendar calendar = getCalendar(0);
Integer iEnd = Integer.parseInt(YMDH.format(calendar.getTime()));
String sEnd = Y_M_D_H.format(calendar.getTime());
@@ -162,7 +182,8 @@
Integer iStart = Integer.parseInt(YMDH.format(calendar.getTime()));
String sStart = Y_M_D_H.format(calendar.getTime());
- count = qxshMapper.countGcsjByTime(iStart, iEnd);
+ String[] strs = names.split(",");
+ int count = qxshMapper.countGcsjByTime(iStart, iEnd);
if (0 == count) {
list.add(strs[3]);
}
@@ -182,14 +203,6 @@
if (0 == count) {
list.add(strs[7]);
}
-
- int size = list.size();
- if (size > 0) {
- String text = String.join("銆�", list.toArray(new String[list.size()])) + "锛岃繎" + hours + "灏忔椂鍐呭瓨鍦ㄦ暟鎹己澶便��";
- send(title, text);
- }
-
- return size;
}
public int countCsv(String path, Integer hours) {
--
Gitblit v1.9.3