From b39cc2beacc1ec2e37cff349cae42e420105c8a6 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 05 Nov 2021 14:29:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/article/controller/ArticleController.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 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 40077e3..b0b1d7d 100644
--- a/src/main/java/org/springblade/modules/article/controller/ArticleController.java
+++ b/src/main/java/org/springblade/modules/article/controller/ArticleController.java
@@ -12,12 +12,11 @@
import org.springblade.modules.article.entity.Article;
import org.springblade.modules.article.service.ArticleService;
import org.springblade.modules.article.vo.ArticleVo;
+import org.springblade.modules.words.DemoApplication;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
-import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
import java.util.Date;
/**
@@ -64,6 +63,14 @@
return R.data(articleService.pageDate(Condition.getPage(query),article));
}
+ @GetMapping("/pageCollectList")
+ public R<IPage<Article>> pageCollectList(HttpServletResponse response, ArticleVo article, Query query){
+ response.setHeader("Access-Control-Allow-Origin", "*");
+ response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+ response.setHeader("Access-Control-Allow-Credentials","true");
+ return R.data(articleService.pageCollectList(Condition.getPage(query),article));
+ }
+
/**
*
* 查询资讯分页信息(角色权限)附带点赞评论数
@@ -79,6 +86,18 @@
response.setHeader("Access-Control-Allow-Credentials","true");
return R.data(articleService.pageLikes(Condition.getPage(query),article));
}
+
+ /**
+ * 查询已收藏的资讯
+ */
+ @GetMapping("/pageCollect")
+ public R<IPage<Article>> pageCollect(HttpServletResponse response, ArticleVo article, Query query){
+ response.setHeader("Access-Control-Allow-Origin", "*");
+ response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+ response.setHeader("Access-Control-Allow-Credentials","true");
+ return R.data(articleService.pageCollect(Condition.getPage(query),article));
+ }
+
/**
* 资讯详情
@@ -131,6 +150,12 @@
article.setCreateTime(new Date());
}
}
+
+ if (article.getContent() != null && article.getContent() != ""){
+ String content = "";
+ content = DemoApplication.interceptWords(article.getContent());
+ article.setContent(content);
+ }
article.setUpdateTime(new Date());
return R.status(articleService.saveOrUpdate(article));
}
--
Gitblit v1.9.3