[BUG][#731]repair swagger annotation，interface path:/escheduler/projects/{projectName}/process/batch-delete and /escheduler/projects/{projectName}/process/delete

dockerfile/conf/escheduler/conf/i18n/messages.properties

@@ -152,6 +152,7 @@ VERIFY_PROCCESS_DEFINITION_NAME_NOTES=verify proccess definition name
 LOGIN_NOTES=user login
 UPDATE_PROCCESS_DEFINITION_NOTES=update proccess definition
 PROCESS_DEFINITION_ID=process definition id
+PROCESS_DEFINITION_IDS=process definition ids
 RELEASE_PROCCESS_DEFINITION_NOTES=release proccess definition
 QUERY_PROCCESS_DEFINITION_BY_ID_NOTES=query proccess definition by id
 QUERY_PROCCESS_DEFINITION_LIST_NOTES=query proccess definition list
@@ -170,6 +171,8 @@ LIMIT=limit
 VIEW_TREE_NOTES=view tree
 GET_NODE_LIST_BY_DEFINITION_ID_NOTES=get task node list by process definition id
 PROCESS_DEFINITION_ID_LIST=process definition id list
+DELETE_PROCESS_DEFINITION_BY_ID_NOTES=delete process definition by process definition id
+BATCH_DELETE_PROCESS_DEFINITION_BY_IDS_NOTES=batch delete process definition by process definition ids
 QUERY_PROCESS_INSTANCE_BY_ID_NOTES=query process instance by process instance id
 DELETE_PROCESS_INSTANCE_BY_ID_NOTES=delete process instance by process instance id
 TASK_ID=task instance id

dockerfile/conf/escheduler/conf/i18n/messages_en_US.properties

@@ -152,6 +152,7 @@ VERIFY_PROCCESS_DEFINITION_NAME_NOTES=verify proccess definition name
 LOGIN_NOTES=user login
 UPDATE_PROCCESS_DEFINITION_NOTES=update proccess definition
 PROCESS_DEFINITION_ID=process definition id
+PROCESS_DEFINITION_IDS=process definition ids
 RELEASE_PROCCESS_DEFINITION_NOTES=release proccess definition
 QUERY_PROCCESS_DEFINITION_BY_ID_NOTES=query proccess definition by id
 QUERY_PROCCESS_DEFINITION_LIST_NOTES=query proccess definition list
@@ -170,6 +171,8 @@ LIMIT=limit
 VIEW_TREE_NOTES=view tree
 GET_NODE_LIST_BY_DEFINITION_ID_NOTES=get task node list by process definition id
 PROCESS_DEFINITION_ID_LIST=process definition id list
+DELETE_PROCESS_DEFINITION_BY_ID_NOTES=delete process definition by process definition id
+BATCH_DELETE_PROCESS_DEFINITION_BY_IDS_NOTES=batch delete process definition by process definition ids
 QUERY_PROCESS_INSTANCE_BY_ID_NOTES=query process instance by process instance id
 DELETE_PROCESS_INSTANCE_BY_ID_NOTES=delete process instance by process instance id
 TASK_ID=task instance id

dockerfile/conf/escheduler/conf/i18n/messages_zh_CN.properties

@@ -157,6 +157,7 @@ QUERY_PROCCESS_DEFINITION_LIST_NOTES=查询流程定义列表
 QUERY_PROCCESS_DEFINITION_LIST_PAGING_NOTES=分页查询流程定义列表
 PAGE_NO=页码号
 PROCESS_INSTANCE_ID=流程实例ID
+PROCESS_INSTANCE_IDS=流程实例ID集合
 PROCESS_INSTANCE_JSON=流程实例信息(json格式)
 SCHEDULE_TIME=定时时间
 SYNC_DEFINE=更新流程实例的信息是否同步到流程定义
@@ -168,6 +169,8 @@ LIMIT=显示多少条
 VIEW_TREE_NOTES=树状图
 GET_NODE_LIST_BY_DEFINITION_ID_NOTES=获得任务节点列表通过流程定义ID
 PROCESS_DEFINITION_ID_LIST=流程定义id列表
+DELETE_PROCESS_DEFINITION_BY_ID_NOTES=删除流程定义通过流程定义ID
+BATCH_DELETE_PROCESS_DEFINITION_BY_IDS_NOTES=批量删除流程定义通过流程定义ID集合
 QUERY_PROCESS_INSTANCE_BY_ID_NOTES=查询流程实例通过流程实例ID
 DELETE_PROCESS_INSTANCE_BY_ID_NOTES=删除流程实例通过流程实例ID
 TASK_ID=任务实例ID

escheduler-api/src/main/java/cn/escheduler/api/controller/ProcessDefinitionController.java

@@ -30,9 +30,11 @@
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.Map;
 
 import static cn.escheduler.api.enums.Status.*;
+import static cn.escheduler.api.enums.Status.EXPORT_PROCESS_DEFINE_BY_ID_ERROR;
 
 
 /**
@@ -388,10 +390,14 @@ public Result getNodeListByDefinitionIdList(
      * @param processDefinitionId
      * @return
      */
+    @ApiOperation(value = "deleteProcessDefinitionById", notes= "DELETE_PROCESS_DEFINITION_BY_ID_NOTES")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "processDefinitionId", value = "PROCESS_DEFINITION_ID", dataType = "Int", example = "100")
+    })
     @GetMapping(value="/delete")
     @ResponseStatus(HttpStatus.OK)
-    public Result deleteProcessDefinitionById(@RequestAttribute(value = Constants.SESSION_USER) User loginUser,
-                                            @PathVariable String projectName,
+    public Result deleteProcessDefinitionById(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
+                                              @ApiParam(name = "projectName", value = "PROJECT_NAME", required = true) @PathVariable String projectName,
                                             @RequestParam("processDefinitionId") Integer processDefinitionId
     ){
         try{
@@ -413,10 +419,14 @@ public Result deleteProcessDefinitionById(@RequestAttribute(value = Constants.SE
      * @param processDefinitionIds
      * @return
      */
+    @ApiOperation(value = "batchDeleteProcessDefinitionByIds", notes= "BATCH_DELETE_PROCESS_DEFINITION_BY_IDS_NOTES")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "processDefinitionIds", value = "PROCESS_DEFINITION_IDS", type = "String")
+    })
     @GetMapping(value="/batch-delete")
     @ResponseStatus(HttpStatus.OK)
-    public Result batchDeleteProcessDefinitionByIds(@RequestAttribute(value = Constants.SESSION_USER) User loginUser,
-                                              @PathVariable String projectName,
+    public Result batchDeleteProcessDefinitionByIds(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
+                                                    @ApiParam(name = "projectName", value = "PROJECT_NAME", required = true) @PathVariable String projectName,
                                               @RequestParam("processDefinitionIds") String processDefinitionIds
     ){
         try{
@@ -430,4 +440,31 @@ public Result batchDeleteProcessDefinitionByIds(@RequestAttribute(value = Consta
         }
     }
 
+    /**
+     * export process definition by id
+     *
+     * @param loginUser
+     * @param projectName
+     * @param processDefinitionId
+     * @return
+     */
+    @ApiOperation(value = "exportProcessDefinitionById", notes= "EXPORT_PROCCESS_DEFINITION_BY_ID_NOTES")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "processDefinitionId", value = "PROCESS_DEFINITION_ID", required = true, dataType = "Int", example = "100")
+    })
+    @GetMapping(value="/export")
+    @ResponseBody
+    public void exportProcessDefinitionById(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
+                                            @PathVariable String projectName,
+                                            @RequestParam("processDefinitionId") Integer processDefinitionId,
+                                            HttpServletResponse response){
+        try{
+            logger.info("export process definition by id, login user:{}, project name:{}, process definition id:{}",
+                    loginUser.getUserName(), projectName, processDefinitionId);
+            processDefinitionService.exportProcessDefinitionById(loginUser, projectName, processDefinitionId,response);
+        }catch (Exception e){
+            logger.error(EXPORT_PROCESS_DEFINE_BY_ID_ERROR.getMsg(),e);
+        }
+    }
+
 }

escheduler-api/src/main/java/cn/escheduler/api/controller/ProjectController.java

@@ -18,6 +18,7 @@
 
 
 import cn.escheduler.api.enums.Status;
+import cn.escheduler.api.service.ProcessDefinitionService;
 import cn.escheduler.api.service.ProjectService;
 import cn.escheduler.api.utils.Constants;
 import cn.escheduler.api.utils.Result;
@@ -32,6 +33,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.Map;
@@ -51,6 +53,9 @@ public class ProjectController extends BaseController {
     @Autowired
     private ProjectService projectService;
 
+    @Autowired
+    private ProcessDefinitionService processDefinitionService;
+
     /**
      * create project
      *
@@ -249,5 +254,30 @@ public Result queryAuthorizedProject(@ApiIgnore @RequestAttribute(value = Consta
         }
     }
 
+    /**
+     * import process definition
+     *
+     * @param loginUser
+     * @param file
+     * @return
+     */
+    @ApiOperation(value = "importProcessDefinition", notes= "EXPORT_PROCCESS_DEFINITION_NOTES")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "file", value = "RESOURCE_FILE", required = true, dataType = "MultipartFile")
+    })
+    @PostMapping(value="/importProcessDefinition")
+    public Result importProcessDefinition(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
+                                          @RequestParam("file") MultipartFile file){
+        try{
+            logger.info("import process definition by id, login user:{}",
+                    loginUser.getUserName());
+            Map<String, Object> result = processDefinitionService.importProcessDefinition(loginUser,file);
+            return returnDataList(result);
+        }catch (Exception e){
+            logger.error(IMPORT_PROCESS_DEFINE_ERROR.getMsg(),e);
+            return error(IMPORT_PROCESS_DEFINE_ERROR.getCode(), IMPORT_PROCESS_DEFINE_ERROR.getMsg());
+        }
+    }
+
 
 }

escheduler-api/src/main/java/cn/escheduler/api/enums/Status.java

@@ -213,6 +213,8 @@ public enum Status {
     BATCH_DELETE_PROCESS_DEFINE_ERROR(50025,"batch delete process definition error"),
     BATCH_DELETE_PROCESS_DEFINE_BY_IDS_ERROR(50026,"batch delete process definition by ids {0} error"),
     TENANT_NOT_SUITABLE(50027,"there is not any tenant suitable, please choose a tenant available."),
+    EXPORT_PROCESS_DEFINE_BY_ID_ERROR(50028,"export process definition by id error"),
+    IMPORT_PROCESS_DEFINE_ERROR(50029,"import process definition error"),
 
     HDFS_NOT_STARTUP(60001,"hdfs not startup"),
     HDFS_TERANT_RESOURCES_FILE_EXISTS(60002,"resource file exists,please delete resource first"),