ops / monitor-service · Commits

Go to a project

Authored by qinchao
Commit 30c573be2e695f2c78826ba17b604e220b2c5d3b 1 parent 9200cf71

工单处理

Inline Side-by-side
Showing 2 changed files with 12 additions and 16 deletions
... ... @@ -101,7 +101,7 @@ public class DBServiceImpl implements DBService {
//插入用户待处理工单表
if("".equals(dbWorkJob.getVerifier())){//未选择工单审核人，则按照旧的流程走
PendingJob pendingJob = new PendingJob(WorkType.DB_PROJECT, dbWorkJob.getId(), dbWorkJob.getTitle(), null, HandlerRole.DBA+","+HandlerRole.LEADER, WorkStatus.PUBLISH);
PendingJob pendingJob = new PendingJob(WorkType.DB_PROJECT, dbWorkJob.getId(), dbWorkJob.getTitle(), null, HandlerRole.DBA, WorkStatus.PUBLISH);
workSystemSupport.addPendingByRole(pendingJob, false);
}else{//选择审核人，则只有当前审核人来处理该工单
PendingJob pendingJob = new PendingJob(WorkType.DB_PROJECT, dbWorkJob.getId(), dbWorkJob.getTitle(),dbWorkJob.getVerifier(),HandlerRole.DB_TEAM_LEADER_VERIFY,WorkStatus.PUBLISH_UNCHECK);
... ... @@ -129,10 +129,14 @@ public class DBServiceImpl implements DBService {
dbWorkJob.setDba(handledJob.getHandler());
dbWorkJobMapper.update(dbWorkJob);//关闭工单
workSystemSupport.workend(dbWorkJob.getId(), WorkType.DB_PROJECT, dbWorkJob.getTitle(), WorkStatus.getCstatus(WorkStatus.CLOSE));
//删除该工单的待处理
pendingJobMapper.deleteWithStatus(dbWorkJob.getId(),pendingJob.getCurrentStatus());
return 1;
}
int currentStatus = pendingJob.getCurrentStatus();
if (currentStatus == WorkStatus.PUBLISH || currentStatus == WorkStatus.PUBLISH_CHECKED) {//发布状态或者 发布后审核通过状态，按照之前的流程走
if (currentStatus == WorkStatus.PUBLISH || currentStatus == WorkStatus.PUBLISH_CHECKED) {//发起状态或者 发布后审核通过状态，按照之前的流程走
dbWorkJob.setDba(handledJob.getHandler());
if (handleType == HandleType.PASS) {//通过
if (StringUtils.equals("true", handledJob.getDbNeedTest())) {//需要测试
... ... @@ -145,10 +149,6 @@ public class DBServiceImpl implements DBService {
PendingJob newPendingJob = new PendingJob(WorkType.DB_PROJECT, dbWorkJob.getId(), dbWorkJob.getTitle(), test, HandlerRole.TEST, WorkStatus.DBA_CHECK_PASS);
workSystemSupport.addPending(newPendingJob, false);
}
//leader具有超级权限
PendingJob newPendingJob = new PendingJob(WorkType.DB_PROJECT, dbWorkJob.getId(), dbWorkJob.getTitle(), test, HandlerRole.LEADER, WorkStatus.DBA_CHECK_PASS);
workSystemSupport.addPendingByRole(newPendingJob, false);
} else {
dbWorkJob.setStatus(WorkStatus.EXE_SUCCESS);
workSystemSupport.workend(dbWorkJob.getId(), WorkType.DB_PROJECT, dbWorkJob.getTitle(), WorkStatus.getCstatus(WorkStatus.EXE_SUCCESS));
... ... @@ -160,7 +160,7 @@ public class DBServiceImpl implements DBService {
} else if (currentStatus == WorkStatus.DBA_CHECK_PASS) {
if (handleType == HandleType.PASS) {//通过
dbWorkJob.setStatus(WorkStatus.TEST_PASS);
PendingJob newPendingJob = new PendingJob(WorkType.DB_PROJECT, dbWorkJob.getId(), dbWorkJob.getTitle(), null, HandlerRole.DBA+","+HandlerRole.LEADER, WorkStatus.TEST_PASS);
PendingJob newPendingJob = new PendingJob(WorkType.DB_PROJECT, dbWorkJob.getId(), dbWorkJob.getTitle(), null, HandlerRole.DBA, WorkStatus.TEST_PASS);
workSystemSupport.addPendingByRole(newPendingJob, false);
///// dba审核通过通过之后，给季邦华发个邮件，把变更sql发给他 2017-11-07
... ... @@ -190,7 +190,7 @@ public class DBServiceImpl implements DBService {
//给审核人及领导发送审核通过通知
workSystemSupport.workend(dbWorkJob.getId(), WorkType.DB_PROJECT, dbWorkJob.getTitle(), WorkStatus.getCstatus(WorkStatus.PUBLISH_CHECKED));
//给dba发送审核通知---参照旧流程
PendingJob p = new PendingJob(WorkType.DB_PROJECT, dbWorkJob.getId(), dbWorkJob.getTitle(), null, HandlerRole.DBA+","+HandlerRole.LEADER, WorkStatus.PUBLISH_CHECKED);
PendingJob p = new PendingJob(WorkType.DB_PROJECT, dbWorkJob.getId(), dbWorkJob.getTitle(), null, HandlerRole.DBA, WorkStatus.PUBLISH_CHECKED);
workSystemSupport.addPendingByRole(p, false);
}else{//拒绝（默认不需要测试）
dbWorkJob.setStatus(WorkStatus.EXE_FAILE);
... ...
... ... @@ -135,10 +135,6 @@ public class ReleaseServiceImpl implements ReleaseService {
//插入用户待处理工单表
PendingJob pendingJob = new PendingJob(WorkType.RELEASE_PROJECT, releaseWorkJob.getId(), releaseWorkJob.getTitle(), releaseWorkJob.getTest(), HandlerRole.TEST, WorkStatus.PUBLISH);
workSystemSupport.addPending(pendingJob,false);
// 同时让leader有工单的处理权限
pendingJob = new PendingJob(WorkType.RELEASE_PROJECT, releaseWorkJob.getId(), releaseWorkJob.getTitle(), releaseWorkJob.getTest(), HandlerRole.LEADER, WorkStatus.PUBLISH);
workSystemSupport.addPendingByRole(pendingJob,false);
}
... ... @@ -163,6 +159,9 @@ public class ReleaseServiceImpl implements ReleaseService {
releaseWorkJob.setOperator(handledJob.getHandler());
releaseWorkJobMapper.updateResult(releaseWorkJob);//关闭工单
workSystemSupport.workend(releaseWorkJob.getId(),WorkType.RELEASE_PROJECT,releaseWorkJob.getTitle(),WorkStatus.getCstatus(WorkStatus.CLOSE));
//删除该工单的待处理
pendingJobMapper.deleteWithStatus(releaseWorkJob.getId(),pendingJob.getCurrentStatus());
return 1;
}
int currentStatus = pendingJob.getCurrentStatus();
... ... @@ -172,11 +171,8 @@ public class ReleaseServiceImpl implements ReleaseService {
releaseWorkJobMapper.updateStatus(releaseWorkJob);
PendingJob newPendingJob = new PendingJob(WorkType.RELEASE_PROJECT, releaseWorkJob.getId(), releaseWorkJob.getTitle(), releaseWorkJob.getTest(), HandlerRole.TEST, WorkStatus.PUBLISH);
workSystemSupport.addPending(newPendingJob,false);
newPendingJob = new PendingJob(WorkType.RELEASE_PROJECT, releaseWorkJob.getId(), releaseWorkJob.getTitle(), releaseWorkJob.getTest(), HandlerRole.LEADER, WorkStatus.PUBLISH);
workSystemSupport.addPendingByRole(newPendingJob,false);
}
} else if (currentStatus == WorkStatus.PUBLISH) {//发布状态
} else if (currentStatus == WorkStatus.PUBLISH) {//发起状态
dealRole="测试";
if(handleType == HandleType.PASS){//通过测试
releaseWorkJob.setStatus(WorkStatus.TEST_PASS);
... ...