From 792c246dec18b8ed3febd894b26d7bf1cbd9eccc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=93=E7=84=B1?= Date: Thu, 13 Jun 2019 18:11:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E6=8E=A8=E9=80=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ifish7/tasks/job/impl/RemindJobImpl.java | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/ifish7/tasks/job/impl/RemindJobImpl.java b/src/main/java/com/ifish7/tasks/job/impl/RemindJobImpl.java index 157804d..68c0881 100644 --- a/src/main/java/com/ifish7/tasks/job/impl/RemindJobImpl.java +++ b/src/main/java/com/ifish7/tasks/job/impl/RemindJobImpl.java @@ -67,19 +67,23 @@ public class RemindJobImpl implements RemindJob { .eq(TblTmpPushRemind::getRemindDate, LocalDate.now())); final PushList pushList = new PushList(); list.forEach(tblTmpPushRemind -> { - //查询出设备对应的名称 - TblDeviceUser deviceUser = deviceUserService.getOne(new QueryWrapper().lambda() + List deviceUsers = deviceUserService.list(new QueryWrapper().lambda() .eq(TblDeviceUser::getDeviceId, tblTmpPushRemind.getDeviceId()) .eq(TblDeviceUser::getUserId, tblTmpPushRemind.getUserId())); - if (deviceUser != null) { - setPushList(pushList, deviceUser); - //更新换水提醒下次时间 - Date nextRemindDate = nextRemindDate(tblTmpPushRemind.getRemindCycle()); - Instant instant = nextRemindDate.toInstant(); - ZoneId zoneId = ZoneId.systemDefault(); - tblTmpPushRemind.setRemindDate(instant.atZone(zoneId).toLocalDate()); - tmpPushRemindService.saveOrUpdate(tblTmpPushRemind); + if (deviceUsers.size() > 0) { + //查询出设备对应的名称 + TblDeviceUser deviceUser = deviceUsers.get(0); + if (deviceUser != null) { + setPushList(pushList, deviceUser); + //更新换水提醒下次时间 + Date nextRemindDate = nextRemindDate(tblTmpPushRemind.getRemindCycle()); + Instant instant = nextRemindDate.toInstant(); + ZoneId zoneId = ZoneId.systemDefault(); + tblTmpPushRemind.setRemindDate(instant.atZone(zoneId).toLocalDate()); + tmpPushRemindService.saveOrUpdate(tblTmpPushRemind); + } } + }); log.info("RemindJobImpl - commDeviceChangeWater --> end"); }