|
|
|
@ -49,14 +49,14 @@ public class MaintenanceTaskRemindHandler {
|
|
|
|
|
if(CollectionUtil.isNotEmpty(taskEntitySet)) { |
|
|
|
|
taskEntitySet.forEach(operMaintenanceTaskEntity -> { |
|
|
|
|
OperMaintenanceTaskEntity taskEntity = taskService.getById(operMaintenanceTaskEntity.getId()); |
|
|
|
|
if(ObjectUtil.isNotEmpty(taskEntity) || StringUtil.isBlank(taskEntity.getFlowTaskName())) { |
|
|
|
|
if(ObjectUtil.isEmpty(taskEntity) || StringUtil.isBlank(taskEntity.getFlowTaskName())) { |
|
|
|
|
redisTemplate.opsForZSet().remove(RedisKeyConstants.REMIND_TASK_END_LIST,operMaintenanceTaskEntity); |
|
|
|
|
} |
|
|
|
|
//如果任务仍在待执行则自动结束
|
|
|
|
|
else if(Lists.newArrayList("待领用","待执行").contains(taskEntity.getFlowTaskName())) { |
|
|
|
|
XxlJobLogger.log("开始执行id为{}的任务", Optional.ofNullable(operMaintenanceTaskEntity.getId()).orElse(0L)); |
|
|
|
|
//日常维护任务到期消息提醒,提醒对象:执行人、项目经理角色 取出
|
|
|
|
|
this.sendMessage(taskEntity); |
|
|
|
|
//this.sendMessage(taskEntity);
|
|
|
|
|
redisTemplate.opsForZSet().remove(RedisKeyConstants.MAINTENANCE_TASK_DELAY_LIST,operMaintenanceTaskEntity); |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|