From c4e2c196aad8af656d94bc47e9f1a80bc504b5d7 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 14 Mar 2024 18:15:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/article/controller/ArticleController.java | 55 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 40 insertions(+), 15 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 3fe350a..b9dc8ae 100644
--- a/src/main/java/org/springblade/modules/article/controller/ArticleController.java
+++ b/src/main/java/org/springblade/modules/article/controller/ArticleController.java
@@ -18,6 +18,7 @@
import javax.validation.Valid;
import java.util.Date;
+import java.util.List;
/**
* @author zhongrj
@@ -33,8 +34,9 @@
/**
* 查询资讯分页信息
- * @param article 资讯对象
- * @param query 查询参数
+ *
+ * @param article 资讯对象
+ * @param query 查询参数
* @return
*/
@GetMapping("/pageWeb")
@@ -42,10 +44,16 @@
return R.data(articleService.selectArticlePage(Condition.getPage(query), article));
}
+ @GetMapping("/getArticleByDistrictId")
+ public R<List<ArticleVO>> getArticleByDistrictId(ArticleVO article) {
+ return R.data(articleService.getArticleByDistrictId(article));
+ }
+
/**
* 查询资讯分页信息-app
- * @param article 资讯对象
- * @param query 查询参数
+ *
+ * @param article 资讯对象
+ * @param query 查询参数
* @return
*/
@GetMapping("/page")
@@ -55,8 +63,9 @@
/**
* 敏感词预警
- * @param article 资讯对象
- * @param query 查询参数
+ *
+ * @param article 资讯对象
+ * @param query 查询参数
* @return
*/
@GetMapping("/pageWords")
@@ -66,8 +75,9 @@
/**
* 查询资讯分页信息(角色权限)
- * @param article 资讯对象
- * @param query 查询参数
+ *
+ * @param article 资讯对象
+ * @param query 查询参数
* @return
*/
@GetMapping("/pageDate")
@@ -82,8 +92,9 @@
/**
* 查询资讯分页信息(角色权限)附带点赞评论数
- * @param article 资讯对象
- * @param query 查询参数
+ *
+ * @param article 资讯对象
+ * @param query 查询参数
* @return
*/
@GetMapping("/pageLikes")
@@ -103,17 +114,22 @@
/**
* 资讯详情
*
- * @param article 资讯查询对象
+ * @param article 资讯查询对象
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入articleoy")
- public R<Article> detail(Article article) {
- Article detail = articleService.getArticleOne(article);
+ public R<Article> detail(ArticleVO article) {
+ ArticleVO detail = articleService.getArticleOne(article);
UpdateWrapper<Article> objectUpdateWrapper = new UpdateWrapper<>();
objectUpdateWrapper.setSql("view_number = view_number + 1");
objectUpdateWrapper.eq("id", article.getId());
articleService.update(null, objectUpdateWrapper);
+// List<List<String>> lists = new ArrayList<>();
+// if (StringUtils.isNotBlank(detail.getArticleRange())) {
+// lists = (List<List<String>>) JSON.parse(detail.getArticleRange());
+// }
+// detail.setArticleList(lists);
return R.data(detail);
}
@@ -131,6 +147,7 @@
/**
* 修改资讯信息
+ *
* @param article 资讯对象
*/
@PostMapping("/update")
@@ -146,6 +163,8 @@
* @param article 资讯对象信息
*/
@PostMapping("/submit")
+ @ApiOperationSupport(order = 6)
+ @ApiOperation(value = "新增或修改资讯信息", notes = "传入article")
public R submit(@RequestBody ArticleVO article) {
if (null == article.getId()) {
if (null == article.getCreateTime()) {
@@ -159,6 +178,7 @@
/**
* 删除资讯信息
+ *
* @param ids 资讯主键id,id集合
*/
@PostMapping("/remove")
@@ -172,6 +192,8 @@
* 批量修改评论区状态
*/
@PostMapping("/upcomment")
+ @ApiOperationSupport(order = 5)
+ @ApiOperation(value = "批量修改评论区状态", notes = "传入article")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids, String type) {
String[] split = ids.split(",");
String strArrays = "";
@@ -184,11 +206,14 @@
/**
* 查询个人资讯
+ *
* @param article
* @param query
* @return
*/
@GetMapping("/selectArticleG")
+ @ApiOperationSupport(order = 5)
+ @ApiOperation(value = "查询个人资讯", notes = "传入article")
public R<IPage<Article>> selectArticleG(ArticleVO article, Query query) {
return R.data(articleService.selectArticleG(Condition.getPage(query), article));
}
@@ -202,7 +227,7 @@
public R addNumber(@Valid @RequestBody Article 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));
+ objectUpdateWrapper.eq("id", notice.getId());
+ return R.status(articleService.update(null, objectUpdateWrapper));
}
}
--
Gitblit v1.9.3