From a5fac95408a43ad43de9d88c30d06c0918c7bc8f Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 29 May 2024 11:14:44 +0800
Subject: [PATCH] 配置调整
---
src/main/java/org/springblade/modules/article/controller/ArticleController.java | 24 +++++++-----------------
1 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/src/main/java/org/springblade/modules/article/controller/ArticleController.java b/src/main/java/org/springblade/modules/article/controller/ArticleController.java
index 5965b10..77fec67 100644
--- a/src/main/java/org/springblade/modules/article/controller/ArticleController.java
+++ b/src/main/java/org/springblade/modules/article/controller/ArticleController.java
@@ -7,12 +7,11 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
+import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
-import org.springblade.es.service.ElasticsearchDocumentService;
-import org.springblade.es.vo.EsParam;
import org.springblade.modules.article.entity.Article;
import org.springblade.modules.article.service.ArticleService;
import org.springblade.modules.article.vo.ArticleVO;
@@ -21,6 +20,8 @@
import javax.validation.Valid;
import java.util.Date;
import java.util.List;
+
+import static org.springblade.common.cache.CacheNames.ARTICLE_KEY;
/**
* @author zhongrj
@@ -33,7 +34,6 @@
public class ArticleController {
private final ArticleService articleService;
- private final ElasticsearchDocumentService elasticsearchDocumentService;
/**
* 查询资讯分页信息
@@ -169,6 +169,7 @@
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改资讯信息", notes = "传入article")
public R submit(@RequestBody Article article) {
+ CacheUtil.clear(ARTICLE_KEY);
boolean flag = false;
if (null == article.getId()) {
flag = true;
@@ -178,19 +179,6 @@
}
article.setUpdateTime(new Date());
boolean saveOrUpdate = articleService.saveOrUpdate(article);
- if (saveOrUpdate){
- EsParam esParam = new EsParam();
- esParam.setIndexName("test");
- esParam.setTableName("jczz_article");
- if (flag) {
- // 更新到es库
- elasticsearchDocumentService.addArticle(esParam, article);
- }else {
- esParam.setTableId(article.getId().toString());
- // 更新
- elasticsearchDocumentService.update(esParam,article);
- }
- }
return R.status(saveOrUpdate);
}
@@ -204,7 +192,9 @@
@ApiOperationSupport(order = 8)
@ApiOperation(value = "删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
- return R.status(articleService.removeByIds(Func.toLongList(ids)));
+ List<Long> longs = Func.toLongList(ids);
+ boolean removeByIds = articleService.removeByIds(longs);
+ return R.status(removeByIds);
}
/**
--
Gitblit v1.9.3