From 3e10ed1b548ad28e5ddae251b91a268afefe2bf5 Mon Sep 17 00:00:00 2001 From: otto <731554297@qq.com> Date: Thu, 14 May 2026 14:22:03 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E8=B6=85=E7=AE=97=E4=B8=93=E5=8C=BA):=20?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=96=87=E7=AB=A0=E6=97=B6=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E6=96=87=E7=AB=A0id=EF=BC=88=E8=8B=A5=E6=98=AF=E4=BC=9A?= =?UTF-8?q?=E5=91=98=E6=9B=B4=E6=96=B0=E6=96=87=E7=AB=A0=EF=BC=8C=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=BE=85=E5=AE=A1=E6=A0=B8=E6=96=87=E7=AB=A0id?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cms/doc/controller/CmsDocController.java | 2 +- .../cms/doc/service/ICmsDocService.java | 4 ++-- .../cms/doc/service/impl/CmsDocServiceImpl.java | 13 ++++++++----- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/microservices-modules/microservices-modules-cms/src/main/java/com/microservices/cms/doc/controller/CmsDocController.java b/microservices-modules/microservices-modules-cms/src/main/java/com/microservices/cms/doc/controller/CmsDocController.java index 82aa61d7d..162911f05 100644 --- a/microservices-modules/microservices-modules-cms/src/main/java/com/microservices/cms/doc/controller/CmsDocController.java +++ b/microservices-modules/microservices-modules-cms/src/main/java/com/microservices/cms/doc/controller/CmsDocController.java @@ -219,7 +219,7 @@ public class CmsDocController extends BaseController { @ApiOperation("更新文章") public AjaxResult edit(@ApiParam(name = "id", value = "文章Id") @PathVariable Long id, @ApiParam(name = "cmsDoc", value = "文章实体对象") @RequestBody CmsDocDto cmsDocDto) { - return toAjax(cmsDocService.updateCmsDoc(id, cmsDocDto)); + return success(cmsDocService.updateCmsDoc(id, cmsDocDto)); } /** diff --git a/microservices-modules/microservices-modules-cms/src/main/java/com/microservices/cms/doc/service/ICmsDocService.java b/microservices-modules/microservices-modules-cms/src/main/java/com/microservices/cms/doc/service/ICmsDocService.java index a0f78e9c9..39807d490 100644 --- a/microservices-modules/microservices-modules-cms/src/main/java/com/microservices/cms/doc/service/ICmsDocService.java +++ b/microservices-modules/microservices-modules-cms/src/main/java/com/microservices/cms/doc/service/ICmsDocService.java @@ -56,9 +56,9 @@ public interface ICmsDocService { * * @param id * @param cmsDocDto 文章信息 - * @return 结果 + * @return 结果 文章id */ - public boolean updateCmsDoc(Long id, CmsDocDto cmsDocDto); + public Long updateCmsDoc(Long id, CmsDocDto cmsDocDto); /** * 批量删除文章信息 diff --git a/microservices-modules/microservices-modules-cms/src/main/java/com/microservices/cms/doc/service/impl/CmsDocServiceImpl.java b/microservices-modules/microservices-modules-cms/src/main/java/com/microservices/cms/doc/service/impl/CmsDocServiceImpl.java index 8adf2ef20..cccbb391b 100644 --- a/microservices-modules/microservices-modules-cms/src/main/java/com/microservices/cms/doc/service/impl/CmsDocServiceImpl.java +++ b/microservices-modules/microservices-modules-cms/src/main/java/com/microservices/cms/doc/service/impl/CmsDocServiceImpl.java @@ -711,11 +711,12 @@ public class CmsDocServiceImpl implements ICmsDocService { * @return 结果 */ @Override - public boolean updateCmsDoc(Long id, CmsDocDto cmsDocDto) { + public Long updateCmsDoc(Long id, CmsDocDto cmsDocDto) { CmsDoc oldCmsDoc = cmsDocMapper.selectCmsDocById(id); checkCmsLockStatus(oldCmsDoc.getDeptId()); if (!hasRepoRelatedChanged(oldCmsDoc, cmsDocDto)) { - return cmsDocMapper.updateCmsDoc(oldCmsDoc) > 0; + cmsDocMapper.updateCmsDoc(oldCmsDoc); + return oldCmsDoc.getId(); } // 当文章名称发生更改时，判断文章名是否在当前栏目下已存在 if (StringUtils.isNotEmpty(cmsDocDto.getName()) && !cmsDocDto.getName().equals(oldCmsDoc.getName())) { @@ -752,7 +753,8 @@ public class CmsDocServiceImpl implements ICmsDocService { if (oldCmsDoc.getAuditType() != null && oldCmsDoc.getAuditType().contains(DocAndZoneOperation.OPERATION_CREATE.getOperationCode())) { deleteTmpBranchIfBranchExist(oldCmsDoc); cmsDocMapper.deleteCmsDocById(id); - return directlyInsertAuditedCmsDocWhenZoneHasNoAuditRequired(cmsDocDto, oldCmsDoc); + directlyInsertAuditedCmsDocWhenZoneHasNoAuditRequired(cmsDocDto, oldCmsDoc); + return oldCmsDoc.getId(); } } String branchName = CmsConstants.BRANCH_MASTER; @@ -760,7 +762,8 @@ public class CmsDocServiceImpl implements ICmsDocService { oldCmsDoc.setAuditStatus(DocAuditStatus.AUDIT_PASS.getAuditCode()); oldCmsDoc.setAuditTmpBranchName(null); oldCmsDoc.setKeywords(cmsDocDto.getKeywords()); - return updateCmsCommonDatabase(oldCmsDoc, CmsConstants.BRANCH_MASTER) > 0; + updateCmsCommonDatabase(oldCmsDoc, CmsConstants.BRANCH_MASTER); + return oldCmsDoc.getId(); } else { CmsDoc newDocWithAudit = new CmsDoc(); @@ -779,7 +782,7 @@ public class CmsDocServiceImpl implements ICmsDocService { } } cmsAsyncService.asyncUpdateBranchAndFileAndCreatePR(newDocWithAudit, cmsDocDto); - return true; + return newDocWithAudit.getId(); } }