Commit c7da656b authored by 黄聪's avatar 黄聪 Committed by dailidong
Browse files

[BUG][#731]repair swagger annotation，interface... 

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

* 增加工作流导出导入功能，前端定时器表达式的秒和分钟的默认值从*修改成0

* 修改工作流导出导入功能由excel改为json减少依赖

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

* [BUG][#771] The edit timer did not assign the original data

* [FEATURE][#236] Cross-project dependency

* [FEATURE][#236] Cross-project dependency(增加跨项目依赖)
parent bbe7a256

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

+6 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ UPDATE_PROJECT_NOTES=update project 
PROJECT_ID=project id

QUERY_PROJECT_BY_ID_NOTES=query project info by project id

QUERY_PROJECT_LIST_PAGING_NOTES=QUERY PROJECT LIST PAGING 

QUERY_ALL_PROJECT_LIST_NOTES=query all project list 

DELETE_PROJECT_BY_ID_NOTES=delete project by id 

QUERY_UNAUTHORIZED_PROJECT_NOTES=query unauthorized project

QUERY_AUTHORIZED_PROJECT_NOTES=query authorized project
@@ -152,10 +153,12 @@ 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

QUERY_PROCCESS_DEFINITION_LIST_PAGING_NOTES=query proccess definition list paging

QUERY_ALL_DEFINITION_LIST_NOTES=query all definition list

PAGE_NO=page no

PROCESS_INSTANCE_ID=process instance id

PROCESS_INSTANCE_JSON=process instance info(json format)
@@ -170,6 +173,9 @@ 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

QUERY_PROCCESS_DEFINITION_All_BY_PROJECT_ID_NOTES=query proccess definition all by project id

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

+6 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ UPDATE_PROJECT_NOTES=update project 
PROJECT_ID=project id

QUERY_PROJECT_BY_ID_NOTES=query project info by project id

QUERY_PROJECT_LIST_PAGING_NOTES=QUERY PROJECT LIST PAGING 

QUERY_ALL_PROJECT_LIST_NOTES=query all project list

DELETE_PROJECT_BY_ID_NOTES=delete project by id 

QUERY_UNAUTHORIZED_PROJECT_NOTES=query unauthorized project

QUERY_AUTHORIZED_PROJECT_NOTES=query authorized project
@@ -152,10 +153,12 @@ 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

QUERY_PROCCESS_DEFINITION_LIST_PAGING_NOTES=query proccess definition list paging

QUERY_ALL_DEFINITION_LIST_NOTES=query all definition list

PAGE_NO=page no

PROCESS_INSTANCE_ID=process instance id

PROCESS_INSTANCE_JSON=process instance info(json format)
@@ -170,6 +173,9 @@ 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

QUERY_PROCCESS_DEFINITION_All_BY_PROJECT_ID_NOTES=query proccess definition all by project id

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

+6 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ UPDATE_PROJECT_NOTES=更新项目 
PROJECT_ID=项目ID

QUERY_PROJECT_BY_ID_NOTES=通过项目ID查询项目信息

QUERY_PROJECT_LIST_PAGING_NOTES=分页查询项目列表

QUERY_ALL_PROJECT_LIST_NOTES=查询所有项目

DELETE_PROJECT_BY_ID_NOTES=删除项目通过ID

QUERY_UNAUTHORIZED_PROJECT_NOTES=查询未授权的项目

QUERY_AUTHORIZED_PROJECT_NOTES=查询授权项目
@@ -155,8 +156,10 @@ RELEASE_PROCCESS_DEFINITION_NOTES=发布流程定义 
QUERY_PROCCESS_DEFINITION_BY_ID_NOTES=查询流程定义通过流程定义ID

QUERY_PROCCESS_DEFINITION_LIST_NOTES=查询流程定义列表

QUERY_PROCCESS_DEFINITION_LIST_PAGING_NOTES=分页查询流程定义列表

QUERY_ALL_DEFINITION_LIST_NOTES=查询所有流程定义

PAGE_NO=页码号

PROCESS_INSTANCE_ID=流程实例ID

PROCESS_INSTANCE_IDS=流程实例ID集合

PROCESS_INSTANCE_JSON=流程实例信息(json格式)

SCHEDULE_TIME=定时时间

SYNC_DEFINE=更新流程实例的信息是否同步到流程定义
@@ -168,6 +171,9 @@ LIMIT=显示多少条 
VIEW_TREE_NOTES=树状图

GET_NODE_LIST_BY_DEFINITION_ID_NOTES=获得任务节点列表通过流程定义ID

PROCESS_DEFINITION_ID_LIST=流程定义id列表

QUERY_PROCCESS_DEFINITION_All_BY_PROJECT_ID_NOTES=查询流程定义通过项目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

+36 −4
Original line number Diff line number Diff line
@@ -390,10 +390,14 @@ public class ProcessDefinitionController extends BaseController{ 
     * @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{
@@ -415,10 +419,14 @@ public class ProcessDefinitionController extends BaseController{ 
     * @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{
@@ -459,4 +467,28 @@ public class ProcessDefinitionController extends BaseController{ 
        }

    }







    /**

     * query proccess definition all by project id

     *

     * @param loginUser

     * @return

     */

    @ApiOperation(value = "queryProccessDefinitionAllByProjectId", notes= "QUERY_PROCCESS_DEFINITION_All_BY_PROJECT_ID_NOTES")

    @GetMapping(value="/queryProccessDefinitionAllByProjectId")

    @ResponseStatus(HttpStatus.OK)

    public Result queryProccessDefinitionAllByProjectId(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,

                                                        @RequestParam("projectId") Integer projectId){

        try{

            logger.info("query proccess definition list, login user:{}, project id:{}",

                    loginUser.getUserName(),projectId);

            Map<String, Object> result = processDefinitionService.queryProccessDefinitionAllByProjectId(projectId);

            return returnDataList(result);

        }catch (Exception e){

            logger.error(QUERY_PROCCESS_DEFINITION_LIST.getMsg(),e);

            return error(QUERY_PROCCESS_DEFINITION_LIST.getCode(), QUERY_PROCCESS_DEFINITION_LIST.getMsg());

        }

    }



}

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

+21 −0
Original line number Diff line number Diff line
@@ -279,5 +279,26 @@ public class ProjectController extends BaseController { 
        }

    }



    /**

     * query all project list

     * @param loginUser

     * @return

     */

    @ApiOperation(value = "queryAllProjectList", notes= "QUERY_ALL_PROJECT_LIST_NOTES")

    @GetMapping(value = "/queryAllProjectList")

    @ResponseStatus(HttpStatus.OK)

    public Result queryAllProjectList(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser) {



        try {

            logger.info("login user {}, query all project list", loginUser.getUserName());

            Map<String, Object> result = projectService.queryAllProjectList();

            return returnDataList(result);

        } catch (Exception e) {

            logger.error(LOGIN_USER_QUERY_PROJECT_LIST_PAGING_ERROR.getMsg(), e);

            return error(Status.LOGIN_USER_QUERY_PROJECT_LIST_PAGING_ERROR.getCode(), Status.LOGIN_USER_QUERY_PROJECT_LIST_PAGING_ERROR.getMsg());

        }

    }







}