|
@@ -9,6 +9,7 @@ import cn.reghao.bnt.web.devops.machine.model.vo.MachineDetail;
|
|
|
import cn.reghao.bnt.web.devops.machine.service.MachineQuery;
|
|
import cn.reghao.bnt.web.devops.machine.service.MachineQuery;
|
|
|
import cn.reghao.bnt.web.devops.machine.service.MachineService;
|
|
import cn.reghao.bnt.web.devops.machine.service.MachineService;
|
|
|
import cn.reghao.bnt.web.util.SelectOption;
|
|
import cn.reghao.bnt.web.util.SelectOption;
|
|
|
|
|
+import cn.reghao.bnt.web.ws.WsSender;
|
|
|
import cn.reghao.jutil.jdk.web.db.PageList;
|
|
import cn.reghao.jutil.jdk.web.db.PageList;
|
|
|
import cn.reghao.jutil.jdk.web.result.Result;
|
|
import cn.reghao.jutil.jdk.web.result.Result;
|
|
|
import cn.reghao.jutil.web.WebResult;
|
|
import cn.reghao.jutil.web.WebResult;
|
|
@@ -31,15 +32,18 @@ import java.util.List;
|
|
|
@RestController
|
|
@RestController
|
|
|
@RequestMapping("/api/devops/machine/host")
|
|
@RequestMapping("/api/devops/machine/host")
|
|
|
public class MachineController {
|
|
public class MachineController {
|
|
|
|
|
+ private int pageSize = 10;
|
|
|
private final MachineQuery machineQuery;
|
|
private final MachineQuery machineQuery;
|
|
|
private final MachineService machineService;
|
|
private final MachineService machineService;
|
|
|
private final MachineSys machineSys;
|
|
private final MachineSys machineSys;
|
|
|
- private int pageSize = 10;
|
|
|
|
|
|
|
+ private final WsSender wsSender;
|
|
|
|
|
|
|
|
- public MachineController(MachineQuery machineQuery, MachineService machineService, MachineSys machineSys) {
|
|
|
|
|
|
|
+ public MachineController(MachineQuery machineQuery, MachineService machineService, MachineSys machineSys,
|
|
|
|
|
+ WsSender wsSender) {
|
|
|
this.machineQuery = machineQuery;
|
|
this.machineQuery = machineQuery;
|
|
|
this.machineService = machineService;
|
|
this.machineService = machineService;
|
|
|
this.machineSys = machineSys;
|
|
this.machineSys = machineSys;
|
|
|
|
|
+ this.wsSender = wsSender;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Operation(summary = "机器节点页面", description = "N")
|
|
@Operation(summary = "机器节点页面", description = "N")
|
|
@@ -103,4 +107,11 @@ public class MachineController {
|
|
|
List<NetworkCard> networkCardList = machineSys.getNetworkCardList();
|
|
List<NetworkCard> networkCardList = machineSys.getNetworkCardList();
|
|
|
return WebResult.success();
|
|
return WebResult.success();
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ @Operation(summary = "获取在线的 agent websocket 会话", description = "N")
|
|
|
|
|
+ @GetMapping(value = "/ws", produces = MediaType.APPLICATION_JSON_VALUE)
|
|
|
|
|
+ public String getWebSocketSessions(@RequestParam("env") String env) {
|
|
|
|
|
+ List<String> machineList = wsSender.getOnlineMachines(env);
|
|
|
|
|
+ return WebResult.success(machineList);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|