1、AlertMessage入库修复字段和库表不匹配问题,增加display_id
2、command增加display_id 3、规则、任务、配置增加新建时(批量导入除外)、任务运行状态、审核状态改变时的历史记录
This commit is contained in:
@@ -104,4 +104,12 @@ public interface TaskMapper {
|
||||
void deleteTaskProtectObjectConcat(Long taskId);
|
||||
|
||||
List<ProtectObject> queryProtectObjectsByTaskId(Long id);
|
||||
|
||||
void insertTaskStatusLog(Long taskId);
|
||||
|
||||
void updateTaskStatusLogExpireTime(Long taskId);
|
||||
|
||||
void insertTaskStatusLogBatch(List<Integer> idWithAuditStatusBatch);
|
||||
|
||||
void updateTaskStatusLogExpireTimeBatch(List<Integer> taskIds);
|
||||
}
|
||||
|
||||
@@ -101,7 +101,7 @@ public class TaskService {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
insertTaskStatusLog(task.getTaskId());
|
||||
return task.getTaskId();
|
||||
}
|
||||
|
||||
@@ -316,7 +316,7 @@ public class TaskService {
|
||||
if (AuditStatusValidator.setOriginal(originalAuditStatus).checkValidate(taskAuditStatus))
|
||||
taskMapper.changeTaskAuditStatusWithAudior(taskId, taskAuditStatus, auditUserName, auditUserId, auditUserDepart);
|
||||
else return false;
|
||||
|
||||
insertTaskStatusLog(taskId);
|
||||
return true;
|
||||
}
|
||||
@Transactional
|
||||
@@ -329,6 +329,7 @@ public class TaskService {
|
||||
if (AuditStatusValidator.setOriginal(originalAuditStatus).checkValidate(taskAuditStatus))
|
||||
taskMapper.changeTaskAuditStatus(taskId, taskAuditStatus);
|
||||
else return false;
|
||||
insertTaskStatusLog(taskId);
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -427,10 +428,13 @@ public class TaskService {
|
||||
}
|
||||
//mapper指的就是外层函数输入的参数,也就是WhiteListMapper
|
||||
mapper.updateAuditStatusByIdBatch(idWithAuditStatusBatch);
|
||||
//记录状态日志
|
||||
insertTaskStatusLog(idWithAuditStatusBatch);
|
||||
idWithAuditStatusBatch.clear();
|
||||
}
|
||||
if (!idWithAuditStatusBatch.isEmpty()) {
|
||||
mapper.updateAuditStatusByIdBatch(idWithAuditStatusBatch);
|
||||
insertTaskStatusLog(idWithAuditStatusBatch);
|
||||
}
|
||||
return true;
|
||||
};
|
||||
@@ -507,4 +511,16 @@ public class TaskService {
|
||||
public String queryAuditInfo(Integer id) {
|
||||
return taskMapper.queryAuditInfo(id);
|
||||
}
|
||||
|
||||
public void insertTaskStatusLog(Long taskId) {
|
||||
taskMapper.updateTaskStatusLogExpireTime(taskId);
|
||||
taskMapper.insertTaskStatusLog(taskId);
|
||||
}
|
||||
public void insertTaskStatusLog(Map<Integer, Integer> idWithAuditStatusBatch) {
|
||||
Set<Integer> keys = idWithAuditStatusBatch.keySet();
|
||||
ArrayList<Integer> taskIds = new ArrayList<>(keys);
|
||||
|
||||
taskMapper.updateTaskStatusLogExpireTimeBatch(taskIds);
|
||||
taskMapper.insertTaskStatusLogBatch(taskIds);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -70,8 +70,15 @@ public class StateChangeService {
|
||||
originalState.getClass().getSimpleName(),
|
||||
newState.getClass().getSimpleName()));
|
||||
|
||||
|
||||
// 这里一定是handle成功的状态,我们再进行task status的修改,如果handle失败,要么返回false,要么抛出异常,不会进入此处
|
||||
return taskService.changeTaskStatus(taskId, stateNum);
|
||||
Boolean isChanged = taskService.changeTaskStatus(taskId, stateNum);
|
||||
//记录状态日志
|
||||
if (isChanged) {
|
||||
taskService.insertTaskStatusLog(taskId);
|
||||
}
|
||||
|
||||
return isChanged;
|
||||
}
|
||||
|
||||
private Boolean checkState(State originalState, State newState) {
|
||||
|
||||
Reference in New Issue
Block a user