|
|
|
@ -16,10 +16,7 @@ import com.xxl.job.core.log.XxlJobLogger;
|
|
|
|
|
import lombok.AllArgsConstructor; |
|
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
|
import org.springblade.core.tool.api.R; |
|
|
|
|
import org.springblade.core.tool.utils.BeanUtil; |
|
|
|
|
import org.springblade.core.tool.utils.CollectionUtil; |
|
|
|
|
import org.springblade.core.tool.utils.DateUtil; |
|
|
|
|
import org.springblade.core.tool.utils.StringUtil; |
|
|
|
|
import org.springblade.core.tool.utils.*; |
|
|
|
|
import org.springblade.system.feign.ISysClient; |
|
|
|
|
import org.springblade.system.user.entity.User; |
|
|
|
|
import org.springblade.system.user.feign.IUserClient; |
|
|
|
@ -52,7 +49,7 @@ public class MaintenanceTaskRemindHandler {
|
|
|
|
|
if(CollectionUtil.isNotEmpty(taskEntitySet)) { |
|
|
|
|
taskEntitySet.forEach(operMaintenanceTaskEntity -> { |
|
|
|
|
OperMaintenanceTaskEntity taskEntity = taskService.getById(operMaintenanceTaskEntity.getId()); |
|
|
|
|
if(StringUtil.isBlank(taskEntity.getFlowTaskName())) { |
|
|
|
|
if(ObjectUtil.isNotEmpty(taskEntity) || StringUtil.isBlank(taskEntity.getFlowTaskName())) { |
|
|
|
|
redisTemplate.opsForZSet().remove(RedisKeyConstants.REMIND_TASK_END_LIST,operMaintenanceTaskEntity); |
|
|
|
|
} |
|
|
|
|
//如果任务仍在待执行则自动结束
|
|
|
|
|