From 55876a1f84bd10ede26152eeee61ecfffcbc58dc Mon Sep 17 00:00:00 2001 From: gxwebsoft Date: Sun, 24 Mar 2024 20:23:13 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E7=AB=99=E5=AF=BC=E8=88=AA=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=EF=BC=9A=E6=96=B0=E5=A2=9E=E4=BA=A7=E5=93=81=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E7=9A=84=E7=B1=BB=E5=9E=8B=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cms/controller/DocsBookController.java | 27 +++++++++++++++++++ .../cms/controller/DocsController.java | 4 +-- .../java/com/gxwebsoft/cms/entity/Docs.java | 4 +++ .../com/gxwebsoft/cms/entity/Navigation.java | 3 +++ .../gxwebsoft/cms/mapper/xml/DocsMapper.xml | 3 ++- .../cms/mapper/xml/NavigationMapper.xml | 3 +++ .../gxwebsoft/cms/param/NavigationParam.java | 4 +++ 7 files changed, 45 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/gxwebsoft/cms/controller/DocsBookController.java b/src/main/java/com/gxwebsoft/cms/controller/DocsBookController.java index c044295..bd3328a 100644 --- a/src/main/java/com/gxwebsoft/cms/controller/DocsBookController.java +++ b/src/main/java/com/gxwebsoft/cms/controller/DocsBookController.java @@ -1,8 +1,13 @@ package com.gxwebsoft.cms.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.gxwebsoft.cms.entity.Docs; import com.gxwebsoft.cms.entity.DocsBook; +import com.gxwebsoft.cms.entity.DocsContent; import com.gxwebsoft.cms.param.DocsBookParam; import com.gxwebsoft.cms.service.DocsBookService; +import com.gxwebsoft.cms.service.DocsContentService; +import com.gxwebsoft.cms.service.DocsService; import com.gxwebsoft.common.core.web.ApiResult; import com.gxwebsoft.common.core.web.BaseController; import com.gxwebsoft.common.core.web.BatchParam; @@ -26,6 +31,10 @@ import java.util.List; public class DocsBookController extends BaseController { @Resource private DocsBookService docsBookService; + @Resource + private DocsService docsService; + @Resource + private DocsContentService contentService; @ApiOperation("分页查询书籍记录表") @GetMapping("/page") @@ -51,7 +60,25 @@ public class DocsBookController extends BaseController { @ApiOperation("添加书籍记录表") @PostMapping() public ApiResult save(@RequestBody DocsBook docsBook) { + if (docsBookService.count(new LambdaQueryWrapper().eq(DocsBook::getCode,docsBook.getCode())) > 0) { + return fail("该标识已存在"); + } if (docsBookService.save(docsBook)) { + // 添加默认章节 + final Docs docs = new Docs(); + final DocsContent content = new DocsContent(); + docs.setTitle("序言"); + docs.setBookId(docsBook.getBookId()); + docsService.save(docs); + content.setDocsId(docs.getDocsId()); + content.setContent("撰写中..."); + contentService.save(content); + docs.setTitle("系统简介"); + docs.setBookId(docsBook.getBookId()); + docsService.save(docs); + content.setDocsId(docs.getDocsId()); + content.setContent("撰写中..."); + contentService.save(content); return success("添加成功"); } return fail("添加失败"); diff --git a/src/main/java/com/gxwebsoft/cms/controller/DocsController.java b/src/main/java/com/gxwebsoft/cms/controller/DocsController.java index 6aae761..b2d71c3 100644 --- a/src/main/java/com/gxwebsoft/cms/controller/DocsController.java +++ b/src/main/java/com/gxwebsoft/cms/controller/DocsController.java @@ -120,9 +120,9 @@ public class DocsController extends BaseController { @PutMapping() public ApiResult update(@RequestBody Docs docs) { if (docsService.updateById(docs)) { - return success("修改成功"); + return success("保存成功"); } - return fail("修改失败"); + return fail("保存失败"); } @ApiOperation("删除文档管理记录表") diff --git a/src/main/java/com/gxwebsoft/cms/entity/Docs.java b/src/main/java/com/gxwebsoft/cms/entity/Docs.java index 8e996c1..ed690e2 100644 --- a/src/main/java/com/gxwebsoft/cms/entity/Docs.java +++ b/src/main/java/com/gxwebsoft/cms/entity/Docs.java @@ -80,4 +80,8 @@ public class Docs implements Serializable { @ApiModelProperty(value = "修改时间") private Date updateTime; + @ApiModelProperty(value = "书籍标识") + @TableField(exist = false) + private String code; + } diff --git a/src/main/java/com/gxwebsoft/cms/entity/Navigation.java b/src/main/java/com/gxwebsoft/cms/entity/Navigation.java index ff9ef61..1d4a4a7 100644 --- a/src/main/java/com/gxwebsoft/cms/entity/Navigation.java +++ b/src/main/java/com/gxwebsoft/cms/entity/Navigation.java @@ -77,6 +77,9 @@ public class Navigation implements Serializable { @ApiModelProperty(value = "表单ID") private Integer formId; + @ApiModelProperty(value = "绑定的知识文档") + private String bookCode; + @ApiModelProperty(value = "用户ID") private Integer userId; diff --git a/src/main/java/com/gxwebsoft/cms/mapper/xml/DocsMapper.xml b/src/main/java/com/gxwebsoft/cms/mapper/xml/DocsMapper.xml index 2453d86..95ddd5c 100644 --- a/src/main/java/com/gxwebsoft/cms/mapper/xml/DocsMapper.xml +++ b/src/main/java/com/gxwebsoft/cms/mapper/xml/DocsMapper.xml @@ -4,8 +4,9 @@ - SELECT a.* + SELECT a.*, b.code FROM cms_docs a + LEFT JOIN cms_docs_book b ON a.book_id = b.book_id AND a.docs_id = #{param.docsId} diff --git a/src/main/java/com/gxwebsoft/cms/mapper/xml/NavigationMapper.xml b/src/main/java/com/gxwebsoft/cms/mapper/xml/NavigationMapper.xml index 7b86b15..beae33b 100644 --- a/src/main/java/com/gxwebsoft/cms/mapper/xml/NavigationMapper.xml +++ b/src/main/java/com/gxwebsoft/cms/mapper/xml/NavigationMapper.xml @@ -41,6 +41,9 @@ AND a.page_id = #{param.pageId} + + AND a.book_code = #{param.bookCode} + AND a.active LIKE CONCAT('%', #{param.active}, '%') diff --git a/src/main/java/com/gxwebsoft/cms/param/NavigationParam.java b/src/main/java/com/gxwebsoft/cms/param/NavigationParam.java index 6418e1e..45b06d7 100644 --- a/src/main/java/com/gxwebsoft/cms/param/NavigationParam.java +++ b/src/main/java/com/gxwebsoft/cms/param/NavigationParam.java @@ -86,4 +86,8 @@ public class NavigationParam extends BaseParam { @QueryField(type = QueryType.EQ) private Integer pageId; + @ApiModelProperty(value = "知识文档标识") + @QueryField(type = QueryType.EQ) + private String bookCode; + }