| 
					
				 | 
			
			
				@@ -62,6 +62,7 @@ import java.util.Map; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import java.util.Objects; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import java.util.Optional; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import java.util.Random; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import java.util.concurrent.TimeUnit; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import java.util.function.Function; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import java.util.stream.Collectors; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import java.util.stream.IntStream; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -468,7 +469,7 @@ public class CustomerServiceBatchSendingServiceImpl extends ServiceImpl<Customer 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         // 推送消息给匹配用户 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         List<String> targetGroups = Arrays.stream(info.getTargetGroup().split(",")).collect(Collectors.toList()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        targetGroups.parallelStream().forEach(clientType -> { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        targetGroups.forEach(clientType -> { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             CustomerService.NotifyMessage receiveQuery = CustomerService.NotifyMessage.builder() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                     .clientType(ClientEnum.valueOf(clientType)) 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -547,7 +548,7 @@ public class CustomerServiceBatchSendingServiceImpl extends ServiceImpl<Customer 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        }, 30L, TimeUnit.MINUTES); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     /** 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -567,7 +568,8 @@ public class CustomerServiceBatchSendingServiceImpl extends ServiceImpl<Customer 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             try { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 // 线程休眠1分钟 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 Thread.sleep(1000 * 60); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                log.info("messageSendSleepCondition THREAD_SLEEP END"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                log.info("messageSendSleepCondition THREAD_SLEEP END, sleepCount={}, receiveSize={}, finalMessageNum={}, messageSendLimit={}", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    sleepCount, receiveSize, finalMessageNum, messageSendLimit); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } catch (InterruptedException e) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 log.error("messageSendSleepCondition THREAD_SLEEP EX id={}", info.getId(), e); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 |