|
|
@@ -40,21 +40,13 @@ public class MachineHostPageController {
|
|
|
@ApiOperation(value = "机器节点页面", notes = "N")
|
|
|
@PreAuthorize("hasRole('ROLE_ADMIN')")
|
|
|
@GetMapping
|
|
|
- public String indexPage(@RequestParam(value = "env", required = false) String env,
|
|
|
- @RequestParam(value = "machineIpv4", required = false) String machineIpv4,
|
|
|
- Model model) {
|
|
|
+ public String indexPage(@RequestParam(value = "env", required = false) String env, Model model) {
|
|
|
if (env == null) {
|
|
|
env = DefaultSetting.getDefaultEnv();
|
|
|
}
|
|
|
|
|
|
PageRequest pageRequest = PageSort.pageRequest();
|
|
|
- Page<MachineHostVO> page;
|
|
|
- if (machineIpv4 != null) {
|
|
|
- //page = machineQuery.searchResultPage(machineIpv4);
|
|
|
- page = Page.empty();
|
|
|
- } else {
|
|
|
- page = machineQuery.getMachineHostByPage(env, pageRequest);
|
|
|
- }
|
|
|
+ Page<MachineHostVO> page = machineQuery.getMachineHostByPage(env, pageRequest);
|
|
|
model.addAttribute("env", env);
|
|
|
model.addAttribute("page", page);
|
|
|
model.addAttribute("list", page.getContent());
|
