| 
					
				 | 
			
			
				@@ -47,25 +47,26 @@ public class ThirdPartyServiceImpl implements ThirdPartyService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @Override 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public CommonResponse<List<PushMessageVo>> getPushMessage(PushMessageParam param) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (param == null || StringUtils.isEmpty(param.getGhId()) || StringUtils.isEmpty(param.getAccessToken())) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            return CommonResponse.create(ExceptionCodeEnum.PARAM_ERROR,"参数错误"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            return CommonResponse.create(ExceptionCodeEnum.PARAM_ERROR, "参数错误"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (!accessTokenService.validateAccessToken(param.getAccessToken())) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            return CommonResponse.create(ExceptionCodeEnum.PARAM_ERROR,"accessToken错误或者已失效"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            return CommonResponse.create(ExceptionCodeEnum.PARAM_ERROR, "accessToken错误或者已失效"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         List<PushMessageVo> pushMessageVoList = new ArrayList<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         ReplyBucketData replyBucketData = getPushMessageData(param); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        log.info("replyBucketData={}", replyBucketData); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (replyBucketData == null) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             log.error("获取推送策略数据失败"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            return CommonResponse.create(ExceptionCodeEnum.PARAM_ERROR,"系统异常,获取失败"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            return CommonResponse.create(ExceptionCodeEnum.PARAM_ERROR, "系统异常,获取失败"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         List<GroupData> groupList = replyBucketData.getGroupList(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         for (GroupData groupData : groupList) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            if(CollectionUtils.isEmpty(groupData.getMsgDataList())){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if (CollectionUtils.isEmpty(groupData.getMsgDataList())) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 continue; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             PushMessageVo pushMessageVo = new PushMessageVo(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             List<MiniData> components = new ArrayList<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            for (MsgData msgData : groupData.getMsgDataList()){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            for (MsgData msgData : groupData.getMsgDataList()) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 MiniData miniData = new MiniData(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 BeanUtils.copyProperties(miniData, msgData); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 components.add(miniData); 
			 |