|
@@ -44,6 +44,13 @@ public class UnmeasureTemperatureAlarmTask {
|
|
|
|
|
|
List<AlarmConfig> configList = alarmConfigService.list();
|
|
|
|
|
|
+ try {
|
|
|
+ //停100毫秒,以便后续时间比endTime大
|
|
|
+ Thread.sleep(100);
|
|
|
+ } catch (InterruptedException e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
+
|
|
|
DateTime now = DateTime.now();
|
|
|
|
|
|
String date = now.toString("yyyy-MM-dd");
|
|
@@ -58,15 +65,10 @@ public class UnmeasureTemperatureAlarmTask {
|
|
|
DateTime endTime = new DateTime(sdf.parse(date + " " + alarmConfig.getEndTime()));
|
|
|
|
|
|
if (weekdays.indexOf(String.valueOf(weekday)) != -1) {
|
|
|
- if (now.compareTo(endTime)>=0 && now.compareTo(endTime.plusMinutes(intervalMinute))<=0) {
|
|
|
- int minutes = Minutes.minutesBetween(endTime,now).getMinutes();
|
|
|
-
|
|
|
- if (minutes<intervalMinute){
|
|
|
+ if (now.compareTo(endTime)>0 && now.compareTo(endTime.plusMinutes(intervalMinute))<0) {
|
|
|
//todo 进行通知
|
|
|
notice(alarmConfig.getCompanyId(),startTime,endTime);
|
|
|
-
|
|
|
break;
|
|
|
- }
|
|
|
}
|
|
|
}
|
|
|
}
|