代码提交（文件生成根据execId）

src/main/java/com/jz/dmp/cmdexectool/ApiApplication.java

@@ -31,11 +31,12 @@ public class ApiApplication implements HealthIndicator {
 		}
 		String jobId = args[1];
 		boolean isSingle = Boolean.parseBoolean(args[2]);
+		String execId = args[3];
 		
-		logger.info("启动参数，taskId【{}】，jobId【{}】，isSingle【{}】",taskId,jobId,isSingle);
+		logger.info("启动参数，taskId【{}】，jobId【{}】，isSingle【{}】, execId【{}】", taskId, jobId, isSingle, execId);
 		
 		ProcessService processService = ApplicationContextUtil.getBean(ProcessService.class);
-		processService.taskStart(taskId, jobId, isSingle);
+		processService.taskStart(taskId, jobId, isSingle, execId);
 
 		long cost = System.currentTimeMillis() - start;
 		logger.info(" started status: {}, cost: {}", "SUCCESS!", cost);

src/main/java/com/jz/dmp/cmdexectool/scheduler/common/task/sql/SqlParameters.java

@@ -356,9 +356,12 @@ public class SqlParameters extends AbstractParameters {
 		JSONObject hdfsObj = scriptObj.getJSONObject("hdfs");
 		String hdfsDir = hdfsObj.getString("hdfsDir");
 		
+		hdfsDir = hdfsDir+"/"+System.currentTimeMillis();
+		
 		Map<String, String> hdfsModel = new HashMap<String, String>();
 		hdfsModel.put("source_table_name", "t");
 		hdfsModel.put("path", hdfsDir);
+		hdfsModel.put("save_mode", "overwrite");
 		sink = FreeMarkerUtils.freemakerJson(CommConstant.WATERDROP_FTL_SINK_HDFS, hdfsModel, freeMarkerConfig);
 	}
 

src/main/java/com/jz/dmp/cmdexectool/scheduler/server/entity/TaskExecutionContext.java

@@ -230,6 +230,11 @@ public class TaskExecutionContext implements Serializable {
     
     private AbstractParameters parameters;
     
+    /**
+     * azkaban 执行id
+     */
+    private String execId;
+    
     public TaskExecutionContext() {}
     
     /**
@@ -594,6 +599,14 @@ public class TaskExecutionContext implements Serializable {
 		this.parameters = parameters;
 	}
 
+	public String getExecId() {
+		return execId;
+	}
+
+	public void setExecId(String execId) {
+		this.execId = execId;
+	}
+
 	@Override
     public String toString() {
         return "TaskExecutionContext{"

src/main/java/com/jz/dmp/cmdexectool/scheduler/server/worker/task/WaterdropCommandExecutor.java

@@ -60,9 +60,10 @@ public class WaterdropCommandExecutor extends AbstractCommandExecutor {
     @Override
     protected String buildCommandFilePath() {
         // command file
-        return String.format("%s/%s.%s"
+        return String.format("%s/%s_%s.%s"
                 , taskExecutionContext.getExecutePath()
                 , taskExecutionContext.getTaskAppId()
+                , taskExecutionContext.getExecId()
                 , OSUtils.isWindows() ? "bat" : "command");
     }
 

src/main/java/com/jz/dmp/cmdexectool/scheduler/server/worker/task/sql/SqlTask.java

@@ -187,8 +187,8 @@ public class SqlTask extends AbstractTask {
 		//String fileName = String.format("%s/%s_node.%s", taskExecutionContext.getExecutePath(),
 		//		taskExecutionContext.getTaskAppId(), OSUtils.isWindows() ? "bat" : "sh");
 		
-		String fileName = String.format("%s/%s.%s", taskExecutionContext.getExecutePath(),
-				"application", "conf");
+		String fileName = String.format("%s/%s_application_%s.%s", taskExecutionContext.getExecutePath(),
+				taskExecutionContext.getTaskAppId(), taskExecutionContext.getExecId(), "conf");
 
 		Path path = new File(fileName).toPath();
 

src/main/java/com/jz/dmp/cmdexectool/scheduler/service/process/ProcessService.java

@@ -80,9 +80,9 @@ public class ProcessService {
 	 * @Title: taskStart @Description: TODO(启动task) @param 参数 @return void
 	 *         返回类型 @throws
 	 */
-	public void taskStart(Integer taskId, String jobId, boolean isSingle) {
+	public void taskStart(Integer taskId, String jobId, boolean isSingle, String execId) {
 		try {
-			TaskExecutionContext taskExecutionContext = findTaskExecutionContextById(taskId, jobId, isSingle);
+			TaskExecutionContext taskExecutionContext = findTaskExecutionContextById(taskId, jobId, isSingle, execId);
 			AbstractTask task = TaskManager.newTask(taskExecutionContext);
 
 			// AbstractTask task = null;
@@ -118,7 +118,7 @@ public class ProcessService {
 	 *                   isSingle @param @return 参数 @return TaskExecutionContext
 	 *                   返回类型 @throws
 	 */
-	public TaskExecutionContext findTaskExecutionContextById(Integer taskId, String jobId, boolean isSingle)
+	public TaskExecutionContext findTaskExecutionContextById(Integer taskId, String jobId, boolean isSingle, String execId)
 			throws Exception {
 		TaskExecutionContext taskExecutionContext = new TaskExecutionContext();
 		// 获取任务数据，并获取job json，并组装TaskInstance
@@ -135,6 +135,8 @@ public class ProcessService {
 		}
 
 		taskExecutionContext = dto2execcontext(dmpDevelopTaskDto, jobId);
+		//设置azkaban执行ID
+		taskExecutionContext.setExecId(execId);
 
 		return taskExecutionContext;
 	}

src/test/java/com/jz/cmdexectool/test/task/shell/SQLCommandExecutorTest.java

@@ -92,7 +92,7 @@ public class SQLCommandExecutorTest {
     //@Test
     public void test() {
 		try {
-			TaskExecutionContext taskExecutionContext = processService.findTaskExecutionContextById(460,null,true);
+			TaskExecutionContext taskExecutionContext = processService.findTaskExecutionContextById(460,null,true, "2");
 			AbstractTask task = TaskManager.newTask(taskExecutionContext);
 
 	        logger.info("task info : {}", task);

src/test/java/com/jz/cmdexectool/test/task/shell/ShellCommandExecutorTest.java

@@ -74,7 +74,7 @@ public class ShellCommandExecutorTest {
     //@Test
     public void test() {
 		try {
-			TaskExecutionContext taskExecutionContext = processService.findTaskExecutionContextById(473,null,true);
+			TaskExecutionContext taskExecutionContext = processService.findTaskExecutionContextById(473,null,true, "1");
 			AbstractTask task = TaskManager.newTask(taskExecutionContext);
 
 	        //AbstractTask task = null;