src/main/java/com/moral/task/HistoryTableInsertTask.java | ●●●●● patch | view | raw | blame | history | |
src/main/java/com/moral/task/OffLineAlarmTask.java | ●●●●● patch | view | raw | blame | history |
src/main/java/com/moral/task/HistoryTableInsertTask.java
@@ -67,8 +67,10 @@ public ReturnT insertHistoryMinutelyTable(String params) { //正式环境使用 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:00"); Date endTimeDate = new Date(); Date startTimeDate = DateUtil.rollMinute(endTimeDate, -1); Date insertTimeDate = new Date(); Date startTimeDate = DateUtil.rollMinute(insertTimeDate, -2); Date endTimeDate = DateUtil.rollMinute(insertTimeDate, -1); StringBuilder insertTime = new StringBuilder(sdf.format(insertTimeDate)); StringBuilder endTime = new StringBuilder(sdf.format(endTimeDate)); StringBuilder startTime = new StringBuilder(sdf.format(startTimeDate)); String queryYearAndMonthDay = DateUtil.getYear(startTimeDate) + DateUtil.getMonth(startTimeDate) + DateUtil.getDay(startTimeDate); @@ -99,7 +101,7 @@ Map<String, Object> minutelyDataMap = new LinkedHashMap<>(); Map<String, Object> map = new HashMap<>(); minutelyDataMap.put("mac", deviceData.get("mac")); minutelyDataMap.put("time", endTime.toString()); minutelyDataMap.put("time", insertTime.toString()); for (String key : deviceData.keySet()) { if (!key.equals("mac") && !key.startsWith("M")) { List<Object> date = new ArrayList<>(); src/main/java/com/moral/task/OffLineAlarmTask.java
@@ -40,6 +40,9 @@ 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 dataToKunshanHTZ = Integer.parseInt(redisUtils.get("dataToKunshanHTZ").toString()); int provincialIndustrialPark = Integer.parseInt(redisUtils.get("provincialIndustrialPark").toString()); int QiandengPark = Integer.parseInt(redisUtils.get("QiandengPark").toString()); int nowTime = LengthOfTimeUtils.getSecondTimestampTwo(new Date()); List<String> programList = new ArrayList<>(); if (nowTime - dataToLianyunquGovernment > 1200){ @@ -63,6 +66,15 @@ if (nowTime - dataToBaiMeiDiKang > 300){ programList.add("dataToBaiMeiDiKang"); } if (nowTime - dataToKunshanHTZ > 300){ programList.add("dataToKunshanHTZ"); } if (nowTime - provincialIndustrialPark > 300){ programList.add("provincialIndustrialPark"); } if (nowTime - QiandengPark > 300){ programList.add("QiandengPark"); } if (!programList.isEmpty()){ AlarmUtils_2.sendMail("357328213@qq.com,1vv_zkk6ji3kln@dingtalk.com","程序掉线警报!",programList.toString()+"程序可能离线了!"); ReturnT returnT = new ReturnT(200, "执行成功!有邮件发送!");