From 312dc55b139d16a73e58cd6899865e11e86c6fdc Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 04 Jul 2022 19:46:15 +0800
Subject: [PATCH] fix
---
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ArticleServiceImpl.java | 140 ++++++++++++++++++++++++++++++++--------------
1 files changed, 97 insertions(+), 43 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..ef72a33 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
@@ -6,19 +6,23 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.xcong.farmer.cms.common.response.Result;
+import com.xcong.farmer.cms.modules.core.service.ICmsCoreService;
import com.xcong.farmer.cms.modules.system.dto.AdminAddArticleDto;
import com.xcong.farmer.cms.modules.system.dto.AdminArticleDto;
import com.xcong.farmer.cms.modules.system.dto.AdminDeleteDto;
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;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
@@ -38,8 +42,13 @@
@Resource
private ColumnMapper columnMapper;
+ @Autowired
+ private ICmsCoreService cmsCoreService;
+
@Override
public Result getArticleInPage(AdminArticleDto adminArticleDto) {
+ UserEntity userlogin = LoginUserUtil.getLoginUser();
+ long companyId = userlogin.getCompanyId() == null ? UserEntity.USER_BELONG_TOP : userlogin.getCompanyId();
Page<AdminArticleVo> page = new Page<>(adminArticleDto.getPageNum(), adminArticleDto.getPageSize());
ArticleEntity articleEntity = new ArticleEntity();
Long columnId = adminArticleDto.getColumnId() == null ? 0L : adminArticleDto.getColumnId();
@@ -50,6 +59,9 @@
if(StrUtil.isNotEmpty(title)){
articleEntity.setTitle(title);
}
+ if(UserEntity.USER_BELONG_TOP != companyId){
+ articleEntity.setCompanyId(companyId);
+ }
IPage<AdminArticleVo> list = this.baseMapper.selectAdminArticleInPage(page,articleEntity);
return Result.ok(list);
}
@@ -57,24 +69,21 @@
@Override
@Transactional
public Result addArticle(AdminAddArticleDto adminAddArticleDto) {
+ UserEntity userlogin = LoginUserUtil.getLoginUser();
+ long companyId = userlogin.getCompanyId() == null ? UserEntity.USER_BELONG_TOP : userlogin.getCompanyId();
ArticleEntity articleEntity = new ArticleEntity();
+ articleEntity.setCompanyId(companyId);
String title = adminAddArticleDto.getTitle();
- if(StrUtil.isEmpty(title)){
- return Result.fail("请输入文章标题");
- }
articleEntity.setTitle(title);
String childTitle = adminAddArticleDto.getChildTitle();
- if(StrUtil.isNotEmpty(childTitle)){
articleEntity.setChildTitle(childTitle);
- }
- String describe = adminAddArticleDto.getDescribe();
- if(StrUtil.isNotEmpty(describe)){
- articleEntity.setDescribe(describe);
- }
+ String author = adminAddArticleDto.getAuthor();
+ articleEntity.setAuthor(author);
+ String authorBelong = adminAddArticleDto.getAuthorBelong();
+ articleEntity.setAuthorBelong(authorBelong);
+ String remark = adminAddArticleDto.getRemark();
+ articleEntity.setRemark(remark);
long columnId = adminAddArticleDto.getColumnId() == null ? 0L : adminAddArticleDto.getColumnId();
- if(columnId == 0L){
- return Result.fail("请选择文章栏目");
- }
ColumnEntity columnEntity = columnMapper.selectById(columnId);
if(ObjectUtil.isEmpty(columnEntity)){
return Result.fail("请选择文章栏目");
@@ -83,24 +92,22 @@
Integer visits = adminAddArticleDto.getVisits() == null ? 0 : adminAddArticleDto.getVisits();
articleEntity.setVisits(visits);
String mainDiagram = adminAddArticleDto.getMainDiagram();
- if(StrUtil.isNotEmpty(mainDiagram)){
articleEntity.setMainDiagram(mainDiagram);
- }
String atlas = adminAddArticleDto.getAtlas();
- if(StrUtil.isNotEmpty(atlas)){
articleEntity.setAtlas(atlas);
- }
Date releaseTime = adminAddArticleDto.getReleaseTime();
- if(ObjectUtil.isNotEmpty(releaseTime)){
articleEntity.setReleaseTime(releaseTime);
- }
+ Integer isTop = adminAddArticleDto.getIsTop();
+ articleEntity.setIsTop(isTop);
Integer releaseStatus = adminAddArticleDto.getReleaseStatus();
articleEntity.setReleaseStatus(releaseStatus);
String articleDetails = adminAddArticleDto.getArticleDetails();
- if(StrUtil.isNotEmpty(articleDetails)){
articleEntity.setArticleDetails(articleDetails);
- }
+ String uploadFile = adminAddArticleDto.getUploadFile();
+ articleEntity.setUploadFile(uploadFile);
+ articleEntity.setArticleUrl(adminAddArticleDto.getArticleUrl());
+ articleEntity.setType(adminAddArticleDto.getType());
this.baseMapper.insert(articleEntity);
return Result.ok("添加成功");
}
@@ -135,23 +142,20 @@
if(ObjectUtil.isEmpty(articleEntity)){
return Result.fail("文章不存在");
}
+ Integer isTop = adminUpdateArticleDto.getIsTop();
+ articleEntity.setIsTop(isTop);
+ Integer releaseStatus = adminUpdateArticleDto.getReleaseStatus();
+ articleEntity.setReleaseStatus(releaseStatus);
String title = adminUpdateArticleDto.getTitle();
- if(StrUtil.isEmpty(title)){
- return Result.fail("请输入文章标题");
- }
articleEntity.setTitle(title);
String childTitle = adminUpdateArticleDto.getChildTitle();
- if(StrUtil.isNotEmpty(childTitle)){
- articleEntity.setChildTitle(childTitle);
- }
- String describe = adminUpdateArticleDto.getDescribe();
- if(StrUtil.isNotEmpty(describe)){
- articleEntity.setDescribe(describe);
- }
+ articleEntity.setChildTitle(childTitle);
+ String author = adminUpdateArticleDto.getAuthor();
+ articleEntity.setAuthor(author);
+
+ String remark = adminUpdateArticleDto.getRemark();
+ articleEntity.setRemark(remark);
long columnId = adminUpdateArticleDto.getColumnId() == null ? 0L : adminUpdateArticleDto.getColumnId();
- if(columnId == 0L){
- return Result.fail("请选择文章栏目");
- }
ColumnEntity columnEntity = columnMapper.selectById(columnId);
if(ObjectUtil.isEmpty(columnEntity)){
return Result.fail("请选择文章栏目");
@@ -160,23 +164,21 @@
Integer visits = adminUpdateArticleDto.getVisits() == null ? 0 : adminUpdateArticleDto.getVisits();
articleEntity.setVisits(visits);
String mainDiagram = adminUpdateArticleDto.getMainDiagram();
- if(StrUtil.isNotEmpty(mainDiagram)){
- articleEntity.setMainDiagram(mainDiagram);
- }
+ 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();
articleEntity.setReleaseStatus(releaseStatus);
String articleDetails = adminUpdateArticleDto.getArticleDetails();
- if(StrUtil.isNotEmpty(articleDetails)){
- articleEntity.setArticleDetails(articleDetails);
- }
+ articleEntity.setArticleDetails(articleDetails);
+ String uploadFile = adminUpdateArticleDto.getUploadFile();
+ articleEntity.setUploadFile(uploadFile);
+
+ articleEntity.setArticleUrl(adminUpdateArticleDto.getArticleUrl());
+ articleEntity.setType(adminUpdateArticleDto.getType());
this.baseMapper.updateById(articleEntity);
return Result.ok("更新成功");
}
@@ -196,4 +198,56 @@
}
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 updateIstop(Long id) {
+ ArticleEntity articleEntity = this.baseMapper.selectById(id);
+ if(ObjectUtil.isEmpty(articleEntity)){
+ return Result.fail("文章不存在");
+ }
+ articleEntity.setIsTop(ArticleEntity.ISTOP_YES);
+ this.baseMapper.updateById(articleEntity);
+ return Result.ok("操作成功");
+ }
+
+ @Override
+ public Result updateIstopOff(Long id) {
+ ArticleEntity articleEntity = this.baseMapper.selectById(id);
+ if(ObjectUtil.isEmpty(articleEntity)){
+ return Result.fail("文章不存在");
+ }
+ articleEntity.setIsTop(ArticleEntity.ISTOP_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("操作成功");
+ }
+
+ @Override
+ public void releaseArticle(Long id) {
+ ArticleEntity article = this.baseMapper.selectById(id);
+
+ ColumnEntity column = columnMapper.selectById(article.getColumnId());
+ cmsCoreService.articleProcess(article.getId(), column.getArticleTemplate());
+ }
}
--
Gitblit v1.9.1