From cd906c6c82dd28dbf1c53b03d382a5b14d67bb4a Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 08 Jul 2022 14:46:42 +0800
Subject: [PATCH] fix release companyId
---
src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminColumnController.java | 4 +++-
src/main/java/com/xcong/farmer/cms/modules/core/controller/CmsCoreController.java | 10 +++++++---
src/main/java/com/xcong/farmer/cms/modules/system/service/IReleaseService.java | 6 +++---
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ArticleServiceImpl.java | 3 ++-
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ReleaseServiceImpl.java | 19 ++++++++-----------
5 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/modules/core/controller/CmsCoreController.java b/src/main/java/com/xcong/farmer/cms/modules/core/controller/CmsCoreController.java
index 0212677..2f7fa6e 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/core/controller/CmsCoreController.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/core/controller/CmsCoreController.java
@@ -4,6 +4,7 @@
import com.xcong.farmer.cms.modules.core.service.ICmsCoreService;
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 io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -27,21 +28,24 @@
@ApiOperation(value = "发布文章", notes = "发布文章")
@PostMapping(value = "releaseArticle/{id}")
public Result releaseArticle(@PathVariable("id") Long id) {
- releaseService.releaseArticle(id);
+ Long companyId = LoginUserUtil.getCompanyId();
+ releaseService.releaseArticle(id, companyId);
return Result.ok("success");
}
@ApiOperation(value = "发布栏目", notes = "发布栏目")
@PostMapping(value = "releaseColumn/{type}/{id}")
public Result releaseColumn(@PathVariable("id") Long id, @PathVariable("type") Integer type) {
- releaseService.releaseColumn(id, type);
+ Long companyId = LoginUserUtil.getCompanyId();
+ releaseService.releaseColumn(id, type, companyId);
return Result.ok("success");
}
@ApiOperation(value = "发布首页", notes = "发布首页")
@PostMapping(value = "/releaseIndex")
public Result releaseIndex() {
- releaseService.releaseIndex();
+ Long companyId = LoginUserUtil.getCompanyId();
+ releaseService.releaseIndex(companyId);
return Result.ok("success");
}
}
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminColumnController.java b/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminColumnController.java
index 2ae35b5..c90acb6 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminColumnController.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminColumnController.java
@@ -4,6 +4,7 @@
import com.xcong.farmer.cms.modules.system.dto.*;
import com.xcong.farmer.cms.modules.system.service.IColumnService;
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.AdminColumnVo;
import com.xcong.farmer.cms.modules.system.vo.AdminSeeColumnInfoVo;
import com.xcong.farmer.cms.modules.system.vo.WebColumnVo;
@@ -76,7 +77,8 @@
@ApiOperation(value = "发布栏目", notes = "发布栏目")
@PostMapping(value = "/release")
public Result release(@RequestBody @Valid ReleaseColumnDto releaseColumnDto) {
- releaseService.releaseColumn(releaseColumnDto.getId(), releaseColumnDto.getType());
+ Long companyId = LoginUserUtil.getCompanyId();
+ releaseService.releaseColumn(releaseColumnDto.getId(), releaseColumnDto.getType(), companyId);
return Result.ok("发布成功");
}
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/IReleaseService.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/IReleaseService.java
index 6d3f296..aa53f79 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/IReleaseService.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/IReleaseService.java
@@ -3,9 +3,9 @@
public interface IReleaseService {
- void releaseArticle(Long id);
+ void releaseArticle(Long id, Long companyId);
- void releaseColumn(Long id, int type);
+ void releaseColumn(Long id, int type, Long companyId);
- void releaseIndex();
+ void releaseIndex(Long companyId);
}
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 56f8ed4..5a88510 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
@@ -286,6 +286,7 @@
@Override
public Result updateStatusOn(Long id) {
+ Long companyId = LoginUserUtil.getCompanyId();
ArticleEntity articleEntity = this.baseMapper.selectById(id);
if(ObjectUtil.isEmpty(articleEntity)){
return Result.fail("文章不存在");
@@ -293,7 +294,7 @@
articleEntity.setReleaseStatus(ArticleEntity.RELEASE_STATUS_YES);
this.baseMapper.updateById(articleEntity);
- releaseService.releaseArticle(articleEntity.getId());
+ releaseService.releaseArticle(articleEntity.getId(), companyId);
return Result.ok("操作成功");
}
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ReleaseServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ReleaseServiceImpl.java
index d0b0aeb..bd1a0ed 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ReleaseServiceImpl.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ReleaseServiceImpl.java
@@ -40,8 +40,7 @@
private final Executor executor = new ThreadPoolExecutor(5, 10, 600, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>());
@Override
- public void releaseArticle(Long id) {
- Long companyId = LoginUserUtil.getCompanyId();
+ public void releaseArticle(Long id, Long companyId) {
ArticleEntity article = articleMapper.selectById(id);
ColumnEntity column = columnMapper.selectById(article.getColumnId());
@@ -52,17 +51,16 @@
executor.execute(()->{
log.info("执行文章发布");
cmsCoreService.articleProcess(data, column.getArticleTemplate(), column.getPath());
- this.releaseColumn(column.getId(), 1);
+ this.releaseColumn(column.getId(), 1, companyId);
if (column.getParentId() != 0L) {
- releaseColumn(column.getParentId(), 1);
+ releaseColumn(column.getParentId(), 1, companyId);
}
- this.releaseIndex();
+ this.releaseIndex(companyId);
});
}
@Override
- public void releaseColumn(Long id, int type) {
- Long companyId = LoginUserUtil.getCompanyId();
+ public void releaseColumn(Long id, int type, Long companyId) {
ColumnEntity columnEntity = columnMapper.selectById(id);
Map<String, Object> map = new HashMap<>();
map.put("id", columnEntity.getId());
@@ -94,20 +92,19 @@
List<Long> ids = articleMapper.selectArticleIdsByColumnId(columnEntity.getId(), companyId, type);
cmsCoreService.articlesProcess(map, ids, columnEntity.getArticleTemplate(), columnEntity.getPath());
- releaseIndex();
+ releaseIndex(companyId);
});
executor.execute(() -> {
cmsCoreService.columnProcess(map, columnEntity.getListTemplate());
- releaseIndex();
+ releaseIndex(companyId);
});
}
}
@Override
- public void releaseIndex() {
+ public void releaseIndex(Long companyId) {
Map<String, Object> map = new HashMap<>();
- Long companyId = LoginUserUtil.getCompanyId();
map.put("companyId", companyId);
cmsCoreService.indexProcess(map, null);
--
Gitblit v1.9.1