Commit 79454e46 authored by baoliang's avatar baoliang
Browse files

update worker group

parent eeceb7ce

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

+2 −2
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ public class ExecutorController extends BaseController { 
                                       @RequestParam(value = "receiversCc", required = false) String receiversCc,

                                       @RequestParam(value = "runMode", required = false) RunMode runMode,

                                       @RequestParam(value = "processInstancePriority", required = false) Priority processInstancePriority,

                                       @RequestParam(value = "workerGroupId", required = false) int workerGroupId,

                                       @RequestParam(value = "workerGroupId", required = false, defaultValue = "0") int workerGroupId,

                                       @RequestParam(value = "timeout", required = false) Integer timeout) {

        try {

            logger.info("login user {}, start process instance, project name: {}, process definition id: {}, schedule time: {}, "
@@ -82,7 +82,7 @@ public class ExecutorController extends BaseController { 


            Map<String, Object> result = execService.execProcessInstance(loginUser, projectName, processDefinitionId, scheduleTime, execType, failureStrategy,

                            startNodeList, taskDependType, warningType,

                    warningGroupId,receivers,receiversCc, runMode,processInstancePriority,timeout);

                    warningGroupId,receivers,receiversCc, runMode,processInstancePriority, workerGroupId, timeout);

            return returnDataList(result);

        } catch (Exception e) {

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

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

+4 −3
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ public class ExecutorService extends BaseService{ 
                                                   FailureStrategy failureStrategy, String startNodeList,

                                                   TaskDependType taskDependType, WarningType warningType, int warningGroupId,

                                                   String receivers, String receiversCc, RunMode runMode,

                                                   Priority processInstancePriority, Integer timeout) throws ParseException {

                                                   Priority processInstancePriority, int workerGroupId, Integer timeout) throws ParseException {

        Map<String, Object> result = new HashMap<>(5);

        // timeout is valid

        if (timeout <= 0 || timeout > MAX_TASK_TIMEOUT) {
@@ -115,7 +115,7 @@ public class ExecutorService extends BaseService{ 
         */

        int create = this.createCommand(commandType, processDefinitionId,

                taskDependType, failureStrategy, startNodeList, cronTime, warningType, loginUser.getId(),

                warningGroupId, runMode,processInstancePriority);

                warningGroupId, runMode,processInstancePriority, workerGroupId);

        if(create > 0 ){

            /**

             * according to the process definition ID updateProcessInstance and CC recipient
@@ -405,7 +405,7 @@ public class ExecutorService extends BaseService{ 
                              TaskDependType nodeDep, FailureStrategy failureStrategy,

                              String startNodeList, String schedule, WarningType warningType,

                              int excutorId, int warningGroupId,

                              RunMode runMode,Priority processInstancePriority) throws ParseException {

                              RunMode runMode,Priority processInstancePriority, int workerGroupId) throws ParseException {



        /**

         * instantiate command schedule instance
@@ -436,6 +436,7 @@ public class ExecutorService extends BaseService{ 
        command.setExecutorId(excutorId);

        command.setWarningGroupId(warningGroupId);

        command.setProcessInstancePriority(processInstancePriority);

        command.setWorkerGroupId(workerGroupId);



        Date start = null;

        Date end = null;