feat: 2.6.0
1. 添加删除功能 2. 添加开关工作流功能 3. 新增复制按钮待实现
This commit is contained in:
byteblogs168
parent
a6352e498e
commit
426063dd23
@ -52,6 +52,16 @@ public class WorkflowController {
|
||||
return workflowService.getWorkflowDetail(id);
|
||||
}
|
||||
|
||||
@PutMapping("/update/status/{id}")
|
||||
public Boolean updateStatus(@PathVariable("id") Long id) {
|
||||
return workflowService.updateStatus(id);
|
||||
}
|
||||
|
||||
@DeleteMapping("/{id}")
|
||||
public Boolean deleteById(@PathVariable("id") Long id) {
|
||||
return workflowService.deleteById(id);
|
||||
}
|
||||
|
||||
@PostMapping("/start")
|
||||
public void startWorkflow() {
|
||||
|
||||
|
||||
@ -18,6 +18,11 @@ public class WorkflowDetailResponseVO {
|
||||
*/
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 组名称
|
||||
*/
|
||||
private String workflowName;
|
||||
|
||||
/**
|
||||
* 组名称
|
||||
*/
|
||||
|
||||
@ -23,4 +23,8 @@ public interface WorkflowService {
|
||||
PageResult<List<WorkflowResponseVO>> listPage(WorkflowQueryVO queryVO);
|
||||
|
||||
Boolean updateWorkflow(WorkflowRequestVO workflowRequestVO);
|
||||
|
||||
Boolean updateStatus(Long id);
|
||||
|
||||
Boolean deleteById(Long id);
|
||||
}
|
||||
|
||||
@ -184,6 +184,31 @@ public class WorkflowServiceImpl implements WorkflowService {
|
||||
return Boolean.TRUE;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean updateStatus(Long id) {
|
||||
Workflow workflow = workflowMapper.selectOne(
|
||||
new LambdaQueryWrapper<Workflow>()
|
||||
.select(Workflow::getId, Workflow::getWorkflowStatus)
|
||||
.eq(Workflow::getId, id));
|
||||
Assert.notNull(workflow, () -> new EasyRetryServerException("工作流不存在"));
|
||||
|
||||
if (Objects.equals(workflow.getWorkflowStatus(), StatusEnum.NO.getStatus())) {
|
||||
workflow.setWorkflowStatus(StatusEnum.YES.getStatus());
|
||||
} else {
|
||||
workflow.setWorkflowStatus(StatusEnum.NO.getStatus());
|
||||
}
|
||||
|
||||
return 1 == workflowMapper.updateById(workflow);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean deleteById(Long id) {
|
||||
Workflow workflow = new Workflow();
|
||||
workflow.setId(id);
|
||||
workflow.setDeleted(StatusEnum.YES.getStatus());
|
||||
return 1 == workflowMapper.updateById(workflow);
|
||||
}
|
||||
|
||||
private WorkflowDetailResponseVO.NodeConfig buildNodeConfig(MutableGraph<Long> graph,
|
||||
Long parentId,
|
||||
Map<Long, WorkflowDetailResponseVO.NodeConfig> nodeConfigMap,
|
||||
|
||||
@ -35,11 +35,27 @@ const jobApi = {
|
||||
updateWorkflow: '/workflow',
|
||||
workflowDetail: '/workflow',
|
||||
workflowBatchListPage: '/workflow/batch/page/list',
|
||||
workflowBatchDetail: '/workflow/batch/'
|
||||
workflowBatchDetail: '/workflow/batch/',
|
||||
updateStatus: '/workflow/update/status/',
|
||||
delWorkflow: '/workflow/'
|
||||
}
|
||||
|
||||
export default jobApi
|
||||
|
||||
export function delWorkflow (id) {
|
||||
return request({
|
||||
url: jobApi.delWorkflow + id,
|
||||
method: 'delete'
|
||||
})
|
||||
}
|
||||
|
||||
export function updateWorkflowStatus (id) {
|
||||
return request({
|
||||
url: jobApi.updateStatus + id,
|
||||
method: 'put'
|
||||
})
|
||||
}
|
||||
|
||||
export function workflowBatchDetail (id) {
|
||||
return request({
|
||||
url: jobApi.workflowBatchDetail + id,
|
||||
|
||||
@ -209,19 +209,6 @@ export const asyncRouterMap = [
|
||||
component: () => import('@/views/job/JobTaskList'),
|
||||
meta: { title: '任务项', icon: 'profile', permission: ['jobBatch'] }
|
||||
},
|
||||
{
|
||||
path: '/job/notify/list',
|
||||
name: 'JobNotifyList',
|
||||
component: () => import('@/views/job/JobNotifyList'),
|
||||
meta: { title: '通知列表', icon: 'profile', keepAlive: true, permission: ['jobNotify'] }
|
||||
},
|
||||
{
|
||||
path: '/job/notify/config',
|
||||
name: 'JobNotifyForm',
|
||||
hidden: true,
|
||||
component: () => import('@/views/job/form/JobNotifyForm.vue'),
|
||||
meta: { title: '通知配置', icon: 'profile', keepAlive: true, permission: ['jobNotify'] }
|
||||
},
|
||||
{
|
||||
path: '/job/workflow/list',
|
||||
name: 'WorkflowList',
|
||||
@ -254,6 +241,18 @@ export const asyncRouterMap = [
|
||||
hidden: true,
|
||||
component: () => import('@/views/job/WorkflowBatchDetail'),
|
||||
meta: { title: '工作流任务批次详情', icon: 'profile', permission: ['jobBatch'] }
|
||||
}, {
|
||||
path: '/job/notify/list',
|
||||
name: 'JobNotifyList',
|
||||
component: () => import('@/views/job/JobNotifyList'),
|
||||
meta: { title: '通知列表', icon: 'profile', keepAlive: true, permission: ['jobNotify'] }
|
||||
},
|
||||
{
|
||||
path: '/job/notify/config',
|
||||
name: 'JobNotifyForm',
|
||||
hidden: true,
|
||||
component: () => import('@/views/job/form/JobNotifyForm.vue'),
|
||||
meta: { title: '通知配置', icon: 'profile', keepAlive: true, permission: ['jobNotify'] }
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
@ -106,28 +106,38 @@
|
||||
title="是否关闭?"
|
||||
ok-text="关闭"
|
||||
cancel-text="取消"
|
||||
@confirm="handleClose(record)"
|
||||
@confirm="handleOpenOrClose(record)"
|
||||
>
|
||||
<a href="javascript:;" v-if="record.jobStatus === 1">关闭</a>
|
||||
<a href="javascript:;" v-if="record.workflowStatus === 1">关闭</a>
|
||||
</a-popconfirm>
|
||||
<a-divider type="vertical" v-if="record.jobStatus === 1" />
|
||||
<a-divider type="vertical" v-if="record.workflowStatus === 1" />
|
||||
<a-popconfirm
|
||||
title="是否开启?"
|
||||
ok-text="开启"
|
||||
cancel-text="取消"
|
||||
@confirm="handleOpen(record)"
|
||||
@confirm="handleOpenOrClose(record)"
|
||||
>
|
||||
<a href="javascript:;" v-if="record.jobStatus === 0">开启</a>
|
||||
<a href="javascript:;" v-if="record.workflowStatus === 0">开启</a>
|
||||
</a-popconfirm>
|
||||
<a-divider type="vertical" v-if="record.jobStatus === 0" />
|
||||
<a-divider type="vertical" v-if="record.workflowStatus === 0" />
|
||||
<a-popconfirm
|
||||
title="是否删除任务?"
|
||||
title="是否删除工作流?"
|
||||
ok-text="删除"
|
||||
cancel-text="取消"
|
||||
@confirm="handleDel(record)"
|
||||
v-if="$auth('job.del')"
|
||||
>
|
||||
<a href="javascript:;" v-if="record.jobStatus === 0">删除</a>
|
||||
<a href="javascript:;" v-if="record.workflowStatus === 0">删除</a>
|
||||
</a-popconfirm>
|
||||
<a-divider type="vertical" />
|
||||
<a-popconfirm
|
||||
title="是否复制此工作流?"
|
||||
ok-text="复制"
|
||||
cancel-text="取消"
|
||||
@confirm="handleCopy(record)"
|
||||
v-if="$auth('job.del')"
|
||||
>
|
||||
<a href="javascript:;">复制</a>
|
||||
</a-popconfirm>
|
||||
|
||||
</template>
|
||||
@ -153,13 +163,13 @@
|
||||
import ATextarea from 'ant-design-vue/es/input/TextArea'
|
||||
import AInput from 'ant-design-vue/es/input/Input'
|
||||
import { STable, Drawer } from '@/components'
|
||||
import { delJob, workflowListPage, triggerJob, updateJobStatus } from '@/api/jobApi'
|
||||
import { workflowListPage, triggerJob, updateWorkflowStatus, delWorkflow } from '@/api/jobApi'
|
||||
import { getAllGroupNameList } from '@/api/manage'
|
||||
import enums from '@/utils/jobEnum'
|
||||
import JobInfo from '@/views/job/JobInfo'
|
||||
|
||||
export default {
|
||||
name: 'JobList',
|
||||
name: 'WorkflowList',
|
||||
components: {
|
||||
AInput,
|
||||
ATextarea,
|
||||
@ -295,17 +305,6 @@ export default {
|
||||
this.$router.push({ path: '/job/workflow/detail', query: { id: record.id } })
|
||||
},
|
||||
handleOk (record) {},
|
||||
handleClose (record) {
|
||||
updateJobStatus({ id: record.id, jobStatus: 0 }).then((res) => {
|
||||
const { status } = res
|
||||
if (status === 0) {
|
||||
this.$message.error('关闭失败')
|
||||
} else {
|
||||
this.$refs.table.refresh(true)
|
||||
this.$message.success('关闭成功')
|
||||
}
|
||||
})
|
||||
},
|
||||
handleTrigger (record) {
|
||||
triggerJob(record.id).then((res) => {
|
||||
const { status } = res
|
||||
@ -317,19 +316,21 @@ export default {
|
||||
}
|
||||
})
|
||||
},
|
||||
handleOpen (record) {
|
||||
updateJobStatus({ id: record.id, jobStatus: 1 }).then((res) => {
|
||||
handleOpenOrClose (record) {
|
||||
updateWorkflowStatus(record.id).then((res) => {
|
||||
const { status } = res
|
||||
if (status === 0) {
|
||||
this.$message.error('开启失败')
|
||||
this.$message.error('执行失败')
|
||||
} else {
|
||||
this.$refs.table.refresh(true)
|
||||
this.$message.success('开启成功')
|
||||
this.$message.success('执行成功')
|
||||
}
|
||||
})
|
||||
},
|
||||
handleCopy (record) {
|
||||
},
|
||||
handleDel (record) {
|
||||
delJob(record.id).then((res) => {
|
||||
delWorkflow(record.id).then((res) => {
|
||||
const { status } = res
|
||||
if (status === 0) {
|
||||
this.$message.error('删除失败')
|
||||
|
||||
Loading…
Reference in New Issue
Block a user