1、任务启动时就发送指令

2、新增局点多级数据库表查询
3、静态任务下发指令补充指令展示id
This commit is contained in:
lifulian
2024-06-08 15:01:38 +08:00
committed by PushM
parent c57bdf6103
commit 49b9adf086
9 changed files with 267 additions and 47 deletions

View File

@@ -101,7 +101,7 @@ public class StateChangeService {
/**
* 将任务切换为结束状态
*/
@Scheduled(cron = "0 0/10 * * * ?")
@Scheduled(cron = "0/10 * * * * ?")
@Async
protected void finishTasks() {
List<Long> finishedTaskIds = taskService.getFinishedTasks();
@@ -117,4 +117,25 @@ public class StateChangeService {
}
}
// /**
// * 将任务切换为开始状态
// */
// @Scheduled(cron = "0/10 * * * * ?")
// @Async
// protected void startTasks() {
// List<Long> startedTaskIds = taskService.getFinishedTasks();
// log.debug("成功扫描出所有需要变为开始状态的任务:{}", startedTaskIds);
//
// for (Long taskId : startedTaskIds) {
// try {
// changeState(StateEnum.RUNNING.getStateNum(), taskId, true);
// } catch (Exception e) {
// log.warn(String.format("任务%d从%s状态变为运行中RUNNING状态遭遇异常%s",
// taskId, taskService.queryTaskStatus(taskId), e.getMessage()));
// }
//
// }
// }
}

View File

@@ -8,15 +8,19 @@ 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 lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus;
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.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicReference;
@Slf4j
public class StateHandler {
@@ -25,6 +29,12 @@ public class StateHandler {
// .baseUrl("http://10.58.72.151:8088")
.build();
//http://10.26.22.123:17011/rule
private final WebClient client_commandDistribute = WebClient.builder()
.baseUrl("http://10.26.22.123:17011")
// .baseUrl("http://10.58.72.151:8088")
.build();
protected Boolean handleStart(TaskService taskService, CommandService commandService, Long taskId) {
Task task = taskService.queryTask(taskId);
@@ -121,10 +131,48 @@ public class StateHandler {
taskService.updateStaticRuleAuditStatusInTask(task.getTaskId(), AuditStatusEnum.USING);
// taskService.changeTaskAuditStatus(task.getTaskId(), AuditStatusEnum.USING.getNum());
commandService.createCommands(staticTaskCommandInfos);
List<String> commandUUIDs= commandService.createCommands(staticTaskCommandInfos);
// 将command新建信号发送到c3下发程序
sendCommandDistributeSignal(commandUUIDs);
return true;
}
private Boolean sendCommandDistributeSignal(List<String> commandUUIDs) {
List<Map<String, String>> commandIDMaps = new ArrayList<>();
for (String commandUUID : commandUUIDs) {
commandIDMaps.add(Map.of("COMMAND_ID", commandUUID));
}
AtomicReference<Boolean> success = new AtomicReference<>(false);
Mono<Map> mono = client_commandDistribute.post()
.uri("/rule")
.bodyValue(commandIDMaps)
.exchangeToMono(res -> {
if (res.statusCode().equals(HttpStatus.OK)) {
return res.bodyToMono(Map.class);
}
return res.createError();
})
.doOnError(WebClientResponseException.class, res -> success.set(false));
Map<String, String> response = mono.block(Duration.ofSeconds(5));
if (response == null) {
return false;
}
response.forEach((commandUUID, responseCode) -> {
if (!responseCode.equals("0")) {
log.error("指令首次下发失败, 指令uuid: " + commandUUID + ", responseCode: " + responseCode);
}
});
success.set(true);
return success.get();
}
private Boolean sendFilters(TaskService taskService, Task task) {
List<DynamicTaskInfo> dynamicTaskInfos = taskService.getDynamicTaskInfos(task.getTaskId());