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"); }