1、新增com.alibaba:druid依赖

2、动态规则类新增sql解析方法,发送dynamicTaskInfos时对sql进行解析。
3、ResponseResult返回响应信息修改为中文
4、动态任务运行状态转变为运行中时,dynamicTaskInfos生成的查询mapper语句修改
This commit is contained in:
PushM
2024-05-29 22:05:17 +08:00
parent 388201a97f
commit cef4505ba7
10 changed files with 137 additions and 34 deletions

View File

@@ -92,7 +92,7 @@ public class TaskService {
//校验防护对象是否存在
boolean ProtectObjIdValid = task.getProtectObjectIds().stream()
.allMatch(dynamicRuleMapper::queryProtectObjectById);
if (!ProtectObjIdValid) {
if (!ProtectObjIdValid && !task.getProtectObjectIds().isEmpty()){
throw new IllegalArgumentException("部分防护对象不存在");
}
//任务和防护对象多对多关联建立

View File

@@ -8,11 +8,10 @@ import com.realtime.protection.configuration.utils.enums.TaskTypeEnum;
import com.realtime.protection.configuration.utils.enums.audit.AuditStatusEnum;
import com.realtime.protection.server.command.CommandService;
import com.realtime.protection.server.task.TaskService;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpStatus;
import org.springframework.web.reactive.function.client.WebClient;
import org.springframework.web.reactive.function.client.WebClientResponseException;
import org.springframework.web.reactive.function.client.*;
import reactor.core.publisher.Mono;
import org.springframework.web.reactive.function.client.WebClient;
import java.time.Duration;
import java.util.List;
@@ -114,12 +113,18 @@ public class StateHandler {
if (dynamicTaskInfos == null || dynamicTaskInfos.isEmpty()) {
throw new IllegalArgumentException("动态规则列表为空,请至少选择一个动态规则以启动动态/研判后类型任务");
}
//解析sql
dynamicTaskInfos.forEach(dynamicTaskInfo -> {
dynamicTaskInfo.parseSql();
});
// 将所有关联的动态规则审批状态修改为“已使用”
taskService.updateDynamicRuleAuditStatusInTask(task.getTaskId(), AuditStatusEnum.USING);
AtomicReference<Boolean> success = new AtomicReference<>(false);
// System.out.println(dynamicTaskInfos);
Mono<SimpleResponse> mono = client.post()
.uri("/api/v1/kafkasend")
.bodyValue(dynamicTaskInfos)
@@ -144,3 +149,4 @@ public class StateHandler {
return success.get();
}
}