From 882edc4b8ac7cb11ec9d536b5573df2c7ed512ef Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 20 七月 2023 20:22:12 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/ArticleServiceImpl.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 54 insertions(+), 6 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/ArticleServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/ArticleServiceImpl.java
index f414ccb..2d95f6e 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/ArticleServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/ArticleServiceImpl.java
@@ -4,9 +4,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
+import com.ruoyi.system.api.domain.dto.MgtClassNumDto;
import com.ruoyi.system.domain.dto.MgtArticleEditDto;
import com.ruoyi.system.domain.dto.MgtArticlePageDto;
import com.ruoyi.system.domain.pojo.config.Article;
@@ -16,9 +18,12 @@
import com.ruoyi.system.domain.vo.MgtArticlePageVo;
import com.ruoyi.system.mapper.config.ArticleMapper;
import com.ruoyi.system.service.config.ArticleService;
+import com.ruoyi.system.service.config.SysClassificationService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
import java.util.Date;
import java.util.List;
@@ -35,6 +40,9 @@
@Resource
private ArticleMapper articleMapper;
+
+ @Resource
+ private SysClassificationService sysClassificationService;
/**
* @description 删除文章分类
@@ -70,32 +78,66 @@
*/
@Override
public void editMgtArticle(MgtArticleEditDto mgtArticleEditDto){
+ // 创建MgtClassNumDto对象
+ MgtClassNumDto mgtClassNumDto = new MgtClassNumDto();
+ // 创建Article对象
Article article;
- Article articleSame = this.getOne(new LambdaQueryWrapper<Article>().eq(Article::getDelFlag,0).eq(Article::getArticleTitle,mgtArticleEditDto.getArticleTitle()),false);
- if(mgtArticleEditDto.getArticleId()!=null){
- if(articleSame!=null&&!articleSame.getArticleId().equals(mgtArticleEditDto.getArticleId())){
+ // 根据文章标题查询文章是否存在
+ Article articleSame = this.getOne(new LambdaQueryWrapper<Article>()
+ .eq(Article::getDelFlag, 0)
+ .eq(Article::getArticleTitle, mgtArticleEditDto.getArticleTitle()), false);
+ // 如果文章ID不为空
+ if (mgtArticleEditDto.getArticleId() != null) {
+ // 如果存在相同标题的文章并且文章ID不同，则抛出异常
+ if (articleSame != null && !articleSame.getArticleId().equals(mgtArticleEditDto.getArticleId())) {
throw new ServiceException(AppErrorConstant.ARTICLE_DOUBLE);
}
+ // 根据文章ID获取文章对象
article = this.getById(mgtArticleEditDto.getArticleId());
- }else{
- if(articleSame!=null){
+ // 如果类别ID不为空并且文章的类别ID不为空并且类别ID不同，则设置子类别ID和新增类别ID
+ if (mgtArticleEditDto.getClassId() != null && article.getClassId() != null
+ && !mgtArticleEditDto.getClassId().equals(article.getClassId())) {
+ mgtClassNumDto.setSubClassId(article.getClassId());
+ mgtClassNumDto.setAddClassId(mgtArticleEditDto.getClassId());
+ }
+ // 如果类别ID不为空并且文章的类别ID为空，则设置新增类别ID
+ else if (mgtArticleEditDto.getClassId() != null && article.getClassId() == null) {
+ mgtClassNumDto.setAddClassId(mgtArticleEditDto.getClassId());
+ }
+ }
+ // 如果文章ID为空
+ else {
+ // 如果存在相同标题的文章，则抛出异常
+ if (articleSame != null) {
throw new ServiceException(AppErrorConstant.ARTICLE_DOUBLE);
}
+ // 创建新的文章对象
article = new Article();
article.setDelFlag(0);
article.setCreateTime(new Date());
article.setCreateUserId(mgtArticleEditDto.getUserId());
+ mgtClassNumDto.setAddClassId(mgtArticleEditDto.getClassId());
}
+ // 设置文章的类别ID、排序、标题、简介、封面、视频、更新时间和更新用户ID
article.setClassId(mgtArticleEditDto.getClassId());
article.setArticleSort(mgtArticleEditDto.getArticleSort());
article.setArticleTitle(mgtArticleEditDto.getArticleTitle());
article.setArticleIntroduce(mgtArticleEditDto.getArticleIntroduce());
- article.setArticleDetail(mgtArticleEditDto.getArticleDetail());
article.setArticleCover(mgtArticleEditDto.getArticleCover());
article.setArticleVideo(mgtArticleEditDto.getArticleVideo());
article.setUpdateTime(new Date());
article.setUpdateUserId(mgtArticleEditDto.getUserId());
+ // 处理文章详情
+ String articleDetail = mgtArticleEditDto.getArticleDetail();
+ if (StringUtils.isNotBlank(articleDetail)) {
+ byte[] decodedBytes = Base64.getDecoder().decode(articleDetail);
+ articleDetail = new String(decodedBytes, StandardCharsets.UTF_8);
+ article.setArticleDetail(articleDetail);
+ }
+ // 保存或更新文章
this.saveOrUpdate(article);
+ // 更新类别数量
+ sysClassificationService.changeClassNum(mgtClassNumDto);
}
@@ -113,6 +155,12 @@
article.setUpdateTime(new Date());
article.setUpdateUserId(mgtBaseGetDto.getUserId());
this.saveOrUpdate(article);
+ if(article.getClassId()!=null){
+ MgtClassNumDto mgtClassNumDto = new MgtClassNumDto();
+ mgtClassNumDto.setSubClassId(article.getClassId());
+ sysClassificationService.changeClassNum(mgtClassNumDto);
+ }
+
}
/**
--
Gitblit v1.7.1