From 27d9559a8df2320e965172b93e3ed347481f14b3 Mon Sep 17 00:00:00 2001 From: mhsnet Date: Fri, 26 May 2023 09:23:21 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=96=B9=E6=A1=88=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E5=85=B3=E8=81=94=E6=A1=88=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/demo/yxgwf/controller/SolutionController.java | 6 ++++++ .../jeecg/modules/demo/yxgwf/mapper/SolutionMapper.java | 3 +++ .../jeecg/modules/demo/yxgwf/mapper/xml/SolutionMapper.xml | 3 +++ .../jeecg/modules/demo/yxgwf/service/ISolutionService.java | 1 + .../demo/yxgwf/service/impl/SolutionServiceImpl.java | 7 +++++++ .../jeecg/modules/demo/yxgwf/mapper/xml/SolutionMapper.xml | 3 +++ 6 files changed, 23 insertions(+) diff --git a/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/controller/SolutionController.java b/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/controller/SolutionController.java index 40eaa3f..86c0f46 100644 --- a/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/controller/SolutionController.java +++ b/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/controller/SolutionController.java @@ -42,4 +42,10 @@ public class SolutionController { public Result getInfo(@RequestParam(name="id",required=true) String id) { return Result.OK(this.solutionService.query().select("id","title","des","img","date","cases","article").eq("id",id).one()); } + + @ApiOperation(value="解决方案含案例详情", notes="解决方案含案例详情") + @GetMapping("/info-all") + public Result getInfoAll(@RequestParam(name="id",required=true) String id) { + return Result.OK(this.solutionService.getInfoAll(id)); + } } diff --git a/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/mapper/SolutionMapper.java b/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/mapper/SolutionMapper.java index d624b6d..19e66bd 100644 --- a/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/mapper/SolutionMapper.java +++ b/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/mapper/SolutionMapper.java @@ -2,8 +2,10 @@ package org.jeecg.modules.demo.yxgwf.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.jeecg.modules.demo.test.entity.JeecgOrderCustomer; +import org.jeecg.modules.demo.yxgwf.entity.Case; import org.jeecg.modules.demo.yxgwf.entity.Solution; import org.springframework.stereotype.Service; @@ -12,4 +14,5 @@ import java.util.List; @Service public interface SolutionMapper extends BaseMapper { public List getAll(); + Solution getInfoAll(@Param("id") String id); } diff --git a/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/mapper/xml/SolutionMapper.xml b/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/mapper/xml/SolutionMapper.xml index feda69a..0ce7b4c 100644 --- a/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/mapper/xml/SolutionMapper.xml +++ b/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/mapper/xml/SolutionMapper.xml @@ -4,4 +4,7 @@ + \ No newline at end of file diff --git a/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/service/ISolutionService.java b/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/service/ISolutionService.java index 2849d3b..eb624ef 100644 --- a/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/service/ISolutionService.java +++ b/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/service/ISolutionService.java @@ -7,4 +7,5 @@ import java.util.List; public interface ISolutionService extends IService { List getAll(); + Solution getInfoAll(String id); } diff --git a/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/service/impl/SolutionServiceImpl.java b/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/service/impl/SolutionServiceImpl.java index 8890c9f..9de935b 100644 --- a/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/service/impl/SolutionServiceImpl.java +++ b/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/service/impl/SolutionServiceImpl.java @@ -27,4 +27,11 @@ public class SolutionServiceImpl extends ServiceImpl i }); return solution_list; } + public Solution getInfoAll(String id) { + Solution solution = solutionMapper.getInfoAll(id); + String[] caseIds = solution.cases.split(","); + List case_list = caseMapper.getAll(caseIds); + solution.caseslist = case_list; + return solution; + } } diff --git a/linus-boot/linus-module-demo/target/classes/org/jeecg/modules/demo/yxgwf/mapper/xml/SolutionMapper.xml b/linus-boot/linus-module-demo/target/classes/org/jeecg/modules/demo/yxgwf/mapper/xml/SolutionMapper.xml index feda69a..0ce7b4c 100644 --- a/linus-boot/linus-module-demo/target/classes/org/jeecg/modules/demo/yxgwf/mapper/xml/SolutionMapper.xml +++ b/linus-boot/linus-module-demo/target/classes/org/jeecg/modules/demo/yxgwf/mapper/xml/SolutionMapper.xml @@ -4,4 +4,7 @@ + \ No newline at end of file