|  | @ -11,20 +11,15 @@ import com.yihu.wlyy.figure.label.model.DataModel;
 | 
	
		
			
				|  |  | import com.yihu.wlyy.figure.label.model.SaveModel;
 | 
	
		
			
				|  |  | import com.yihu.wlyy.figure.label.service.JobService;
 | 
	
		
			
				|  |  | import com.yihu.wlyy.figure.label.storage.Store2ES;
 | 
	
		
			
				|  |  | import com.yihu.wlyy.figure.label.util.ConstantUtil;
 | 
	
		
			
				|  |  | import org.apache.commons.lang3.time.DateFormatUtils;
 | 
	
		
			
				|  |  | import org.quartz.*;
 | 
	
		
			
				|  |  | import org.slf4j.Logger;
 | 
	
		
			
				|  |  | import org.slf4j.LoggerFactory;
 | 
	
		
			
				|  |  | import org.springframework.beans.factory.annotation.Autowired;
 | 
	
		
			
				|  |  | import org.springframework.context.annotation.Scope;
 | 
	
		
			
				|  |  | import org.springframework.stereotype.Component;
 | 
	
		
			
				|  |  | import org.springframework.stereotype.Service;
 | 
	
		
			
				|  |  | import org.springframework.transaction.annotation.Transactional;
 | 
	
		
			
				|  |  | import org.springframework.util.StringUtils;
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  | import java.util.ArrayList;
 | 
	
		
			
				|  |  | import java.util.Date;
 | 
	
		
			
				|  |  | import java.util.List;
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  | /**
 | 
	
	
		
			
				|  | @ -96,14 +91,16 @@ public class Mysql2ESJob implements Job {
 | 
	
		
			
				|  |  |         this.source = String.valueOf(paramsMap.get("source"));
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |         this.flJobConfig = flJobConfigDao.findById(this.flJobConfigId);
 | 
	
		
			
				|  |  |         //this.sqlFiledValue = (String)paramsMap.get(this.flJobConfig.getSqlField().toString());
 | 
	
		
			
				|  |  |         this.sqlFiledValue = this.flJobConfig.getSqlFieldValue();
 | 
	
		
			
				|  |  |         this.sqlFiledCondition = paramsMap.getString("sqlFiledCondition");
 | 
	
		
			
				|  |  |         /*//this.sqlFiledValue = (String)paramsMap.get(this.flJobConfig.getSqlField().toString());
 | 
	
		
			
				|  |  |         this.sqlFiledValue = String.valueOf(paramsMap.get("sqlFiledValue"));
 | 
	
		
			
				|  |  |         this.sqlFiledCondition = paramsMap.getString("sqlFiledCondition");
 | 
	
		
			
				|  |  |         //没有传增量值,以数据库配置的默认值为查询条件
 | 
	
		
			
				|  |  |         if(StringUtils.isEmpty(this.sqlFiledValue)){
 | 
	
		
			
				|  |  |             this.sqlFiledValue = this.flJobConfig.getSqlFieldValue();
 | 
	
		
			
				|  |  |             this.sqlFiledCondition=">";
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |         }*/
 | 
	
		
			
				|  |  |         //1抽取数据
 | 
	
		
			
				|  |  |         String sql = this.flJobConfig.getSql();
 | 
	
		
			
				|  |  |         String sqlFiled = this.flJobConfig.getSqlField();
 | 
	
	
		
			
				|  | @ -208,5 +205,4 @@ public class Mysql2ESJob implements Job {
 | 
	
		
			
				|  |  |         return result.toString();
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  | }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  | }
 |