root
/
ifishTasks
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
易焱 2020-03-28 21:21:38 +08:00
parent 84b9222837 ea39e82549
commit c1f3af62ff
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/ifish7/tasks/job/impl/RemindJobImpl.java
View File

@ -91,7 +91,13 @@ public class RemindJobImpl implements RemindJob {
boolean update = tmpPushRemindService.update(tblTmpPushRemind, new UpdateWrapper<TblTmpPushRemind>() boolean update = tmpPushRemindService.update(tblTmpPushRemind, new UpdateWrapper<TblTmpPushRemind>()
.eq("device_id", tblTmpPushRemind.getDeviceId()) .eq("device_id", tblTmpPushRemind.getDeviceId())
.eq("user_id", tblTmpPushRemind.getUserId())); .eq("user_id", tblTmpPushRemind.getUserId()));
log.info("update : " + update);
Integer deviceId = tblTmpPushRemind.getDeviceId();
TblDevice device = deviceService.getById(deviceId);
device.setRemindDate(instant.atZone(zoneId).toLocalDate());
boolean update1 = deviceService.updateById(device);
log.info("update-device : " + update1);
log.info("update-tmpPushRemind : " + update);
} }
} }
@ -118,6 +124,7 @@ public class RemindJobImpl implements RemindJob {
deviceUsers.forEach(deviceUser -> { deviceUsers.forEach(deviceUser -> {
setPushList(pushList, deviceUser, pushContent); setPushList(pushList, deviceUser, pushContent);
}); });
Date date = nextRemindDate(Integer.parseInt(tblDeviceHeaterDetail.getHeaterCycle())); Date date = nextRemindDate(Integer.parseInt(tblDeviceHeaterDetail.getHeaterCycle()));
String nextRemindDate = IfishTaskUtil.format(date); String nextRemindDate = IfishTaskUtil.format(date);
//更新下次提醒时间 //更新下次提醒时间