From a313d95f0a20f04603dd2222a84e1276ed01c15a Mon Sep 17 00:00:00 2001 From: shenzhouyu Date: Wed, 18 Jun 2025 08:57:06 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AD=A6=E7=81=AF=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/xujie/sys/common/utils/TaskUtils.java | 2 +- .../com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/xujie/sys/common/utils/TaskUtils.java b/src/main/java/com/xujie/sys/common/utils/TaskUtils.java index b90c9885..f6ba31c9 100644 --- a/src/main/java/com/xujie/sys/common/utils/TaskUtils.java +++ b/src/main/java/com/xujie/sys/common/utils/TaskUtils.java @@ -83,7 +83,7 @@ public class TaskUtils { //@Scheduled(cron = "${loraurl.sendThreeColourTime}") public void sendThreeColourLight(){eamService.sendThreeColourLight();}; - //@Scheduled(cron = "0/10 * * * * ?") + //@Scheduled(cron = "${loraurl.sendRedColourTime}") public void sendLoraRedLight(){eamService.sendLoraRedLight();} /** diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java index dc6c7f59..af7e84b2 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java @@ -3816,7 +3816,7 @@ public class EamServiceImpl implements EamService { @Override public void sendLoraRedLight() { //查询随身机类型的并能发送信息的消息 - List notifications = tpmMessageNotificationService.lambdaQuery().eq(TpmMessageNotification::getMesTypNo, "D").eq(TpmMessageNotification::getSendFlag, "Y").list(); + List notifications = tpmMessageNotificationService.lambdaQuery().eq(TpmMessageNotification::getMesTypNo, "D").eq(TpmMessageNotification::getSendFlag, "Y").isNotNull(TpmMessageNotification::getIp).list(); //根据ip区分多个lora Map> loranotifications = notifications.stream().collect(Collectors.groupingBy(TpmMessageNotification::getIp));