From 221874425f3b5620bf664174e2f1c6cb7cecaf2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Fri, 26 Sep 2025 14:01:53 +0800 Subject: [PATCH] =?UTF-8?q?feat(cms):=20=E6=B7=BB=E5=8A=A0=E6=A0=B9?= =?UTF-8?q?=E6=8D=AEcode=E6=9F=A5=E8=AF=A2=E6=96=87=E7=AB=A0=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在CmsArticleController中新增getByCode接口，支持通过文章编号查询文章- 在CmsArticle实体类中添加code字段，用于存储文章编号 - 在CmsArticleMapper.xml中添加code字段的查询条件支持 - 在CmsArticleParam参数类中添加code字段及查询注解 - 在CmsArticleService接口及实现类中添加getByIdCode方法 - 优化CmsAdServiceImpl中的默认排序规则，优先按sort_number排序 --- .../cms/controller/CmsArticleController.java | 7 +++++++ .../java/com/gxwebsoft/cms/entity/CmsArticle.java | 3 +++ .../gxwebsoft/cms/mapper/xml/CmsArticleMapper.xml | 3 +++ .../com/gxwebsoft/cms/param/CmsArticleParam.java | 4 ++++ .../com/gxwebsoft/cms/service/CmsArticleService.java | 2 ++ .../gxwebsoft/cms/service/impl/CmsAdServiceImpl.java | 4 ++-- .../cms/service/impl/CmsArticleServiceImpl.java | 12 ++++++++---- 7 files changed, 29 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/gxwebsoft/cms/controller/CmsArticleController.java b/src/main/java/com/gxwebsoft/cms/controller/CmsArticleController.java index 5da719a..98419cc 100644 --- a/src/main/java/com/gxwebsoft/cms/controller/CmsArticleController.java +++ b/src/main/java/com/gxwebsoft/cms/controller/CmsArticleController.java @@ -88,6 +88,13 @@ public class CmsArticleController extends BaseController { return fail("文章ID不存在",null); } + @Operation(summary = "根据code查询文章") + @GetMapping("/getByCode/{code}") + public ApiResult getByCode(@PathVariable("code") String code) { + final CmsArticle article = cmsArticleService.getByIdCode(code); + return success(article); + } + @PreAuthorize("hasAuthority('cms:cmsArticle:save')") @Operation(summary = "添加文章") @PostMapping() diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsArticle.java b/src/main/java/com/gxwebsoft/cms/entity/CmsArticle.java index cad1e40..e6832e8 100644 --- a/src/main/java/com/gxwebsoft/cms/entity/CmsArticle.java +++ b/src/main/java/com/gxwebsoft/cms/entity/CmsArticle.java @@ -40,6 +40,9 @@ public class CmsArticle implements Serializable { @Schema(description = "文章模型") private String model; + @Schema(description = "文章编号") + private String code; + @Schema(description = "内容模板页面") private String detail; diff --git a/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsArticleMapper.xml b/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsArticleMapper.xml index 8409288..d46baf8 100644 --- a/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsArticleMapper.xml +++ b/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsArticleMapper.xml @@ -25,6 +25,9 @@ AND a.model = #{param.model} + + AND a.code = #{param.code} + AND a.detail = #{param.detail} diff --git a/src/main/java/com/gxwebsoft/cms/param/CmsArticleParam.java b/src/main/java/com/gxwebsoft/cms/param/CmsArticleParam.java index 479f771..5a7d12f 100644 --- a/src/main/java/com/gxwebsoft/cms/param/CmsArticleParam.java +++ b/src/main/java/com/gxwebsoft/cms/param/CmsArticleParam.java @@ -45,6 +45,10 @@ public class CmsArticleParam extends BaseParam { @QueryField(type = QueryType.EQ) private String model; + @Schema(description = "文章编号") + @QueryField(type = QueryType.EQ) + private String code; + @Schema(description = "详情页标识") @QueryField(type = QueryType.EQ) private String detail; diff --git a/src/main/java/com/gxwebsoft/cms/service/CmsArticleService.java b/src/main/java/com/gxwebsoft/cms/service/CmsArticleService.java index 5eccbea..1d13e3c 100644 --- a/src/main/java/com/gxwebsoft/cms/service/CmsArticleService.java +++ b/src/main/java/com/gxwebsoft/cms/service/CmsArticleService.java @@ -45,4 +45,6 @@ public interface CmsArticleService extends IService { boolean saveRel(@Valid CmsArticle article); boolean updateByIdRel(CmsArticle article); + + CmsArticle getByIdCode(String code); } diff --git a/src/main/java/com/gxwebsoft/cms/service/impl/CmsAdServiceImpl.java b/src/main/java/com/gxwebsoft/cms/service/impl/CmsAdServiceImpl.java index 2988b3f..370d48d 100644 --- a/src/main/java/com/gxwebsoft/cms/service/impl/CmsAdServiceImpl.java +++ b/src/main/java/com/gxwebsoft/cms/service/impl/CmsAdServiceImpl.java @@ -26,7 +26,7 @@ public class CmsAdServiceImpl extends ServiceImpl implements @Override public PageResult pageRel(CmsAdParam param) { PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time asc"); + page.setDefaultOrder("sort_number asc, create_time asc"); List list = baseMapper.selectPageRel(page, param); return new PageResult<>(list, page.getTotal()); } @@ -36,7 +36,7 @@ public class CmsAdServiceImpl extends ServiceImpl implements List list = baseMapper.selectListRel(param); // 排序 PageParam page = new PageParam<>(); - page.setDefaultOrder("create_time asc"); + page.setDefaultOrder("sort_number asc, create_time asc"); return page.sortRecords(list); } diff --git a/src/main/java/com/gxwebsoft/cms/service/impl/CmsArticleServiceImpl.java b/src/main/java/com/gxwebsoft/cms/service/impl/CmsArticleServiceImpl.java index 6ade636..46b128b 100644 --- a/src/main/java/com/gxwebsoft/cms/service/impl/CmsArticleServiceImpl.java +++ b/src/main/java/com/gxwebsoft/cms/service/impl/CmsArticleServiceImpl.java @@ -5,13 +5,11 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gxwebsoft.cms.entity.CmsArticleContent; -import com.gxwebsoft.cms.entity.CmsModel; -import com.gxwebsoft.cms.entity.CmsNavigation; +import com.gxwebsoft.cms.entity.*; import com.gxwebsoft.cms.mapper.CmsArticleMapper; +import com.gxwebsoft.cms.param.CmsAdParam; import com.gxwebsoft.cms.service.CmsArticleContentService; import com.gxwebsoft.cms.service.CmsArticleService; -import com.gxwebsoft.cms.entity.CmsArticle; import com.gxwebsoft.cms.param.CmsArticleParam; import com.gxwebsoft.cms.service.CmsModelService; import com.gxwebsoft.cms.service.CmsNavigationService; @@ -243,4 +241,10 @@ public class CmsArticleServiceImpl extends ServiceImpl