|
@@ -34,7 +34,7 @@ public class Task {
|
|
|
* 查询是否是节假日
|
|
|
*/
|
|
|
@Async
|
|
|
- @Scheduled(cron = "0 5 0 * * ? ")
|
|
|
+ @Scheduled(cron = "0 01 12 * * ? ")
|
|
|
public void thirdNucleicAcid() {
|
|
|
String data = DateUtils.getDate();
|
|
|
//判断当天天是否是法定节假日 0 上班 1周末 2节假日
|
|
@@ -61,7 +61,7 @@ public class Task {
|
|
|
String date = DateUtils.getDate();
|
|
|
Date dateEnd = DateUtils.parseDate(date + " " + clockBeginAm);
|
|
|
//活得差值的秒数
|
|
|
- long sec = DateUtils.timeDistanceSec(dateEnd, dateBegin);
|
|
|
+ long sec = DateUtils.getOffsetSeconds(dateBegin, dateEnd);
|
|
|
ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
|
|
|
Runnable task = () -> mqttService.publish(DETECTION_WORK_STAT, ONE);
|
|
|
scheduler.schedule(task, sec, TimeUnit.SECONDS);
|
|
@@ -72,7 +72,7 @@ public class Task {
|
|
|
String date = DateUtils.getDate();
|
|
|
Date dateEnd = DateUtils.parseDate(date + " " + clockEndAm);
|
|
|
//活得差值的秒数
|
|
|
- long sec = DateUtils.timeDistanceSec(dateEnd, dateBegin);
|
|
|
+ long sec = DateUtils.getOffsetSeconds(dateBegin, dateEnd);
|
|
|
ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
|
|
|
Runnable task = () -> mqttService.publish(DETECTION_WORK_STAT, ZERO);
|
|
|
scheduler.schedule(task, sec, TimeUnit.SECONDS);
|
|
@@ -83,7 +83,7 @@ public class Task {
|
|
|
String date = DateUtils.getDate();
|
|
|
Date dateEnd = DateUtils.parseDate(date + " " + clockBeginPm);
|
|
|
//活得差值的秒数
|
|
|
- long sec = DateUtils.timeDistanceSec(dateEnd, dateBegin);
|
|
|
+ long sec = DateUtils.getOffsetSeconds(dateBegin, dateEnd);
|
|
|
ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
|
|
|
Runnable task = () -> mqttService.publish(DETECTION_WORK_STAT, ONE);
|
|
|
scheduler.schedule(task, sec, TimeUnit.SECONDS);
|
|
@@ -94,7 +94,7 @@ public class Task {
|
|
|
String date = DateUtils.getDate();
|
|
|
Date dateEnd = DateUtils.parseDate(date + " " + clockEndPm);
|
|
|
//活得差值的秒数
|
|
|
- long sec = DateUtils.timeDistanceSec(dateEnd, dateBegin);
|
|
|
+ long sec = DateUtils.getOffsetSeconds(dateBegin, dateEnd);
|
|
|
ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
|
|
|
Runnable task = () -> mqttService.publish(DETECTION_WORK_STAT, ZERO);
|
|
|
scheduler.schedule(task, sec, TimeUnit.SECONDS);
|