From 9cc50d2e2c3fcfff3c6b95c09806d3881a97c5ff Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 02 Jan 2024 15:20:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/article/controller/ArticleController.java | 18 ++++++++++++++++--
1 files changed, 16 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 6cbb4ef..9f3f287 100644
--- a/src/main/java/org/springblade/modules/article/controller/ArticleController.java
+++ b/src/main/java/org/springblade/modules/article/controller/ArticleController.java
@@ -1,7 +1,9 @@
package org.springblade.modules.article.controller;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -15,8 +17,11 @@
import org.springblade.modules.article.service.ArticleService;
import org.springblade.modules.article.vo.ArticleVO;
import org.springframework.web.bind.annotation.*;
+
import javax.validation.Valid;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.List;
/**
* @author zhongrj
@@ -107,8 +112,17 @@
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入articleoy")
- public R<Article> detail(Article article) {
- Article detail = articleService.getOne(Condition.getQueryWrapper(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);
}
--
Gitblit v1.9.3