mirror of
https://gitee.com/dolphinscheduler/DolphinScheduler.git
synced 2024-12-05 13:48:10 +08:00
[Fix-7977] Rectify the wrong prompt in the class of 'TaskGroupServiceImpl'. (#7978)
This commit is contained in:
parent
6dcf53c4d9
commit
23068e9d21
@ -366,6 +366,8 @@ public enum Status {
|
|||||||
UPDATE_ENVIRONMENT_WORKER_GROUP_RELATION_ERROR(130016,"You can't modify the worker group, because the worker group [{0}] and this environment [{1}] already be used in the task [{2}]",
|
UPDATE_ENVIRONMENT_WORKER_GROUP_RELATION_ERROR(130016,"You can't modify the worker group, because the worker group [{0}] and this environment [{1}] already be used in the task [{2}]",
|
||||||
"您不能修改工作组选项,因为该工作组 [{0}] 和 该环境 [{1}] 已经被用在任务 [{2}] 中"),
|
"您不能修改工作组选项,因为该工作组 [{0}] 和 该环境 [{1}] 已经被用在任务 [{2}] 中"),
|
||||||
TASK_GROUP_QUEUE_ALREADY_START(130017, "task group queue already start", "节点已经获取任务组资源"),
|
TASK_GROUP_QUEUE_ALREADY_START(130017, "task group queue already start", "节点已经获取任务组资源"),
|
||||||
|
TASK_GROUP_STATUS_CLOSED(130018,"The task group has been closed.","任务组已经被关闭"),
|
||||||
|
TASK_GROUP_STATUS_OPENED(130019,"The task group has been opened.","任务组已经被开启"),
|
||||||
NOT_ALLOW_TO_DISABLE_OWN_ACCOUNT(130020, "Not allow to disable your own account", "不能停用自己的账号"),
|
NOT_ALLOW_TO_DISABLE_OWN_ACCOUNT(130020, "Not allow to disable your own account", "不能停用自己的账号"),
|
||||||
NOT_ALLOW_TO_DELETE_DEFAULT_ALARM_GROUP(130030, "Not allow to delete the default alarm group ", "不能删除默认告警组"),
|
NOT_ALLOW_TO_DELETE_DEFAULT_ALARM_GROUP(130030, "Not allow to delete the default alarm group ", "不能删除默认告警组"),
|
||||||
;
|
;
|
||||||
|
@ -17,10 +17,6 @@
|
|||||||
|
|
||||||
package org.apache.dolphinscheduler.api.service.impl;
|
package org.apache.dolphinscheduler.api.service.impl;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
||||||
import org.apache.dolphinscheduler.api.dto.gantt.Task;
|
|
||||||
import org.apache.dolphinscheduler.api.enums.Status;
|
import org.apache.dolphinscheduler.api.enums.Status;
|
||||||
import org.apache.dolphinscheduler.api.service.TaskGroupQueueService;
|
import org.apache.dolphinscheduler.api.service.TaskGroupQueueService;
|
||||||
import org.apache.dolphinscheduler.api.service.TaskGroupService;
|
import org.apache.dolphinscheduler.api.service.TaskGroupService;
|
||||||
@ -32,10 +28,6 @@ import org.apache.dolphinscheduler.dao.entity.User;
|
|||||||
import org.apache.dolphinscheduler.dao.mapper.TaskGroupMapper;
|
import org.apache.dolphinscheduler.dao.mapper.TaskGroupMapper;
|
||||||
import org.apache.dolphinscheduler.service.process.ProcessService;
|
import org.apache.dolphinscheduler.service.process.ProcessService;
|
||||||
import org.apache.dolphinscheduler.spi.utils.StringUtils;
|
import org.apache.dolphinscheduler.spi.utils.StringUtils;
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Service;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
@ -43,6 +35,15 @@ import java.util.HashMap;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* task Group Service
|
* task Group Service
|
||||||
*/
|
*/
|
||||||
@ -277,6 +278,10 @@ public class TaskGroupServiceImpl extends BaseServiceImpl implements TaskGroupSe
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
TaskGroup taskGroup = taskGroupMapper.selectById(id);
|
TaskGroup taskGroup = taskGroupMapper.selectById(id);
|
||||||
|
if (taskGroup.getStatus() == Flag.NO.getCode()) {
|
||||||
|
putMsg(result, Status.TASK_GROUP_STATUS_CLOSED);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
taskGroup.setStatus(Flag.NO.getCode());
|
taskGroup.setStatus(Flag.NO.getCode());
|
||||||
taskGroupMapper.updateById(taskGroup);
|
taskGroupMapper.updateById(taskGroup);
|
||||||
putMsg(result, Status.SUCCESS);
|
putMsg(result, Status.SUCCESS);
|
||||||
@ -297,11 +302,11 @@ public class TaskGroupServiceImpl extends BaseServiceImpl implements TaskGroupSe
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
TaskGroup taskGroup = taskGroupMapper.selectById(id);
|
TaskGroup taskGroup = taskGroupMapper.selectById(id);
|
||||||
if (taskGroup.getStatus() == 1) {
|
if (taskGroup.getStatus() == Flag.YES.getCode()) {
|
||||||
putMsg(result, Status.TASK_GROUP_STATUS_ERROR);
|
putMsg(result, Status.TASK_GROUP_STATUS_OPENED);
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
taskGroup.setStatus(1);
|
taskGroup.setStatus(Flag.YES.getCode());
|
||||||
taskGroup.setUpdateTime(new Date(System.currentTimeMillis()));
|
taskGroup.setUpdateTime(new Date(System.currentTimeMillis()));
|
||||||
int update = taskGroupMapper.updateById(taskGroup);
|
int update = taskGroupMapper.updateById(taskGroup);
|
||||||
putMsg(result, Status.SUCCESS);
|
putMsg(result, Status.SUCCESS);
|
||||||
|
@ -161,8 +161,18 @@ public class TaskGroupServiceTest {
|
|||||||
Mockito.when(taskGroupMapper.selectById(1)).thenReturn(taskGroup);
|
Mockito.when(taskGroupMapper.selectById(1)).thenReturn(taskGroup);
|
||||||
|
|
||||||
//close failed
|
//close failed
|
||||||
Map<String, Object> result1 = taskGroupService.closeTaskGroup(loginUser, 1);
|
Map<String, Object> result = taskGroupService.closeTaskGroup(loginUser, 1);
|
||||||
Assert.assertEquals(Status.SUCCESS, result1.get(Constants.STATUS));
|
Assert.assertEquals(Status.SUCCESS, result.get(Constants.STATUS));
|
||||||
|
|
||||||
|
taskGroup.setStatus(0);
|
||||||
|
Mockito.when(taskGroupMapper.selectById(1)).thenReturn(taskGroup);
|
||||||
|
result = taskGroupService.closeTaskGroup(loginUser, 1);
|
||||||
|
Assert.assertEquals(Status.TASK_GROUP_STATUS_CLOSED, result.get(Constants.STATUS));
|
||||||
|
|
||||||
|
taskGroup.setStatus(1);
|
||||||
|
Mockito.when(taskGroupMapper.selectById(1)).thenReturn(taskGroup);
|
||||||
|
result = taskGroupService.startTaskGroup(loginUser, 1);
|
||||||
|
Assert.assertEquals(Status.TASK_GROUP_STATUS_OPENED, result.get(Constants.STATUS));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
Loading…
Reference in New Issue
Block a user