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

1、修改异步接收rcp首次查询的响应

Browse Source
This commit is contained in:
PushM
2024-06-16 01:35:57 +08:00
parent aa6188b1ef
commit 87d9f51563
1 changed files with 35 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/main/java/com/realtime/protection/server/task/status/StateHandler.java
View File

@@ -158,8 +158,17 @@ public class StateHandler {
sendCommandDistributeSignal(commandUUIDs); sendCommandDistributeSignal(commandUUIDs);
} catch (Exception e) { } catch (Exception e) {
log.error(String.format("静态任务%d 首次指令下发c3出错",task.getTaskId())); log.error(String.format("静态任务%d 首次指令下发c3出错",task.getTaskId()));
return true; e.printStackTrace();
// 将command查询RCP信号发送到RCP查询程序
try {
sendCommandRcpQuerySignal(commandUUIDs);
} catch (Exception e2) {
log.error(String.format("静态任务%d 首次指令查询RCP出错",task.getTaskId()));
e.printStackTrace();
return true;
}
} }
// 将command查询RCP信号发送到RCP查询程序 // 将command查询RCP信号发送到RCP查询程序
try { try {
sendCommandRcpQuerySignal(commandUUIDs); sendCommandRcpQuerySignal(commandUUIDs);
@@ -233,18 +242,32 @@ public class StateHandler {
.doOnError(WebClientResponseException.class, res -> success.set(false)); .doOnError(WebClientResponseException.class, res -> success.set(false));
Map<String, Integer> response = mono.block(Duration.ofSeconds(5)); // Map<String, Integer> response = mono.block(Duration.ofSeconds(5));
if (response == null) { // 异步处理响应
log.info("指令首次查询RCP返回为null"); mono.subscribe(
return false; response -> {
} // 成功响应处理
response.forEach((commandUUID, responseCode) -> { System.out.println("响应: " + response);
log.info("指令首次查询RCP成功, 指令uuid: " + commandUUID + ", responseCode: " + responseCode); success.set(true);
if (responseCode != 0) { },
log.warn("指令首次查询RCP失败, 指令uuid: " + commandUUID + ", responseCode: " + responseCode); error -> {
} // 错误响应处理
}); System.err.println("错误: " + error.getMessage());
success.set(false);
}
);
// if (response == null) {
// log.info("指令首次查询RCP返回为null");
// return false;
// }
// response.forEach((commandUUID, responseCode) -> {
// log.info("指令首次查询RCP成功, 指令uuid: " + commandUUID + ", responseCode: " + responseCode);
// if (responseCode != 0) {
// log.warn("指令首次查询RCP失败, 指令uuid: " + commandUUID + ", responseCode: " + responseCode);
// }
// });
success.set(true); success.set(true);