| 
						
						
							
								
							
						
						
					 | 
					 | 
					@ -24,7 +24,9 @@ import org.springblade.core.tool.utils.Func; | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					import org.springblade.core.tool.utils.ObjectUtil; | 
					 | 
					 | 
					 | 
					import org.springblade.core.tool.utils.ObjectUtil; | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					import org.springframework.stereotype.Component; | 
					 | 
					 | 
					 | 
					import org.springframework.stereotype.Component; | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					
 | 
					 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					import java.time.LocalDate; | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					import java.time.LocalDateTime; | 
					 | 
					 | 
					 | 
					import java.time.LocalDateTime; | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					import java.time.LocalTime; | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					import java.util.HashMap; | 
					 | 
					 | 
					 | 
					import java.util.HashMap; | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					import java.util.List; | 
					 | 
					 | 
					 | 
					import java.util.List; | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					import java.util.Map; | 
					 | 
					 | 
					 | 
					import java.util.Map; | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
					 | 
					@ -59,7 +61,7 @@ public class MessagePushSchedule { | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
								LambdaQueryWrapper<MessagePushRecordEntity> lqw = Wrappers.<MessagePushRecordEntity>lambdaQuery() | 
					 | 
					 | 
					 | 
								LambdaQueryWrapper<MessagePushRecordEntity> lqw = Wrappers.<MessagePushRecordEntity>lambdaQuery() | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
										.eq(MessagePushRecordEntity::getStatus, MessageConstants.NOT_PUSH) | 
					 | 
					 | 
					 | 
										.eq(MessagePushRecordEntity::getStatus, MessageConstants.NOT_PUSH) | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
										.eq(MessagePushRecordEntity::getTemplateId,template.getId()) | 
					 | 
					 | 
					 | 
										.eq(MessagePushRecordEntity::getTemplateId,template.getId()) | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
										.ge(MessagePushRecordEntity::getPlanTime, now) | 
					 | 
					 | 
					 | 
										.ge(MessagePushRecordEntity::getPlanTime, LocalDateTime.of(LocalDate.now(), LocalTime.MIN)) | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
										.le(MessagePushRecordEntity::getPlanTime, endTime); | 
					 | 
					 | 
					 | 
										.le(MessagePushRecordEntity::getPlanTime, endTime); | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
								List<MessagePushRecordEntity> list = recordService.list(lqw); | 
					 | 
					 | 
					 | 
								List<MessagePushRecordEntity> list = recordService.list(lqw); | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
								if(CollectionUtil.isEmpty(list) || list.size() == 0) { | 
					 | 
					 | 
					 | 
								if(CollectionUtil.isEmpty(list) || list.size() == 0) { | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					 | 
					
  |