From 508a260a5a58ac92a3f3638947136645b1accdb1 Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Thu, 14 Dec 2023 11:47:47 +0800 Subject: [PATCH] prescript --- src/main/java/com/peanut/common/utils/R.java | 13 ++++++++ .../book/controller/PrescriptController.java | 32 ++++++++++++++++++- .../book/service/PrescriptService.java | 2 ++ .../impl/PrescriptCategoryServiceImpl.java | 3 +- .../service/impl/PrescriptServiceImpl.java | 11 +++++++ 5 files changed, 59 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/peanut/common/utils/R.java b/src/main/java/com/peanut/common/utils/R.java index 2dcda575..cc31159f 100644 --- a/src/main/java/com/peanut/common/utils/R.java +++ b/src/main/java/com/peanut/common/utils/R.java @@ -75,6 +75,19 @@ public class R extends HashMap { return r; } + public static R code(int code){ + R r = new R(); + r.put("code",code); + return r; + } + + public static R code(int code,String msg){ + R r = new R(); + r.put("code",code); + r.put("msg",msg); + return r; + } + public static R ok(String msg) { R r = new R(); r.put("msg", msg); diff --git a/src/main/java/com/peanut/modules/book/controller/PrescriptController.java b/src/main/java/com/peanut/modules/book/controller/PrescriptController.java index b90f4c2d..9701e08e 100644 --- a/src/main/java/com/peanut/modules/book/controller/PrescriptController.java +++ b/src/main/java/com/peanut/modules/book/controller/PrescriptController.java @@ -1,7 +1,9 @@ package com.peanut.modules.book.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.peanut.common.utils.R; import com.peanut.modules.book.entity.PrescriptCategoryEntity; +import com.peanut.modules.book.entity.PrescriptEntity; import com.peanut.modules.book.service.PrescriptCategoryService; import com.peanut.modules.book.service.PrescriptService; import lombok.extern.slf4j.Slf4j; @@ -22,6 +24,34 @@ public class PrescriptController { @Autowired private PrescriptCategoryService prescriptCategoryService; + + /** + * 获取方剂文章列表 + * @param map + * @return + */ + @RequestMapping("/getPrescriptList") + public R getPrescriptList(@RequestBody Map map){ + Integer limit = Integer.valueOf(map.get("limit").toString()); + Integer page = Integer.valueOf(map.get("page").toString()); + Integer prescriptCategoryId = Integer.valueOf(map.get("prescriptCategoryId").toString()); + Page prescriptList = prescriptService.getPrescriptList(prescriptCategoryId, limit, page); + return R.ok().put("page",prescriptList); + } + + /** + * 获取方剂文章详情 + * @param map + * @return + */ + @RequestMapping("/getPrescriptDetail") + public R getPrescriptDetail(@RequestBody Map map){ + Integer integer = Integer.valueOf(map.get("prescriptId").toString()); + PrescriptEntity prescript = prescriptService.getById(integer); + return R.ok().put("prescript",prescript); + } + + /** * 获取方剂分类列表 * @return @@ -67,7 +97,7 @@ public class PrescriptController { if(b){ return R.ok(); }else{ - return R.error(); + return R.error(303,"删除失败"); } } diff --git a/src/main/java/com/peanut/modules/book/service/PrescriptService.java b/src/main/java/com/peanut/modules/book/service/PrescriptService.java index 621582ba..4a6ebb22 100644 --- a/src/main/java/com/peanut/modules/book/service/PrescriptService.java +++ b/src/main/java/com/peanut/modules/book/service/PrescriptService.java @@ -1,5 +1,6 @@ package com.peanut.modules.book.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.peanut.modules.book.entity.PrescriptCategoryEntity; import com.peanut.modules.book.entity.PrescriptEntity; @@ -8,4 +9,5 @@ import java.util.List; public interface PrescriptService extends IService { + Page getPrescriptList(int prescriptCategoryId,int limit,int page); } diff --git a/src/main/java/com/peanut/modules/book/service/impl/PrescriptCategoryServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/PrescriptCategoryServiceImpl.java index a7da400c..e99a47ba 100644 --- a/src/main/java/com/peanut/modules/book/service/impl/PrescriptCategoryServiceImpl.java +++ b/src/main/java/com/peanut/modules/book/service/impl/PrescriptCategoryServiceImpl.java @@ -22,9 +22,10 @@ public class PrescriptCategoryServiceImpl extends ServiceImpl getPrescriptCategoryList() { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(PrescriptCategoryEntity::getPid,0); + wrapper.orderByDesc(PrescriptCategoryEntity::getSort); List list = list(wrapper); for (PrescriptCategoryEntity p:list){ - p.setChildren(list(new LambdaQueryWrapper().eq(PrescriptCategoryEntity::getPid,p.getPrescriptCategoryId()))); + p.setChildren(list(new LambdaQueryWrapper().eq(PrescriptCategoryEntity::getPid,p.getPrescriptCategoryId()).orderByDesc(PrescriptCategoryEntity::getSort))); } return list; } diff --git a/src/main/java/com/peanut/modules/book/service/impl/PrescriptServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/PrescriptServiceImpl.java index acc57f60..22e53fef 100644 --- a/src/main/java/com/peanut/modules/book/service/impl/PrescriptServiceImpl.java +++ b/src/main/java/com/peanut/modules/book/service/impl/PrescriptServiceImpl.java @@ -1,5 +1,7 @@ package com.peanut.modules.book.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.peanut.modules.book.dao.PrescriptCategoryDao; import com.peanut.modules.book.dao.PrescriptDao; @@ -18,4 +20,13 @@ public class PrescriptServiceImpl extends ServiceImpl getPrescriptList(int prescriptCategoryId, int limit, int page) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(prescriptCategoryId>0,PrescriptEntity::getPrescriptCategoryId,prescriptCategoryId); + wrapper.orderByDesc(PrescriptEntity::getSort); + Page prescriptEntityPage = getBaseMapper().selectPage(new Page<>(page, limit), wrapper); + return prescriptEntityPage; + } }