From e8ccc7e43cccaf365673d443ff2488123d202c8c Mon Sep 17 00:00:00 2001 From: Qin Dong Ming <2720806930@qq.com> Date: Thu, 22 Aug 2024 20:35:44 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E5=88=99=E5=BC=95=E6=93=8E=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/muyu/controller/EngIneController.java | 7 +-- .../java/com/muyu/service/EngIneService.java | 2 +- .../serviceImpl/EngIneServiceImpl.java | 50 +++++++++---------- 3 files changed, 28 insertions(+), 31 deletions(-) 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 ea6e595..292768d 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 @@ -2,10 +2,7 @@ package com.muyu.controller; import com.muyu.common.core.domain.Result; import com.muyu.common.core.web.controller.BaseController; -import com.muyu.common.core.web.page.TableDataInfo; -import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.domain.EngineMaintenance; -import com.muyu.req.EngineMaintenanceQueryReq; import com.muyu.service.EngIneService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -30,8 +27,8 @@ public class EngIneController extends BaseController { EngIneService engIneService; @GetMapping("/getMaintenanceList") - public Result> getMaintenanceList(@RequestBody EngineMaintenance engineMaintenanceQueryReq) { - List list = engIneService.list(engineMaintenanceQueryReq); + public Result> getMaintenanceList() { + List list = engIneService.list(); 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 77d02d2..af9c04c 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 @@ -14,5 +14,5 @@ import java.util.List; * @Date:2024/8/22 15:37 */ public interface EngIneService extends IService { - List list(EngineMaintenance engineMaintenance); + List list( ); } 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 f4374c9..965d650 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 @@ -26,33 +26,33 @@ public class EngIneServiceImpl extends ServiceImpl list(EngineMaintenance engineMaintenance) { + public List list( ) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - - if (StringUtils.isNotNull(engineMaintenance.getName())) { - queryWrapper.like(EngineMaintenance::getName, engineMaintenance.getName()); - } - - if (StringUtils.isNotNull(engineMaintenance.getType())) { - queryWrapper.eq(EngineMaintenance::getType, engineMaintenance.getType()); - } - - if (StringUtils.isNotNull(engineMaintenance.getScope())) { - queryWrapper.eq(EngineMaintenance::getScope, engineMaintenance.getScope()); - } - - if (StringUtils.isNotNull(engineMaintenance.getEngineCode())) { - queryWrapper.eq(EngineMaintenance::getEngineCode, engineMaintenance.getEngineCode()); - } - - if (StringUtils.isNotNull(engineMaintenance.getIsActivate())) { - queryWrapper.eq(EngineMaintenance::getIsActivate, engineMaintenance.getIsActivate()); - } - - if (StringUtils.isNotNull(engineMaintenance.getStatus())) { - queryWrapper.eq(EngineMaintenance::getStatus, engineMaintenance.getStatus()); - } +// +// if (StringUtils.isNotNull(engineMaintenance.getName())) { +// queryWrapper.like(EngineMaintenance::getName, engineMaintenance.getName()); +// } +// +// if (StringUtils.isNotNull(engineMaintenance.getType())) { +// queryWrapper.eq(EngineMaintenance::getType, engineMaintenance.getType()); +// } +// +// if (StringUtils.isNotNull(engineMaintenance.getScope())) { +// queryWrapper.eq(EngineMaintenance::getScope, engineMaintenance.getScope()); +// } +// +// if (StringUtils.isNotNull(engineMaintenance.getEngineCode())) { +// queryWrapper.eq(EngineMaintenance::getEngineCode, engineMaintenance.getEngineCode()); +// } +// +// if (StringUtils.isNotNull(engineMaintenance.getIsActivate())) { +// queryWrapper.eq(EngineMaintenance::getIsActivate, engineMaintenance.getIsActivate()); +// } +// +// if (StringUtils.isNotNull(engineMaintenance.getStatus())) { +// queryWrapper.eq(EngineMaintenance::getStatus, engineMaintenance.getStatus()); +// } return list(queryWrapper); }