ximon-admin/src/main/java/com/sandu/ximon/admin/controller/InterphoneHostController.java
@@ -1,6 +1,7 @@ package com.sandu.ximon.admin.controller; import com.sandu.common.domain.ResponseVO; import com.sandu.common.object.BaseConditionVO; import com.sandu.common.util.ResponseUtil; import com.sandu.ximon.admin.param.InterphoneHostParam; import com.sandu.ximon.admin.service.InterphoneHostService; @@ -53,8 +54,8 @@ * 删除主机 */ @GetMapping("/getList/{keyword}") public ResponseVO<Object> getInterphoneHostList(@PathVariable String keyword) { return ResponseUtil.success(interphoneHostService.getInterphoneHostList(keyword)); public ResponseVO<Object> getInterphoneHostList(BaseConditionVO baseConditionVO, @PathVariable String keyword) { return ResponseUtil.success(interphoneHostService.getInterphoneHostList(baseConditionVO, keyword)); }
@@ -1,6 +1,7 @@ package com.sandu.ximon.admin.controller; import com.sandu.common.domain.ResponseVO; import com.sandu.common.object.BaseConditionVO; import com.sandu.common.util.ResponseUtil; import com.sandu.ximon.admin.param.InterphoneSubParam; import com.sandu.ximon.admin.service.InterphoneSubService; @@ -54,8 +55,8 @@ * 删除主机 */ @GetMapping("/getList/{keyword}") public ResponseVO<Object> getInterphoneHostList(@PathVariable String keyword) { return ResponseUtil.success(interphoneSubService.getInterphoneSubList(keyword)); public ResponseVO<Object> getInterphoneHostList(BaseConditionVO baseConditionVO, @PathVariable String keyword) { return ResponseUtil.success(interphoneSubService.getInterphoneSubList(baseConditionVO, keyword)); } } ximon-admin/src/main/java/com/sandu/ximon/admin/service/InterphoneHostService.java
@@ -1,6 +1,8 @@ package com.sandu.ximon.admin.service; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageHelper; import com.sandu.common.object.BaseConditionVO; import com.sandu.common.service.impl.BaseServiceImpl; import com.sandu.ximon.admin.param.InterphoneHostParam; import com.sandu.ximon.admin.security.SecurityUtils; @@ -82,7 +84,10 @@ /** * 查询主机列表 */ public List<InterphoneHostBo> getInterphoneHostList(String keyword) { public List<InterphoneHostBo> getInterphoneHostList(BaseConditionVO baseConditionVO, String keyword) { if (baseConditionVO != null) { PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize()); } List<InterphoneHostBo> list; if (SecurityUtils.getClientId() == null) { list = interphoneHostMapper.getInterphoneHostList(keyword, null); ximon-admin/src/main/java/com/sandu/ximon/admin/service/InterphoneSubService.java
@@ -1,6 +1,8 @@ package com.sandu.ximon.admin.service; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageHelper; import com.sandu.common.object.BaseConditionVO; import com.sandu.common.service.impl.BaseServiceImpl; import com.sandu.ximon.admin.param.InterphoneSubParam; import com.sandu.ximon.admin.security.SecurityUtils; @@ -73,7 +75,10 @@ /** * 查询主机列表 */ public List<InterphoneSubBo> getInterphoneSubList(String keyword) { public List<InterphoneSubBo> getInterphoneSubList(BaseConditionVO baseConditionVO, String keyword) { if (baseConditionVO != null) { PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize()); } List<InterphoneSubBo> list; if (SecurityUtils.getClientId() == null) { list = interphoneSubMapper.getInterphoneSubList(keyword, null);
