From fe87cd1b8168b9ef6f89e80bc5c1d6a5757af3c8 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 08 Jul 2022 11:46:31 +0800
Subject: [PATCH] 20220606
---
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ArticleServiceImpl.java | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 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 bc42bd5..4e8f2fc 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
@@ -1,6 +1,7 @@
package com.xcong.farmer.cms.modules.system.service.Impl;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.StringPool;
@@ -15,6 +16,7 @@
import com.xcong.farmer.cms.modules.system.mapper.ColumnMapper;
import com.xcong.farmer.cms.modules.system.mapper.CompanyMapper;
import com.xcong.farmer.cms.modules.system.service.IArticleService;
+import com.xcong.farmer.cms.modules.system.service.IReleaseService;
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;
@@ -46,7 +48,7 @@
private CompanyMapper companyMapper;
@Autowired
- private ICmsCoreService cmsCoreService;
+ private IReleaseService releaseService;
@Override
public Result getArticleInPage(AdminArticleDto adminArticleDto) {
@@ -54,14 +56,14 @@
long companyId = userlogin.getCompanyId() == null ? UserEntity.USER_BELONG_TOP : userlogin.getCompanyId();
Page<AdminArticleVo> page = new Page<>(adminArticleDto.getPageNum(), adminArticleDto.getPageSize());
ArticleEntity articleEntity = new ArticleEntity();
- String columnIdStr = adminArticleDto.getColumnId();
- if(StrUtil.isNotEmpty(columnIdStr)){
- long[] columnIdLongs = StrUtil.splitToLong(columnIdStr, StrUtil.COMMA);
+ String columnIdStrs = adminArticleDto.getColumnIdStr();
+ if(StrUtil.isNotEmpty(columnIdStrs)){
+ String[] columnIdStr = columnIdStrs.split(StringPool.COMMA);
List<Long> columnList = new ArrayList<>();
- for(long columnIdLong : columnIdLongs){
- columnList.add(columnIdLong);
+ for(String columnIdString : columnIdStr){
+ columnList.add(Long.valueOf(columnIdString));
}
- articleEntity.setColumnlist(columnList);
+ articleEntity.setColumnList(columnList);
}
String title = adminArticleDto.getTitle();
if(StrUtil.isNotEmpty(title)){
@@ -123,9 +125,6 @@
articleEntity.setIsTop(isTop);
Integer releaseStatus = adminAddArticleDto.getReleaseStatus();
articleEntity.setReleaseStatus(releaseStatus);
- if(ArticleEntity.RELEASE_STATUS_YES == releaseStatus){
- articleEntity.setReleaseTime(new Date());
- }
String articleDetails = adminAddArticleDto.getArticleDetails();
articleEntity.setArticleDetails(articleDetails);
String uploadFile = adminAddArticleDto.getUploadFile();
@@ -197,9 +196,6 @@
}
Integer releaseStatus = adminUpdateArticleDto.getReleaseStatus();
articleEntity.setReleaseStatus(releaseStatus);
- if(ArticleEntity.RELEASE_STATUS_YES == releaseStatus){
- articleEntity.setReleaseTime(new Date());
- }
String articleDetails = adminUpdateArticleDto.getArticleDetails();
articleEntity.setArticleDetails(articleDetails);
String uploadFile = adminUpdateArticleDto.getUploadFile();
@@ -285,6 +281,10 @@
if(UserEntity.USER_BELONG_TOP != companyId){
articleEntity.setCompanyId(companyId);
}
+ String timeType = webArticleInPageDto.getTimeType();
+ if(StrUtil.isNotEmpty(timeType)){
+ articleEntity.setTimeType(timeType);
+ }
IPage<WebArticleVo> list = this.baseMapper.selectWebArticleInPage(page,articleEntity);
return Result.ok(list);
}
@@ -296,8 +296,9 @@
return Result.fail("文章不存在");
}
articleEntity.setReleaseStatus(ArticleEntity.RELEASE_STATUS_YES);
- articleEntity.setReleaseTime(new Date());
this.baseMapper.updateById(articleEntity);
+
+ releaseService.releaseArticle(articleEntity.getId());
return Result.ok("操作成功");
}
@@ -306,7 +307,7 @@
Long companyId = 0L;
if(CollUtil.isNotEmpty(companyEntities)){
for(CompanyEntity companyEntity : companyEntities){
- boolean contains = StrUtil.contains(website, companyEntity.getWebAddress());
+ boolean contains = StrUtil.contains(companyEntity.getWebAddress(), website);
if(contains){
companyId = companyEntity.getId();
}
--
Gitblit v1.9.1