配置下发修改

This commit is contained in:
huguanghan 2025-01-07 09:54:32 +08:00
parent bdb29dca50
commit 84d715c130
3 changed files with 6 additions and 5 deletions

View File

@ -19,6 +19,8 @@ import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeoutException;
/**
* 物模型Controller
@ -84,7 +86,7 @@ public class SysNodeController {
/** 配置下发 */
@PostMapping("/configUpdate")
public R<?> configUpdate(@RequestBody SysNodeDto sysNodeDto) {
public R<?> configUpdate(@RequestBody SysNodeDto sysNodeDto) throws ExecutionException, InterruptedException, TimeoutException {
nodeMessageService.sendTerminalConfig(sysNodeDto.getId());
return R.success();
}

View File

@ -12,7 +12,7 @@ import java.util.concurrent.TimeoutException;
public interface NodeMessageService {
JsonNode sendTerminalConfig(Long nodeId);
JsonNode sendTerminalConfig(Long nodeId) throws ExecutionException, InterruptedException, TimeoutException;
/**
* 向指定采集节点发送指令(无返回值)

View File

@ -119,7 +119,7 @@ public class NodeMessageServiceImpl extends TextWebSocketHandler implements Node
}
@Override
public JsonNode sendTerminalConfig(Long nodeId) {
public JsonNode sendTerminalConfig(Long nodeId) throws ExecutionException, InterruptedException, TimeoutException {
ConfigUpdateVo configUpdateVo = new ConfigUpdateVo();
List<LinkVo> links = new ArrayList<>();
try {
@ -216,8 +216,7 @@ public class NodeMessageServiceImpl extends TextWebSocketHandler implements Node
.time(time)
.data(jsonNode)
.build();
sendActionMessage(nodeId, configUpdate);
System.out.println(jsonNode);
sendTerminalMessageWithResult(nodeId,configUpdate);
return jsonNode;
}