Gitlink
/
microservices
0
1
Fork 12
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request '更新文章时返回文章id（若是会员更新文章，返回待审核文章id）' (#1123) from otto/microservices:chaosuan_zone into chaosuan_zone

This commit is contained in:
otto 2026-05-14 14:23:57 +08:00
parent 883fdfdb75 3e10ed1b54
commit e3d33c0507
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
microservices-modules/microservices-modules-cms/src/main/java/com/microservices/cms/doc/controller/CmsDocController.java
View File

@ -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));
}
/**

4
microservices-modules/microservices-modules-cms/src/main/java/com/microservices/cms/doc/service/ICmsDocService.java
View File

@ -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);
/**
* 批量删除文章信息

13
microservices-modules/microservices-modules-cms/src/main/java/com/microservices/cms/doc/service/impl/CmsDocServiceImpl.java
View File

@ -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();
}
}