| 
						
						
							
								
							
						
						
					 | 
					@ -20,7 +20,6 @@ package com.epmet.service.evaluationindex.extract.todata.impl; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.commons.dynamic.datasource.annotation.DataSource; | 
					 | 
					 | 
					import com.epmet.commons.dynamic.datasource.annotation.DataSource; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; | 
					 | 
					 | 
					import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.commons.tools.constant.NumConstant; | 
					 | 
					 | 
					import com.epmet.commons.tools.constant.NumConstant; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.commons.tools.exception.RenException; | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.commons.tools.utils.ConvertUtils; | 
					 | 
					 | 
					import com.epmet.commons.tools.utils.ConvertUtils; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.commons.tools.utils.DateUtils; | 
					 | 
					 | 
					import com.epmet.commons.tools.utils.DateUtils; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.constant.DataSourceConstant; | 
					 | 
					 | 
					import com.epmet.constant.DataSourceConstant; | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
					@ -195,8 +194,8 @@ public class FactOriginTopicMainDailyServiceImpl extends BaseServiceImpl<FactOri | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            GridInfoDTO gridInfoDTO=gridMap.get(topicOriginInfoDTO.getGridId()); | 
					 | 
					 | 
					            GridInfoDTO gridInfoDTO=gridMap.get(topicOriginInfoDTO.getGridId()); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            if(null==gridInfoDTO){ | 
					 | 
					 | 
					            if(null==gridInfoDTO){ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                log.warn("没有找到 gridId="+topicOriginInfoDTO.getGridId()+" 的基本信息"); | 
					 | 
					 | 
					                log.warn("没有找到 gridId="+topicOriginInfoDTO.getGridId()+" 的基本信息"); | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					//                continue;
 | 
					 | 
					 | 
					                continue; | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					                throw new RenException("gridInfoDTO is null gridId="+topicOriginInfoDTO.getGridId()); | 
					 | 
					 | 
					                //throw new RenException("gridInfoDTO is null gridId="+topicOriginInfoDTO.getGridId());
 | 
				
			
			
				
				
			
		
	
		
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					            } | 
					 | 
					 | 
					            } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            // 一年的第几周
 | 
					 | 
					 | 
					            // 一年的第几周
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            String weekId = DateUtils.format(topicOriginInfoDTO.getOriginalBusinessTime(), DateUtils.DATE_PATTERN_YYYY).concat("W").concat(String.valueOf(DateUtils.getWeekOfYear(topicOriginInfoDTO.getOriginalBusinessTime()))); | 
					 | 
					 | 
					            String weekId = DateUtils.format(topicOriginInfoDTO.getOriginalBusinessTime(), DateUtils.DATE_PATTERN_YYYY).concat("W").concat(String.valueOf(DateUtils.getWeekOfYear(topicOriginInfoDTO.getOriginalBusinessTime()))); | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					
  |