From 9af76a989343d4cfbb5e900c97e7e440d6597647 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 26 Aug 2021 17:24:16 +0800
Subject: [PATCH] 新闻修改
---
src/main/java/org/springblade/modules/article/controller/ArticleController.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 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 ee29f50..bd73a6a 100644
--- a/src/main/java/org/springblade/modules/article/controller/ArticleController.java
+++ b/src/main/java/org/springblade/modules/article/controller/ArticleController.java
@@ -11,10 +11,14 @@
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.article.entity.Article;
import org.springblade.modules.article.service.ArticleService;
+import org.springblade.modules.article.vo.ArticleVo;
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;
/**
* @author zhongrj
@@ -37,11 +41,27 @@
* @return
*/
@GetMapping("/page")
- public R<IPage<Article>> page(HttpServletResponse response, Article article, Query query){
+ public R<IPage<Article>> page(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.selectArticlePage(Condition.getPage(query),article));
+ }
+
+ /**
+ *
+ * 查询资讯分页信息(角色权限)
+ * @param response
+ * @param article 资讯对象
+ * @param query 查询参数
+ * @return
+ */
+ @GetMapping("/pageDate")
+ public R<IPage<Article>> pageDate(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.pageDate(Condition.getPage(query),article));
}
/**
@@ -90,6 +110,10 @@
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入article")
public R submit(@Valid @RequestBody Article article) {
+ if (null==article.getId()){
+ article.setCreateTime(new Date());
+ }
+ article.setUpdateTime(new Date());
return R.status(articleService.saveOrUpdate(article));
}
--
Gitblit v1.9.3