From f060b03b65806b8ab1b869459942fa1f20641c9b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 12 Oct 2021 10:05:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/task/OffLineAlarmTask.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/moral/task/OffLineAlarmTask.java b/src/main/java/com/moral/task/OffLineAlarmTask.java
index 230deac..e73b5be 100644
--- a/src/main/java/com/moral/task/OffLineAlarmTask.java
+++ b/src/main/java/com/moral/task/OffLineAlarmTask.java
@@ -36,26 +36,38 @@
int dataToLianyunquGovernment = Integer.parseInt(redisUtils.get("dataToLianyunquGovernment").toString());
int dataToChangShu = Integer.parseInt(redisUtils.get("dataToChangShu").toString());
int dataToLongTeng = Integer.parseInt(redisUtils.get("dataToLongTeng").toString());
+ int dataToJinTanNewMaterials = Integer.parseInt(redisUtils.get("dataToJinTanNewMaterials").toString());
+ int dataToQianDeng = Integer.parseInt(redisUtils.get("dataToQianDeng").toString());
+ int dataToChangShuHuanSi = Integer.parseInt(redisUtils.get("dataToChangShuHuanSi").toString());
int nowTime = LengthOfTimeUtils.getSecondTimestampTwo(new Date());
List<String> programList = new ArrayList<>();
- if (nowTime - dataToLianyunquGovernment > 10){
+ if (nowTime - dataToLianyunquGovernment > 1200){
programList.add("dataToLianyunquGovernment");
}
- if (nowTime - dataToChangShu > 7){
+ if (nowTime - dataToChangShu > 7200){
programList.add("dataToChangShu");
}
- if (nowTime - dataToLongTeng > 6){
+ if (nowTime - dataToLongTeng > 600){
programList.add("dataToLongTeng");
}
+ if (nowTime - dataToJinTanNewMaterials > 300){
+ programList.add("dataToJinTanNewMaterials");
+ }
+ if (nowTime - dataToQianDeng > 300){
+ programList.add("dataToQianDeng");
+ }
+ if (nowTime - dataToChangShuHuanSi > 300){
+ programList.add("dataToChangShuHuanSi");
+ }
if (!programList.isEmpty()){
- AlarmUtils_2.sendMail("357328213@qq.com","���������������������",programList.toString()+"������������������������");
+ AlarmUtils_2.sendMail("357328213@qq.com,1vv_zkk6ji3kln@dingtalk.com","���������������������",programList.toString()+"������������������������");
ReturnT returnT = new ReturnT(200, "���������������������������������");
return returnT;
}
ReturnT returnT = new ReturnT(200, "������������������������������");
return returnT;
}catch (Exception e){
- XxlJobLogger.log("RabbitMQDailyException:" + e.getMessage());
+ XxlJobLogger.log("OffLineAlarmException:" + e.getMessage());
logger.error(e.getMessage());
e.printStackTrace();
}
--
Gitblit v1.8.0