From 7fa0a141a3c88ca90c67c966260bf26f03f255da Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 07 Jun 2022 16:00:09 +0800
Subject: [PATCH] 20220606
---
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ArticleServiceImpl.java | 63 +++++++++++++++++++++++++------
1 files changed, 51 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ArticleServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ArticleServiceImpl.java
index f0ef2c5..4bf31f5 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ArticleServiceImpl.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ArticleServiceImpl.java
@@ -12,10 +12,12 @@
import com.xcong.farmer.cms.modules.system.dto.AdminUpdateArticleDto;
import com.xcong.farmer.cms.modules.system.entity.ArticleEntity;
import com.xcong.farmer.cms.modules.system.entity.ColumnEntity;
+import com.xcong.farmer.cms.modules.system.entity.UserEntity;
import com.xcong.farmer.cms.modules.system.entity.UserRoleEntity;
import com.xcong.farmer.cms.modules.system.mapper.ArticleMapper;
import com.xcong.farmer.cms.modules.system.mapper.ColumnMapper;
import com.xcong.farmer.cms.modules.system.service.IArticleService;
+import com.xcong.farmer.cms.modules.system.util.LoginUserUtil;
import com.xcong.farmer.cms.modules.system.vo.AdminArticleVo;
import com.xcong.farmer.cms.modules.system.vo.AdminSeeArticleInfoVo;
import lombok.extern.slf4j.Slf4j;
@@ -40,6 +42,8 @@
@Override
public Result getArticleInPage(AdminArticleDto adminArticleDto) {
+ UserEntity userlogin = LoginUserUtil.getLoginUser();
+ long belongId = userlogin.getBelongId() == null ? 0L : userlogin.getBelongId();
Page<AdminArticleVo> page = new Page<>(adminArticleDto.getPageNum(), adminArticleDto.getPageSize());
ArticleEntity articleEntity = new ArticleEntity();
Long columnId = adminArticleDto.getColumnId() == null ? 0L : adminArticleDto.getColumnId();
@@ -50,6 +54,7 @@
if(StrUtil.isNotEmpty(title)){
articleEntity.setTitle(title);
}
+ articleEntity.setBelongId(belongId);
IPage<AdminArticleVo> list = this.baseMapper.selectAdminArticleInPage(page,articleEntity);
return Result.ok(list);
}
@@ -57,7 +62,10 @@
@Override
@Transactional
public Result addArticle(AdminAddArticleDto adminAddArticleDto) {
+ UserEntity userlogin = LoginUserUtil.getLoginUser();
+ long belongId = userlogin.getBelongId() == null ? 0L : userlogin.getBelongId();
ArticleEntity articleEntity = new ArticleEntity();
+ articleEntity.setBelongId(belongId);
String title = adminAddArticleDto.getTitle();
if(StrUtil.isEmpty(title)){
return Result.fail("请输入文章标题");
@@ -67,9 +75,13 @@
if(StrUtil.isNotEmpty(childTitle)){
articleEntity.setChildTitle(childTitle);
}
- String describe = adminAddArticleDto.getDescribe();
- if(StrUtil.isNotEmpty(describe)){
- articleEntity.setDescribe(describe);
+ String author = adminAddArticleDto.getAuthor();
+ if(StrUtil.isNotEmpty(author)){
+ articleEntity.setAuthor(author);
+ }
+ String remark = adminAddArticleDto.getRemark();
+ if(StrUtil.isNotEmpty(remark)){
+ articleEntity.setRemark(remark);
}
long columnId = adminAddArticleDto.getColumnId() == null ? 0L : adminAddArticleDto.getColumnId();
if(columnId == 0L){
@@ -135,6 +147,7 @@
if(ObjectUtil.isEmpty(articleEntity)){
return Result.fail("文章不存在");
}
+ articleEntity.getReleaseStatus();
String title = adminUpdateArticleDto.getTitle();
if(StrUtil.isEmpty(title)){
return Result.fail("请输入文章标题");
@@ -144,9 +157,14 @@
if(StrUtil.isNotEmpty(childTitle)){
articleEntity.setChildTitle(childTitle);
}
- String describe = adminUpdateArticleDto.getDescribe();
- if(StrUtil.isNotEmpty(describe)){
- articleEntity.setDescribe(describe);
+ String author = adminUpdateArticleDto.getAuthor();
+ if(StrUtil.isNotEmpty(author)){
+ articleEntity.setAuthor(author);
+ }
+
+ String remark = adminUpdateArticleDto.getRemark();
+ if(StrUtil.isNotEmpty(remark)){
+ articleEntity.setRemark(remark);
}
long columnId = adminUpdateArticleDto.getColumnId() == null ? 0L : adminUpdateArticleDto.getColumnId();
if(columnId == 0L){
@@ -164,19 +182,18 @@
articleEntity.setMainDiagram(mainDiagram);
}
String atlas = adminUpdateArticleDto.getAtlas();
- if(StrUtil.isNotEmpty(atlas)){
- articleEntity.setAtlas(atlas);
- }
+ articleEntity.setAtlas(atlas);
Date releaseTime = adminUpdateArticleDto.getReleaseTime();
if(ObjectUtil.isNotEmpty(releaseTime)){
articleEntity.setReleaseTime(releaseTime);
}
Integer releaseStatus = adminUpdateArticleDto.getReleaseStatus();
+ if(!ArticleEntity.RELEASE_STATUS_YES.equals(releaseStatus)){
+ return Result.fail("请先取消文章的发布状态");
+ }
articleEntity.setReleaseStatus(releaseStatus);
String articleDetails = adminUpdateArticleDto.getArticleDetails();
- if(StrUtil.isNotEmpty(articleDetails)){
- articleEntity.setArticleDetails(articleDetails);
- }
+ articleEntity.setArticleDetails(articleDetails);
this.baseMapper.updateById(articleEntity);
return Result.ok("更新成功");
}
@@ -196,4 +213,26 @@
}
return Result.ok("删除成功");
}
+
+ @Override
+ public Result updateStatusOff(Long id) {
+ ArticleEntity articleEntity = this.baseMapper.selectById(id);
+ if(ObjectUtil.isEmpty(articleEntity)){
+ return Result.fail("文章不存在");
+ }
+ articleEntity.setReleaseStatus(ArticleEntity.RELEASE_STATUS_NO);
+ this.baseMapper.updateById(articleEntity);
+ return Result.ok("操作成功");
+ }
+
+ @Override
+ public Result updateStatusOn(Long id) {
+ ArticleEntity articleEntity = this.baseMapper.selectById(id);
+ if(ObjectUtil.isEmpty(articleEntity)){
+ return Result.fail("文章不存在");
+ }
+ articleEntity.setReleaseStatus(ArticleEntity.RELEASE_STATUS_YES);
+ this.baseMapper.updateById(articleEntity);
+ return Result.ok("操作成功");
+ }
}
--
Gitblit v1.9.1