1. DynamicRuleMapper中添加audit_status result映射

2. 给DynamicTaskInfo实体类中添加所有字段对应的Json字段
3. 修改sendFilter函数中的WebClient初始化URL和URI,修改mono.block的超时设置,添加对response字段中success的判断
4. 将TaskMapper中的getDynamicTaskInfos select语句的INNER JOIN修改为LEFT JOIN
5. updateStaticRUleAuditStatusInTask和updateDynamicRuleAuditStatusInTask添加对staticRuleIds列表的判断,确保SQL语句不会出现问题
This commit is contained in:
EnderByEndera
2024-04-25 12:09:23 +08:00
parent fa7c89eb5a
commit 1b38276701
5 changed files with 49 additions and 13 deletions

View File

@@ -92,7 +92,12 @@ public class TaskService {
return;
}
List<StaticRuleObject> staticRuleObjects = staticRuleMapper.queryStaticRuleByIds(taskMapper.queryDynamicRuleIdsFromTaskId(taskId));
List<Integer> staticRuleIds = taskMapper.queryStaticRuleIdsFromTaskId(taskId);
if (staticRuleIds == null || staticRuleIds.isEmpty()) {
return;
}
List<StaticRuleObject> staticRuleObjects = staticRuleMapper.queryStaticRuleByIds(staticRuleIds);
if (staticRuleObjects == null || staticRuleObjects.isEmpty()) {
throw new IllegalArgumentException("静态规则列表中的ID不存在请检查静态规则是否真实存在");
}
@@ -147,7 +152,12 @@ public class TaskService {
return;
}
List<DynamicRuleObject> dynamicRuleObjects = dynamicRuleMapper.queryDynamicRuleByIds(taskMapper.queryDynamicRuleIdsFromTaskId(taskId));
List<Integer> dynamicRuleIds = taskMapper.queryDynamicRuleIdsFromTaskId(taskId);
if (dynamicRuleIds == null || dynamicRuleIds.isEmpty()) {
return;
}
List<DynamicRuleObject> dynamicRuleObjects = dynamicRuleMapper.queryDynamicRuleByIds(dynamicRuleIds);
if (dynamicRuleObjects == null || dynamicRuleObjects.isEmpty()) {
throw new IllegalArgumentException("静态规则列表中的ID不存在请检查静态规则是否真实存在");
}