[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

@@ -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

@@ -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

@@ -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

@@ -390,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{
@@ -415,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{
@@ -459,4 +467,28 @@ public void exportProcessDefinitionById(@ApiIgnore @RequestAttribute(value = Con
         }
     }
 
+
+
+    /**
+     * 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

@@ -279,5 +279,26 @@ public Result importProcessDefinition(@ApiIgnore @RequestAttribute(value = Const
         }
     }
 
+    /**
+     * 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());
+        }
+    }
+
+
 
 }

escheduler-api/src/main/java/cn/escheduler/api/service/ProcessDefinitionService.java

@@ -862,6 +862,24 @@ public Map<String, Object> getTaskNodeListByDefinitionIdList(String defineIdList
 
     }
 
+
+    /**
+     * query proccess definition all by project id
+     *
+     * @param projectId
+     * @return
+     */
+    public Map<String, Object> queryProccessDefinitionAllByProjectId(Integer projectId) {
+
+        HashMap<String, Object> result = new HashMap<>(5);
+
+        List<ProcessDefinition> resourceList = processDefineMapper.queryAllDefinitionList(projectId);
+        result.put(Constants.DATA_LIST, resourceList);
+        putMsg(result, Status.SUCCESS);
+
+        return result;
+    }
+
     /**
      * Encapsulates the TreeView structure
      *

escheduler-api/src/main/java/cn/escheduler/api/service/ProjectService.java

@@ -367,4 +367,30 @@ private int queryPermission(User user, Project project) {
 
     }
 
+    /**
+     * query all project list
+     * @return
+     */
+    public Map<String, Object> queryAllProjectList() {
+        Map<String, Object> result = new HashMap<>();
+        List<Project> projects = projectMapper.queryAllProjectList();
+        List<ProcessDefinition>  processDefinitions = processDefinitionMapper.queryAll();
+        if(projects != null){
+            Set set = new HashSet<>();
+            for (ProcessDefinition processDefinition : processDefinitions){
+                set.add(processDefinition.getProjectId());
+            }
+            List<Project> tempDeletelist = new ArrayList<Project>();
+            for (Project project : projects) {
+                if(!set.contains(project.getId())){
+                    tempDeletelist.add(project);
+                }
+            }
+            projects.removeAll(tempDeletelist);
+        }
+        result.put(Constants.DATA_LIST, projects);
+        putMsg(result,Status.SUCCESS);
+        return result;
+    }
+
 }

escheduler-api/src/main/resources/i18n/messages.properties

@@ -113,6 +113,7 @@ QUERY_PROJECT_BY_ID_NOTES=query project info by project id
 QUERY_PROJECT_LIST_PAGING_NOTES=QUERY PROJECT LIST PAGING 
 DELETE_PROJECT_BY_ID_NOTES=delete project by id 
 QUERY_UNAUTHORIZED_PROJECT_NOTES=query unauthorized project
+QUERY_ALL_PROJECT_LIST_NOTES=query all project list
 QUERY_AUTHORIZED_PROJECT_NOTES=query authorized project
 TASK_RECORD_TAG=task record related operation
 QUERY_TASK_RECORD_LIST_PAGING_NOTES=query task record list paging 
@@ -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

escheduler-api/src/main/resources/i18n/messages_en_US.properties

@@ -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

escheduler-api/src/main/resources/i18n/messages_zh_CN.properties

@@ -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
+BATCH_DELETE_PROCESS_DEFINITION_BY_IDS_NOTES=批量删除流程定义通过流程定义ID集合
+DELETE_PROCESS_DEFINITION_BY_ID_NOTES=删除流程定义通过流程定义ID
 QUERY_PROCESS_INSTANCE_BY_ID_NOTES=查询流程实例通过流程实例ID
 DELETE_PROCESS_INSTANCE_BY_ID_NOTES=删除流程实例通过流程实例ID
 TASK_ID=任务实例ID

escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessDefinitionMapper.java

@@ -255,4 +255,26 @@ List<DefinitionGroupByUser> countDefinitionGroupByUser(
     int updateReceiversAndCcById(@Param("receivers") String receivers,
                                  @Param("receiversCc") String receiversCc,
                                  @Param("processDefinitionId") int processDefinitionId);
+
+    /**
+     * query all
+     * @return
+     */
+    @Results(value = {@Result(property = "id", column = "id", id = true, javaType = Integer.class, jdbcType = JdbcType.INTEGER),
+            @Result(property = "name", column = "name", javaType = String.class, jdbcType = JdbcType.VARCHAR),
+            @Result(property = "version", column = "version", javaType = Integer.class, jdbcType = JdbcType.TINYINT),
+            @Result(property = "releaseState", column = "release_state",  typeHandler = EnumOrdinalTypeHandler.class, javaType = ReleaseState.class, jdbcType = JdbcType.TINYINT),
+            @Result(property = "projectId", column = "project_id", javaType = Integer.class, jdbcType = JdbcType.INTEGER),
+            @Result(property = "userId", column = "user_id", javaType = Integer.class, jdbcType = JdbcType.INTEGER),
+            @Result(property = "desc", column = "desc", javaType = String.class, jdbcType = JdbcType.VARCHAR),
+            @Result(property = "createTime", column = "create_time", javaType = Timestamp.class, jdbcType = JdbcType.DATE),
+            @Result(property = "updateTime", column = "update_time", javaType = Timestamp.class, jdbcType = JdbcType.DATE),
+            @Result(property = "flag", column = "flag", typeHandler = EnumOrdinalTypeHandler.class, javaType = Flag.class, jdbcType = JdbcType.TINYINT),
+            @Result(property = "userName", column = "user_name", javaType = String.class, jdbcType = JdbcType.VARCHAR),
+            @Result(property = "timeout", column = "timeout", javaType = Integer.class, jdbcType = JdbcType.INTEGER),
+            @Result(property = "tenantId", column = "tenant_id", javaType = Integer.class, jdbcType = JdbcType.INTEGER),
+            @Result(property = "projectName", column = "project_name", javaType = String.class, jdbcType = JdbcType.VARCHAR)
+    })
+    @SelectProvider(type = ProcessDefinitionMapperProvider.class, method = "queryAll")
+    List<ProcessDefinition> queryAll();
 }

escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessDefinitionMapperProvider.java

@@ -297,4 +297,19 @@ public String updateReceiversAndCcById(Map<String, Object> parameter) {
             }
         }.toString();
     }
+
+
+    /**
+     * query all
+     * @return
+     */
+    public String queryAll() {
+        return new SQL() {{
+            SELECT("id,name,version,release_state,project_id,user_id,`desc`,create_time,update_time,flag,global_params,receivers,receivers_cc");
+
+            FROM(TABLE_NAME );
+
+            ORDER_BY("create_time desc ");
+        }}.toString();
+    }
 }