ops / monitor-service · Commits

Go to a project

Authored by zhengyouwei
Commit 2e4a0ead569ba73e996057defe22ea852e05aaa6 1 parent 247d0c08

work

Inline Side-by-side
Showing 3 changed files with 25 additions and 3 deletions
... ... @@ -32,6 +32,11 @@ public class WorkStatus {
public static final int EXE_FAILE = 4;
/**
*领导通过
*/
public static final int LEADER_PASS = 5;
/**
* 关闭
*/
public static final int CLOSE= -1;
... ... @@ -51,6 +56,8 @@ public class WorkStatus {
return "发布失败";
case CLOSE:
return "被关闭";
case LEADER_PASS:
return "核准通过";
default:
return "其他";
... ...
... ... @@ -166,8 +166,8 @@ public class ReleaseServiceImpl implements ReleaseService {
if(handleType == HandleType.PASS){//通过测试
releaseWorkJob.setStatus(WorkStatus.TEST_PASS);
releaseWorkJobMapper.updateStatus(releaseWorkJob);
PendingJob newPendingJob = new PendingJob(WorkType.RELEASE_PROJECT, releaseWorkJob.getId(), releaseWorkJob.getTitle(), null, HandlerRole.OPERATOR, WorkStatus.TEST_PASS);
workSystemSupport.addPendingByRole(newPendingJob,true);
PendingJob newPendingJob = new PendingJob(WorkType.RELEASE_PROJECT, releaseWorkJob.getId(), releaseWorkJob.getTitle(), null, HandlerRole.LEADER, WorkStatus.TEST_PASS);
workSystemSupport.addPendingByRole(newPendingJob,false);
}else{//未通过测试
releaseWorkJob.setStatus(WorkStatus.CREATED);//置为初始状态
releaseWorkJobMapper.updateStatus(releaseWorkJob);
... ... @@ -175,7 +175,7 @@ public class ReleaseServiceImpl implements ReleaseService {
PendingJob newPendingJob = new PendingJob(WorkType.RELEASE_PROJECT, releaseWorkJob.getId(), releaseWorkJob.getTitle(), releaseWorkJob.getDevelop(), HandlerRole.DEVELOP, WorkStatus.CREATED);
workSystemSupport.addPending(newPendingJob,false);
}
}else if(currentStatus == WorkStatus.TEST_PASS) {//测试通过的工单
}else if(currentStatus == WorkStatus.LEADER_PASS) {//领导通过的工单
releaseWorkJob.setOperator(handledJob.getHandler());
if(handleType == HandleType.PASS){//发布成功
releaseWorkJob.setStatus(WorkStatus.EXE_SUCCESS);
... ... @@ -185,6 +185,19 @@ public class ReleaseServiceImpl implements ReleaseService {
workSystemSupport.workend(releaseWorkJob.getId(),WorkType.RELEASE_PROJECT,releaseWorkJob.getTitle(),WorkStatus.getCstatus(WorkStatus.EXE_FAILE));
}
releaseWorkJobMapper.updateResult(releaseWorkJob);//填写工单结果
}else if (currentStatus == WorkStatus.TEST_PASS){//测试通过
if(handleType == HandleType.PASS){//领导通过
releaseWorkJob.setStatus(WorkStatus.LEADER_PASS);
releaseWorkJobMapper.updateStatus(releaseWorkJob);
PendingJob newPendingJob = new PendingJob(WorkType.RELEASE_PROJECT, releaseWorkJob.getId(), releaseWorkJob.getTitle(), null, HandlerRole.OPERATOR, WorkStatus.LEADER_PASS);
workSystemSupport.addPendingByRole(newPendingJob,false);
}else{//领导未通过
releaseWorkJob.setStatus(WorkStatus.CREATED);//置为初始状态
releaseWorkJobMapper.updateStatus(releaseWorkJob);
//插入用户待处理工单表
PendingJob newPendingJob = new PendingJob(WorkType.RELEASE_PROJECT, releaseWorkJob.getId(), releaseWorkJob.getTitle(), releaseWorkJob.getDevelop(), HandlerRole.DEVELOP, WorkStatus.CREATED);
workSystemSupport.addPending(newPendingJob,false);
}
}
return 1;
}
... ...
... ... @@ -13,6 +13,8 @@ swaith_mobile=15905144483
dns_exception_mobile=15905144483
redis_exception_mobile=15905144483
... ...