From 2a909fef9c28dd368eb7f63833f0128afb0d072f Mon Sep 17 00:00:00 2001
From: gxwebsoft <Websoft5386339>
Date: Sat, 9 Mar 2024 20:41:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E4=B8=8A=E4=B8=80?=
 =?UTF-8?q?=E7=AF=87=E4=B8=8B=E4=B8=80=E7=AF=87=E6=96=87=E7=AB=A0=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cms/controller/ArticleController.java     | 42 ++++++++++++++++++-
 .../cms/controller/WebsiteController.java     |  1 -
 .../com/gxwebsoft/cms/entity/Article.java     |  3 ++
 3 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/cms/controller/ArticleController.java b/src/main/java/com/gxwebsoft/cms/controller/ArticleController.java
index e98f20f..314e8bc 100644
--- a/src/main/java/com/gxwebsoft/cms/controller/ArticleController.java
+++ b/src/main/java/com/gxwebsoft/cms/controller/ArticleController.java
@@ -1,7 +1,11 @@
 package com.gxwebsoft.cms.controller;
 
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.gxwebsoft.cms.entity.Article;
+import com.gxwebsoft.cms.entity.ArticleCategory;
 import com.gxwebsoft.cms.param.ArticleParam;
+import com.gxwebsoft.cms.service.ArticleCategoryService;
 import com.gxwebsoft.cms.service.ArticleService;
 import com.gxwebsoft.common.core.web.*;
 import com.gxwebsoft.common.system.entity.User;
@@ -24,6 +28,8 @@ import java.util.List;
 public class ArticleController extends BaseController {
     @Resource
     private ArticleService articleService;
+    @Resource
+    private ArticleCategoryService articleCategoryService;
 
     @ApiOperation("分页查询文章记录表")
     @GetMapping("/page")
@@ -50,6 +56,35 @@ public class ArticleController extends BaseController {
     public ApiResult<Article> get(@PathVariable("id") Integer id) {
       // 使用关联查询
       Article article = articleService.getByIdRel(id);
+      // 更新阅读数量
+      article.setActualViews(article.getActualViews() + 1);
+      articleService.updateById(article);
+      return success(article);
+    }
+
+    @ApiOperation("读取上一篇")
+    @GetMapping("/getPrevious/{id}")
+    public ApiResult<Article> getPrevious(@PathVariable("id") Integer id) {
+      LambdaQueryWrapper<Article> wrapper = new LambdaQueryWrapper<>();
+      wrapper.lt(Article::getArticleId,id);
+      wrapper.eq(Article::getStatus,0);
+      wrapper.eq(Article::getType,0);
+      wrapper.orderByDesc(Article::getArticleId);
+      wrapper.last("limit 1");
+      final Article article = articleService.getOne(wrapper);
+      return success(article);
+    }
+
+    @ApiOperation("读取下一篇")
+    @GetMapping("/getNext/{id}")
+    public ApiResult<Article> getNext(@PathVariable("id") Integer id) {
+      LambdaQueryWrapper<Article> wrapper = new LambdaQueryWrapper<>();
+      wrapper.gt(Article::getArticleId,id);
+      wrapper.eq(Article::getStatus,0);
+      wrapper.eq(Article::getType,0);
+      wrapper.orderByAsc(Article::getArticleId);
+      wrapper.last("limit 1");
+      final Article article = articleService.getOne(wrapper);
       return success(article);
     }
 
@@ -61,8 +96,11 @@ public class ArticleController extends BaseController {
         if (loginUser != null) {
           article.setUserId(loginUser.getUserId());
         }
+        // 同步类型
+        final ArticleCategory category = articleCategoryService.getById(article.getCategoryId());
+        article.setType(category.getType());
         if (articleService.save(article)) {
-            return success("添加成功");
+          return success("添加成功");
         }
         return fail("添加失败");
     }
@@ -71,6 +109,8 @@ public class ArticleController extends BaseController {
     @PutMapping()
     public ApiResult<?> update(@RequestBody Article article) {
         if (articleService.updateById(article)) {
+            article.setUpdateTime(DateUtil.date());
+            articleService.updateById(article);
             return success("修改成功");
         }
         return fail("修改失败");
diff --git a/src/main/java/com/gxwebsoft/cms/controller/WebsiteController.java b/src/main/java/com/gxwebsoft/cms/controller/WebsiteController.java
index 00da57e..87d1946 100644
--- a/src/main/java/com/gxwebsoft/cms/controller/WebsiteController.java
+++ b/src/main/java/com/gxwebsoft/cms/controller/WebsiteController.java
@@ -164,7 +164,6 @@ public class WebsiteController extends BaseController {
     @ApiOperation("清除缓存")
     @DeleteMapping("/clearSiteInfo/{key}")
     public ApiResult<?> clearSiteInfo(@PathVariable("key") String key) {
-      System.out.println("key = " + key);
       final String siteInfo = redisUtil.get(key);
       if(StrUtil.isNotBlank(siteInfo)){
         redisUtil.delete(key);
diff --git a/src/main/java/com/gxwebsoft/cms/entity/Article.java b/src/main/java/com/gxwebsoft/cms/entity/Article.java
index e53e86b..308beeb 100644
--- a/src/main/java/com/gxwebsoft/cms/entity/Article.java
+++ b/src/main/java/com/gxwebsoft/cms/entity/Article.java
@@ -29,6 +29,9 @@ public class Article implements Serializable {
     @ApiModelProperty(value = "文章标题")
     private String title;
 
+    @ApiModelProperty(value = "类型 0列表 1页面 2外链")
+    private Integer type;
+
     @ApiModelProperty(value = "列表显示方式(10小图展示 20大图展示)")
     private Integer showType;