From c9f5a0a5f631fec7d66ab263d381bd09107d45c6 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Mon, 29 Nov 2021 11:06:34 +0800
Subject: [PATCH] 龙腾特种钢数据发送到柏美迪康平台

---
 src/main/java/com/moral/task/OffLineAlarmTask.java |   36 +++++++++++++++++++++++++++---------
 1 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/moral/task/OffLineAlarmTask.java b/src/main/java/com/moral/task/OffLineAlarmTask.java
index 7064907..b4746a7 100644
--- a/src/main/java/com/moral/task/OffLineAlarmTask.java
+++ b/src/main/java/com/moral/task/OffLineAlarmTask.java
@@ -36,29 +36,47 @@
             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 dataToBaiMeiDiKang = Integer.parseInt(redisUtils.get("dataToBaiMeiDiKang").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 (nowTime - dataToBaiMeiDiKang > 300){
+                programList.add("dataToBaiMeiDiKang");
+            }
             if (!programList.isEmpty()){
-                AlarmUtils_2.sendMail("357328213@qq.com","���������������������",programList.toString()+"������������������������");
-                ReturnT returnT = new ReturnT(200, "���������������");
+                AlarmUtils_2.sendMail("357328213@qq.com,1vv_zkk6ji3kln@dingtalk.com","���������������������",programList.toString()+"������������������������");
+                ReturnT returnT = new ReturnT(200, "���������������������������������");
                 return returnT;
             }
-            ReturnT returnT = new ReturnT(200, "���������������");
+            ReturnT returnT = new ReturnT(200, "������������������������������");
             return returnT;
         }catch (Exception e){
-            ReturnT returnT = new ReturnT(500, "���������������");
-            return returnT;
+            XxlJobLogger.log("OffLineAlarmException:" + e.getMessage());
+            logger.error(e.getMessage());
+            e.printStackTrace();
         }
-
+        ReturnT returnT = new ReturnT(500, "���������������");
+        return returnT;
     }
 
 }

--
Gitblit v1.8.0