From 8d88be960e33c96214c7f5c10cca09c02173630a Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Fri, 15 Dec 2023 15:39:57 +0800 Subject: [PATCH] prescript --- .../book/controller/PrescriptController.java | 6 ++++-- .../modules/book/entity/PrescriptEntity.java | 3 +++ .../modules/book/service/PrescriptService.java | 2 ++ .../impl/PrescriptCategoryServiceImpl.java | 6 +++--- .../book/service/impl/PrescriptServiceImpl.java | 15 ++++++++++++--- 5 files changed, 24 insertions(+), 8 deletions(-) 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 e647b5f2..f7146253 100644 --- a/src/main/java/com/peanut/modules/book/controller/PrescriptController.java +++ b/src/main/java/com/peanut/modules/book/controller/PrescriptController.java @@ -119,8 +119,10 @@ public class PrescriptController { */ @RequestMapping("/prescriptListForJF") public R prescriptListForJF(@RequestBody Map map){ - - return R.ok(); + Integer limit = Integer.valueOf(map.get("limit").toString()); + Integer page = Integer.valueOf(map.get("page").toString()); + Page prescriptListForJF = prescriptService.getPrescriptListForJF(limit, page); + return R.ok().put("page",prescriptListForJF); } private R getR(@RequestBody Map map) { diff --git a/src/main/java/com/peanut/modules/book/entity/PrescriptEntity.java b/src/main/java/com/peanut/modules/book/entity/PrescriptEntity.java index c5971266..712a0f5b 100644 --- a/src/main/java/com/peanut/modules/book/entity/PrescriptEntity.java +++ b/src/main/java/com/peanut/modules/book/entity/PrescriptEntity.java @@ -37,6 +37,9 @@ public class PrescriptEntity { @TableLogic private Integer delFlag; + @TableField(exist = false) + private String letter; + @TableField(exist = false) private List imageList; 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 4a6ebb22..31465d6e 100644 --- a/src/main/java/com/peanut/modules/book/service/PrescriptService.java +++ b/src/main/java/com/peanut/modules/book/service/PrescriptService.java @@ -10,4 +10,6 @@ import java.util.List; public interface PrescriptService extends IService { Page getPrescriptList(int prescriptCategoryId,int limit,int page); + + Page getPrescriptListForJF(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 068b0df8..1633f02b 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,10 +22,10 @@ public class PrescriptCategoryServiceImpl extends ServiceImpl getPrescriptCategoryList() { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(PrescriptCategoryEntity::getPid,0); - wrapper.orderByDesc(PrescriptCategoryEntity::getSort); + wrapper.orderByAsc(PrescriptCategoryEntity::getSort); List list = list(wrapper); for (PrescriptCategoryEntity p:list){ - p.setChildren(list(new LambdaQueryWrapper().eq(PrescriptCategoryEntity::getPid,p.getPrescriptCategoryId()).orderByDesc(PrescriptCategoryEntity::getSort))); + p.setChildren(list(new LambdaQueryWrapper().eq(PrescriptCategoryEntity::getPid,p.getPrescriptCategoryId()).orderByAsc(PrescriptCategoryEntity::getSort))); } return list; } @@ -52,7 +52,7 @@ public class PrescriptCategoryServiceImpl extends ServiceImpl getCategoryByPid(Integer pid) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(PrescriptCategoryEntity::getPid,pid); - wrapper.orderByDesc(PrescriptCategoryEntity::getSort); + wrapper.orderByAsc(PrescriptCategoryEntity::getSort); List list = list(wrapper); 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 2135300d..99cf49a4 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 @@ -2,6 +2,7 @@ package com.peanut.modules.book.service.impl; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.peanut.modules.book.dao.PrescriptCategoryDao; @@ -19,10 +20,10 @@ import java.util.List; @Slf4j @Service("prescriptService") public class PrescriptServiceImpl extends ServiceImpl implements PrescriptService { + @Autowired private PrescriptCategoryDao prescriptCategoryDao; - @Override public Page getPrescriptList(int prescriptCategoryId, int limit, int page) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); @@ -31,7 +32,7 @@ public class PrescriptServiceImpl extends ServiceImpl prescriptEntityPage = getBaseMapper().selectPage(new Page<>(page, limit), wrapper); for (PrescriptEntity p : prescriptEntityPage.getRecords()){ p.setImageList(JSON.parseArray(p.getImages(),String.class)); @@ -40,6 +41,15 @@ public class PrescriptServiceImpl extends ServiceImpl getPrescriptListForJF(int limit, int page) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.select("prescript.*","to_first_pinyin(title) letter"); + wrapper.eq("prescript_category_id",3); + wrapper.orderByAsc("CONVERT(title USING gbk) COLLATE gbk_chinese_ci"); + Page page1 = page(new Page(page, limit), wrapper); + return page1; + } private PrescriptCategoryEntity getTree(int categoryId){ PrescriptCategoryEntity prescriptCategoryEntity = prescriptCategoryDao.selectOne(new LambdaQueryWrapper().eq(PrescriptCategoryEntity::getPrescriptCategoryId,categoryId)); @@ -53,7 +63,6 @@ public class PrescriptServiceImpl extends ServiceImpl list){ PrescriptCategoryEntity prescriptCategoryEntity = prescriptCategoryDao.selectOne(new LambdaQueryWrapper().eq(PrescriptCategoryEntity::getPrescriptCategoryId, id)); - List prescriptCategoryEntities = prescriptCategoryDao.selectList(new LambdaQueryWrapper().eq(PrescriptCategoryEntity::getPid, prescriptCategoryEntity.getPrescriptCategoryId())); for (PrescriptCategoryEntity p : prescriptCategoryEntities){ getCategoryIds(p.getPrescriptCategoryId(),list);