From c10d6358b9f014375a13821465bc978d0c0da22e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 29 May 2024 17:17:08 +0800
Subject: [PATCH] 通过E呼即办数据统计
---
src/main/java/org/springblade/modules/article/controller/ArticleController.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 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 b9dc8ae..2bcf9d8 100644
--- a/src/main/java/org/springblade/modules/article/controller/ArticleController.java
+++ b/src/main/java/org/springblade/modules/article/controller/ArticleController.java
@@ -7,10 +7,13 @@
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;
@@ -19,6 +22,8 @@
import javax.validation.Valid;
import java.util.Date;
import java.util.List;
+
+import static org.springblade.common.cache.CacheNames.ARTICLE_KEY;
/**
* @author zhongrj
@@ -31,6 +36,7 @@
public class ArticleController {
private final ArticleService articleService;
+ private final ElasticsearchDocumentService elasticsearchDocumentService;
/**
* 查询资讯分页信息
@@ -165,14 +171,18 @@
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改资讯信息", notes = "传入article")
- public R submit(@RequestBody ArticleVO article) {
+ public R submit(@RequestBody Article article) {
+ CacheUtil.clear(ARTICLE_KEY);
+ boolean flag = false;
if (null == article.getId()) {
+ flag = true;
if (null == article.getCreateTime()) {
article.setCreateTime(new Date());
}
}
article.setUpdateTime(new Date());
- return R.status(articleService.saveOrUpdate(article));
+ boolean saveOrUpdate = articleService.saveOrUpdate(article);
+ return R.status(saveOrUpdate);
}
@@ -185,7 +195,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);
}
/**
@@ -219,15 +231,15 @@
}
/**
- * 通知公告表浏览数量加一
+ * 通知公告表浏览数量加一（反诈的居民查看会得积分）
*/
@PostMapping("/addNumber")
@ApiOperationSupport(order = 8)
@ApiOperation(value = "添加浏览数量", notes = "传入notice")
- public R addNumber(@Valid @RequestBody Article notice) {
+ public R addNumber(@Valid @RequestBody ArticleVO notice) {
UpdateWrapper<Article> objectUpdateWrapper = new UpdateWrapper<>();
objectUpdateWrapper.setSql("view_number = view_number + 1");
objectUpdateWrapper.eq("id", notice.getId());
- return R.status(articleService.update(null, objectUpdateWrapper));
+ return R.status(articleService.updateArticle(objectUpdateWrapper,notice.getId(),notice.getHouseCode()));
}
}
--
Gitblit v1.9.3