|
@@ -3,6 +3,7 @@ package cn.reghao.devops.mgr.mgr.machine.controller.page;
|
|
|
import cn.reghao.devops.common.util.KeyValue;
|
|
import cn.reghao.devops.common.util.KeyValue;
|
|
|
import cn.reghao.devops.mgr.mgr.machine.db.query.MachineQuery;
|
|
import cn.reghao.devops.mgr.mgr.machine.db.query.MachineQuery;
|
|
|
import cn.reghao.devops.mgr.mgr.machine.model.po.MachineInfo;
|
|
import cn.reghao.devops.mgr.mgr.machine.model.po.MachineInfo;
|
|
|
|
|
+import cn.reghao.devops.mgr.mgr.machine.kvm.VirtualHost;
|
|
|
import cn.reghao.devops.mgr.util.DefaultSetting;
|
|
import cn.reghao.devops.mgr.util.DefaultSetting;
|
|
|
import cn.reghao.devops.mgr.util.PageSort;
|
|
import cn.reghao.devops.mgr.util.PageSort;
|
|
|
import cn.reghao.devops.mgr.mgr.build.model.constant.EnvType;
|
|
import cn.reghao.devops.mgr.mgr.build.model.constant.EnvType;
|
|
@@ -16,6 +17,7 @@ import cn.reghao.devops.mgr.mgr.machine.util.Keys;
|
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
+import org.libvirt.Domain;
|
|
|
import org.springframework.data.domain.Page;
|
|
import org.springframework.data.domain.Page;
|
|
|
import org.springframework.data.domain.PageRequest;
|
|
import org.springframework.data.domain.PageRequest;
|
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
@@ -39,9 +41,11 @@ import java.util.stream.Collectors;
|
|
|
@RequestMapping("/machine/host")
|
|
@RequestMapping("/machine/host")
|
|
|
public class MachineHostPageController {
|
|
public class MachineHostPageController {
|
|
|
private final MachineQuery machineQuery;
|
|
private final MachineQuery machineQuery;
|
|
|
|
|
+ private final VirtualHost virtualHost;
|
|
|
|
|
|
|
|
- public MachineHostPageController(MachineQuery machineQuery) {
|
|
|
|
|
|
|
+ public MachineHostPageController(MachineQuery machineQuery, VirtualHost virtualHost) {
|
|
|
this.machineQuery = machineQuery;
|
|
this.machineQuery = machineQuery;
|
|
|
|
|
+ this.virtualHost = virtualHost;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@ApiOperation(value = "机器节点页面", notes = "N")
|
|
@ApiOperation(value = "机器节点页面", notes = "N")
|
|
@@ -62,6 +66,7 @@ public class MachineHostPageController {
|
|
|
} else {
|
|
} else {
|
|
|
page = machineQuery.getMachineHostByPage(env, pageRequest);
|
|
page = machineQuery.getMachineHostByPage(env, pageRequest);
|
|
|
}
|
|
}
|
|
|
|
|
+ //List<String> list = virtualHost.listDomain();
|
|
|
|
|
|
|
|
model.addAttribute("env", env);
|
|
model.addAttribute("env", env);
|
|
|
model.addAttribute("page", page);
|
|
model.addAttribute("page", page);
|