diff --git a/cloud-etl-common/src/main/java/com/muyu/domain/EngineMaintenance.java b/cloud-etl-common/src/main/java/com/muyu/domain/EngineMaintenance.java index c470712..02264cc 100644 --- a/cloud-etl-common/src/main/java/com/muyu/domain/EngineMaintenance.java +++ b/cloud-etl-common/src/main/java/com/muyu/domain/EngineMaintenance.java @@ -65,6 +65,8 @@ public class EngineMaintenance extends BaseEntity { @Excel(name = "描述") private String description; + + /** * 查询构造器 */ diff --git a/cloud-etl-common/src/main/java/com/muyu/req/EngineMaintenanceQueryReq.java b/cloud-etl-common/src/main/java/com/muyu/req/EngineMaintenanceQueryReq.java index 83b2962..2b50a14 100644 --- a/cloud-etl-common/src/main/java/com/muyu/req/EngineMaintenanceQueryReq.java +++ b/cloud-etl-common/src/main/java/com/muyu/req/EngineMaintenanceQueryReq.java @@ -38,4 +38,7 @@ public class EngineMaintenanceQueryReq extends BaseEntity { /** 状态 */ private String status; + private Integer pageNum=1; + private Integer pageSize=5; + } diff --git a/cloud-etl-server/src/main/java/com/muyu/controller/EngIneController.java b/cloud-etl-server/src/main/java/com/muyu/controller/EngIneController.java index 8d58a1f..7a5781d 100644 --- a/cloud-etl-server/src/main/java/com/muyu/controller/EngIneController.java +++ b/cloud-etl-server/src/main/java/com/muyu/controller/EngIneController.java @@ -3,6 +3,7 @@ import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; import com.muyu.domain.EngineMaintenance; +import com.muyu.req.EngineMaintenanceQueryReq; import com.muyu.req.EngineVersionListResp; import com.muyu.service.EngIneService; import jakarta.servlet.http.HttpServletResponse; @@ -23,9 +24,9 @@ public class EngIneController extends BaseController { @Autowired EngIneService engIneService; - @GetMapping("/getMaintenanceList") - public Result> getMaintenanceList( ) { - List list = engIneService.list(); + @PostMapping("/getMaintenanceList") + public Result> getMaintenanceList(@RequestBody EngineMaintenanceQueryReq engineMaintenanceQueryReq) { + List list = engIneService.getMaintenanceList(engineMaintenanceQueryReq); return Result.success(list); } diff --git a/cloud-etl-server/src/main/java/com/muyu/service/EngIneService.java b/cloud-etl-server/src/main/java/com/muyu/service/EngIneService.java index a0a930a..203f8a4 100644 --- a/cloud-etl-server/src/main/java/com/muyu/service/EngIneService.java +++ b/cloud-etl-server/src/main/java/com/muyu/service/EngIneService.java @@ -38,4 +38,5 @@ public interface EngIneService extends IService { Result add(EngineMaintenance engineMaintenance); + List getMaintenanceList(EngineMaintenanceQueryReq engineMaintenanceQueryReq); } diff --git a/cloud-etl-server/src/main/java/com/muyu/service/serviceImpl/EngIneServiceImpl.java b/cloud-etl-server/src/main/java/com/muyu/service/serviceImpl/EngIneServiceImpl.java index 4ad9f22..0e74d06 100644 --- a/cloud-etl-server/src/main/java/com/muyu/service/serviceImpl/EngIneServiceImpl.java +++ b/cloud-etl-server/src/main/java/com/muyu/service/serviceImpl/EngIneServiceImpl.java @@ -2,6 +2,7 @@ package com.muyu.service.serviceImpl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.StringUtils; @@ -151,4 +152,39 @@ public class EngIneServiceImpl extends ServiceImpl getMaintenanceList(EngineMaintenanceQueryReq engineMaintenanceQueryReq) { + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + + if (StringUtils.isNotNull(engineMaintenanceQueryReq.getName())) { + queryWrapper.like(EngineMaintenance::getName, engineMaintenanceQueryReq.getName()); + } + + if (StringUtils.isNotNull(engineMaintenanceQueryReq.getType())) { + queryWrapper.eq(EngineMaintenance::getType, engineMaintenanceQueryReq.getType()); + } + + if (StringUtils.isNotNull(engineMaintenanceQueryReq.getScope())) { + queryWrapper.eq(EngineMaintenance::getScope, engineMaintenanceQueryReq.getScope()); + } + + if (StringUtils.isNotNull(engineMaintenanceQueryReq.getEngineCode())) { + queryWrapper.eq(EngineMaintenance::getEngineCode, engineMaintenanceQueryReq.getEngineCode()); + } + + if (StringUtils.isNotNull(engineMaintenanceQueryReq.getIsActivate())) { + queryWrapper.eq(EngineMaintenance::getIsActivate, engineMaintenanceQueryReq.getIsActivate()); + } + + if (StringUtils.isNotNull(engineMaintenanceQueryReq.getStatus())) { + queryWrapper.eq(EngineMaintenance::getStatus, engineMaintenanceQueryReq.getStatus()); + } + + //分页 + Page page = new Page<>(engineMaintenanceQueryReq.getPageNum(), engineMaintenanceQueryReq.getPageSize()); + + return list(queryWrapper); + } }