Merge branch 'dmp_dev' of http://gitlab.ioubuy.cn/yaobenzhang/jz-dmp-service into dmp_dev

src/main/java/com/jz/common/utils/FlowParseTool.java

@@ -518,7 +518,7 @@ public class FlowParseTool {
     * @throws  
     */ 
     public static String generateExecutorToolCommand(Integer taskId, String jobId, boolean isSingle) {
-    	String command = "command= java -jar /app/bigdata-app/dmp_cmdexecutortool/jz-dmp-cmdexectool.jar "+taskId+" "+jobId+" "+isSingle;
+    	String command = "command= java -jar /app/bigdata-app/dmp_cmdexecutortool/jz-dmp-cmdexectool.jar "+taskId+" "+jobId+" "+isSingle+" ${azkaban.flow.execid}";
         return command;
 	}
     

src/main/java/com/jz/dmp/modules/controller/bean/DmpDevelopTaskDto.java

@@ -2,6 +2,7 @@ package com.jz.dmp.modules.controller.bean;
 
 import com.jz.dmp.modules.model.DmpDevelopTask;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 
 /**任务开发Dto
  * @author ybz
@@ -9,5 +10,5 @@ import io.swagger.annotations.ApiModel;
  */
 @ApiModel(value = "任务开发Dto", description = "任务开发Dto")
 public class DmpDevelopTaskDto extends DmpDevelopTask {
-
+	
 }

src/main/java/com/jz/dmp/modules/model/DmpDevelopTask.java

@@ -180,7 +180,12 @@ public class DmpDevelopTask implements Serializable {
     //辅助字段
     @ApiModelProperty(value = "任务名称")
 	private String name;
-
+    
+    /**
+     * createUserName
+     */
+    @ApiModelProperty(value = "createUserName")
+	private String createUserName;
 
     public Integer getId() {
         return id;
@@ -438,6 +443,14 @@ public class DmpDevelopTask implements Serializable {
 		this.name = name;
 	}
 	
+	public String getCreateUserName() {
+		return createUserName;
+	}
+
+	public void setCreateUserName(String createUserName) {
+		this.createUserName = createUserName;
+	}
+	
 	/**  
 	* @Title: getAzkabanName  
 	* @Description: TODO(拼接azkaban用名称)  

src/main/java/com/jz/dmp/modules/service/impl/DmpDevelopTaskServiceImpl.java

@@ -1479,7 +1479,7 @@ public class DmpDevelopTaskServiceImpl extends BaseService implements DmpDevelop
     private Integer publishAndExecute(DmpDevelopTask dmpDevelopTask) throws Exception {
         Integer taskId = dmpDevelopTask.getId(); //任务id
         Integer projectId = dmpDevelopTask.getProjectId(); //项目id
-        String treeName = dmpDevelopTask.getName(); //任务流程名称
+        String azkabanName = dmpDevelopTask.getAzkabanName(); //任务流程名称
 
         //获取项目配置信息
         Map<String, Object> param = new HashMap<String, Object>();
@@ -1509,7 +1509,7 @@ public class DmpDevelopTaskServiceImpl extends BaseService implements DmpDevelop
         String azkabanLocalTaskFilePath = dmpProjectConfigInfoDto.getDmpPublicConfigInfoDto().getAzkabanLocalTaskFilePath(); //文件路径
         String azkabanMonitorUrl = dmpProjectConfigInfoDto.getDmpPublicConfigInfoDto().getAzkabanMonitorUrl();//AZKABAN WEB服务地址
 
-        String azkabanJobCommand = FlowParseTool.generateExecutorToolCommand(taskId, treeName, true);
+        String azkabanJobCommand = FlowParseTool.generateExecutorToolCommand(taskId, azkabanName, true);
 
         /**
          * 当前任务生成文件存放根路径
@@ -1549,10 +1549,10 @@ public class DmpDevelopTaskServiceImpl extends BaseService implements DmpDevelop
         contents.add(azkabanJobCommand);
 
         // 生成job文件
-        String jobFileAbsolutePath = localTaskSourcePath + treeName + ".job";
+        String jobFileAbsolutePath = localTaskSourcePath + azkabanName + ".job";
         FileUtils.write(jobFileAbsolutePath, contents);
 
-        String localZipTargetFileName = treeName + ".zip";
+        String localZipTargetFileName = azkabanName + ".zip";
         ZipUtils.zip(localTaskSourcePath, localTaskZipPath, localZipTargetFileName);
 
         //上传到azkaban todo
@@ -1560,7 +1560,7 @@ public class DmpDevelopTaskServiceImpl extends BaseService implements DmpDevelop
         String localTaskZipAbsolutePath = localTaskZipPath + "/" + localZipTargetFileName;
         AzkabanApiUtils2 azkabanApiUtils = new AzkabanApiUtils2(azkabanMonitorUrl, redisTemplate);
         //return azkabanApiUtils.loginCreateProjectuploadZipAndExecute("jz_localflow_" + taskAlias + "_" + projectId, "local_" + taskAlias + "_project", localTaskZipAbsolutePath, treeName);
-        return azkabanApiUtils.loginCreateProjectuploadZipAndExecute("jz_workflow_new_" + projectId, "local_" + taskAlias + "_project", localTaskZipAbsolutePath, treeName);
+        return azkabanApiUtils.loginCreateProjectuploadZipAndExecute("jz_workflow_new_" + projectId, "local_" + taskAlias + "_project", localTaskZipAbsolutePath, azkabanName);
     }
 
     /**

src/main/resources/mapper/dmp/DmpDevelopTaskMapper.xml

@@ -25,6 +25,7 @@
 		<result column="is_gziped" property="isGziped" jdbcType="INTEGER" />
 		<result column="name" property="name" jdbcType="VARCHAR" />
 		<result column="project_id" property="projectId" jdbcType="VARCHAR" />
+		<result column="create_user_name" property="createUserName" jdbcType="VARCHAR" />
 		<!-- <result column="chk_result" property="chkResult" javaType="VARCHAR"/> -->
 		<!-- <result column="sync_result" property="syncResult" javaType="VARCHAR"/> -->
 	</resultMap>
@@ -204,7 +205,8 @@
 	SELECT
 		task.id,task.task_type,task.type,task.schedule_type,task.is_submit,task.task_desc,task.script,task.data_status,task.create_user_id,task.create_time,
 		task.update_user_id,task.update_time,task.tree_id,task.flow_header,
-		task.flow_json, task.version, task.publish_version, task.is_gziped, tree.name
+		task.flow_json, task.version, task.publish_version, task.is_gziped, tree.name,
+		user.user_name AS create_user_name
 	FROM dmp_develop_task task left join dmp_navigation_tree tree ON task.tree_id=tree.id
 	LEFT JOIN dmp_member user ON task.CREATE_USER_ID=user.user_id
 	WHERE 1=1 AND tree.data_status = '1'