gfwleak/enderbyendera-realtime-protection
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、统计接口，增加已退回的数据

Browse Source 
2、增加规则、任务、配置的历史状态变化表查询
3、任务结束后，其选择规则再次使用报错正在使用中问题解决。修改规则审计状态同时，删去used_tasl_id的值
4、任务结束，修改is——delete报错解决，doris要使用unique key
5、分页查询逆序返回
This commit is contained in:
PushM
2024-06-05 03:29:32 +08:00
parent e4ebe2d791
commit 906bf494d9
41 changed files with 485 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/main/java/com/realtime/protection/server/task/TaskService.java
View File

@@ -153,10 +153,12 @@ public class TaskService {
}
mapper.updateAuditStatusByIdBatch(batchMap);
insertStaticRuleStatusLog(batchMap);
batchMap.clear();
}
mapper.updateAuditStatusByIdBatch(batchMap);
insertStaticRuleStatusLog(batchMap);
batchMap.clear();
return null;
@@ -214,10 +216,12 @@ public class TaskService {
}
mapper.updateAuditStatusByIdBatch(batchMap);
insertDynamicRuleStatusLog(batchMap);
batchMap.clear();
}
mapper.updateAuditStatusByIdBatch(batchMap);
insertDynamicRuleStatusLog(batchMap);
batchMap.clear();
return null;
@@ -243,6 +247,8 @@ public class TaskService {
if (task == null) {
continue;
}
List<ProtectObject> protectObjects = taskMapper.queryProtectObjectsByTaskId(task.getTaskId());
task.setProtectObjects(protectObjects);
task.setStaticRuleIds(taskMapper.queryStaticRuleIdsFromTaskId(task.getTaskId(),
List.of(AuditStatusEnum.AUDITED.getNum(), AuditStatusEnum.USING.getNum())));
@@ -523,4 +529,46 @@ public class TaskService {
taskMapper.updateTaskStatusLogExpireTimeBatch(taskIds);
taskMapper.insertTaskStatusLogBatch(taskIds);
}
public List<Task> queryHistory(Long id, Integer page, Integer pageSize) {
List<Task> tasks = taskMapper.queryHistory(id, page, pageSize);
for (Task task : tasks) {
if (task == null) {
continue;
}
List<ProtectObject> protectObjects = taskMapper.queryProtectObjectsByTaskId(task.getTaskId());
task.setProtectObjects(protectObjects);
task.setStaticRuleIds(taskMapper.queryStaticRuleIdsFromTaskId(task.getTaskId(),
List.of(AuditStatusEnum.AUDITED.getNum(), AuditStatusEnum.USING.getNum())));
task.setDynamicRuleIds(taskMapper.queryDynamicRuleIdsFromTaskId(task.getTaskId(),
List.of(AuditStatusEnum.AUDITED.getNum(), AuditStatusEnum.USING.getNum())));
}
return tasks;
}
public void removeDynamicRuleUsedTaskIdInTask(Long taskId) {
dynamicRuleMapper.removeUsedTaskId(taskId);
}
public void removeStaticRuleUsedTaskIdInTask(Long taskId) {
staticRuleMapper.removeUsedTaskId(taskId);
}
public void insertStaticRuleStatusLog(Map<Integer, Integer> idWithAuditStatusBatch) {
Set<Integer> keys = idWithAuditStatusBatch.keySet();
ArrayList<Integer> ids = new ArrayList<>(keys);
staticRuleMapper.updateStaticRuleStatusLogExpireTimeBatch(ids);
staticRuleMapper.insertStaticRuleStatusLogBatch(ids);
}
public void insertDynamicRuleStatusLog(Map<Integer, Integer> idWithAuditStatusBatch) {
Set<Integer> keys = idWithAuditStatusBatch.keySet();
ArrayList<Integer> ids = new ArrayList<>(keys);
dynamicRuleMapper.updateStatusLogExpireTimeBatch(ids);
dynamicRuleMapper.insertStatusLogBatch(ids);
}
}