From 1cd1a9cfe4217d81487e4a4121da8612e7e10ab9 Mon Sep 17 00:00:00 2001 From: Qin Dong Ming <2720806930@qq.com> Date: Fri, 30 Aug 2024 19:05:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E7=BC=96=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/muyu/controller/EngIneController.java | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 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 f5e2efc..abe1dfa 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 @@ -5,10 +5,12 @@ 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.domain.EngineVersion; import com.muyu.domain.constants.PageResult; import com.muyu.req.EngineMaintenanceQueryReq; import com.muyu.req.EngineVersionListResp; import com.muyu.service.EngIneService; +import com.muyu.service.EngineVersionService; import jakarta.servlet.http.HttpServletResponse; import lombok.val; import org.springframework.beans.factory.annotation.Autowired; @@ -30,6 +32,9 @@ public class EngIneController extends BaseController { @Autowired EngIneService engIneService; + @Autowired + EngineVersionService engineVersionService; + @PostMapping("/getMaintenanceList") public Result> getMaintenanceList(@RequestBody EngineMaintenanceQueryReq engineMaintenanceQueryReq) { return engIneService.getMaintenanceList(engineMaintenanceQueryReq); @@ -114,13 +119,22 @@ public class EngIneController extends BaseController { */ @GetMapping("/findById/{id}") public Result findById(@PathVariable Long id) { - //通过版本查询引擎 List list = engIneService.list(new LambdaQueryWrapper<>() {{ eq(EngineMaintenance::getId, id); }}); - EngineMaintenance engineMaintenance = engIneService.getById(id); - val engineReq = EngineMaintenance.engineReqBuild(engineMaintenance); - engineReq.setEngineMaintenanceList(list); - return Result.success(engineReq); + return Result.success(list); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @GetMapping("/findById/{id}") + public Result findVersionById(@PathVariable("id") Long id) { + return Result.success(engineVersionService.list(new LambdaQueryWrapper<>(){{ + eq(EngineVersion::getId,id); + }})); } }