增加目录树功能

Author: yqz

OpenBlog-business/src/main/java/com/yqz/openblog/article/controller/ArticleController.java

@@ -33,8 +33,9 @@ public ArticleController(ArticleService articleService, CurrentUser currentUser)
     @GetMapping("/articles")
     public ApiResponse<PageResult<ArticleListItemResponse>> listPublished(
             @RequestParam(defaultValue = "0") int page,
-            @RequestParam(defaultValue = "20") int size) {
-        return ApiResponse.ok(articleService.listPublished(page, size));
+            @RequestParam(defaultValue = "20") int size,
+            @RequestParam(required = false) Long categoryId) {
+        return ApiResponse.ok(articleService.listPublished(page, size, categoryId));
     }
 
     @GetMapping("/articles/{articleId}")

OpenBlog-business/src/main/java/com/yqz/openblog/article/dto/ArticleDetailResponse.java

@@ -20,6 +20,9 @@ public class ArticleDetailResponse {
     private Long commentCount;
     private Instant createdAt;
     private Instant updatedAt;
+    private Long categoryId;
+    private String categoryName;
+    private java.util.List<String> categoryPath;
 
     public Long getId() {
         return id;
@@ -140,5 +143,29 @@ public Instant getUpdatedAt() {
     public void setUpdatedAt(Instant updatedAt) {
         this.updatedAt = updatedAt;
     }
+
+    public Long getCategoryId() {
+        return categoryId;
+    }
+
+    public void setCategoryId(Long categoryId) {
+        this.categoryId = categoryId;
+    }
+
+    public String getCategoryName() {
+        return categoryName;
+    }
+
+    public void setCategoryName(String categoryName) {
+        this.categoryName = categoryName;
+    }
+
+    public java.util.List<String> getCategoryPath() {
+        return categoryPath;
+    }
+
+    public void setCategoryPath(java.util.List<String> categoryPath) {
+        this.categoryPath = categoryPath;
+    }
 }
 

OpenBlog-business/src/main/java/com/yqz/openblog/article/dto/ArticleListItemResponse.java

@@ -17,6 +17,9 @@ public class ArticleListItemResponse {
     private Long viewCount;
     private Long favoriteCount;
     private Long commentCount;
+    private Long categoryId;
+    private String categoryName;
+    private java.util.List<String> categoryPath;
 
     public Long getId() {
         return id;
@@ -113,5 +116,29 @@ public Long getCommentCount() {
     public void setCommentCount(Long commentCount) {
         this.commentCount = commentCount;
     }
+
+    public Long getCategoryId() {
+        return categoryId;
+    }
+
+    public void setCategoryId(Long categoryId) {
+        this.categoryId = categoryId;
+    }
+
+    public String getCategoryName() {
+        return categoryName;
+    }
+
+    public void setCategoryName(String categoryName) {
+        this.categoryName = categoryName;
+    }
+
+    public java.util.List<String> getCategoryPath() {
+        return categoryPath;
+    }
+
+    public void setCategoryPath(java.util.List<String> categoryPath) {
+        this.categoryPath = categoryPath;
+    }
 }
 

OpenBlog-business/src/main/java/com/yqz/openblog/article/dto/ArticlePublishedContentCachePayload.java

@@ -20,6 +20,9 @@ public class ArticlePublishedContentCachePayload {
     private ArticleStatus status;
     private Instant createdAt;
     private Instant updatedAt;
+    private Long categoryId;
+    private String categoryName;
+    private java.util.List<String> categoryPath;
 
     public static ArticlePublishedContentCachePayload fromDetail(ArticleDetailResponse d) {
         ArticlePublishedContentCachePayload p = new ArticlePublishedContentCachePayload();
@@ -34,6 +37,9 @@ public static ArticlePublishedContentCachePayload fromDetail(ArticleDetailRespon
         p.setStatus(d.getStatus());
         p.setCreatedAt(d.getCreatedAt());
         p.setUpdatedAt(d.getUpdatedAt());
+        p.setCategoryId(d.getCategoryId());
+        p.setCategoryName(d.getCategoryName());
+        p.setCategoryPath(d.getCategoryPath());
         return p;
     }
 
@@ -124,4 +130,28 @@ public Instant getUpdatedAt() {
     public void setUpdatedAt(Instant updatedAt) {
         this.updatedAt = updatedAt;
     }
+
+    public Long getCategoryId() {
+        return categoryId;
+    }
+
+    public void setCategoryId(Long categoryId) {
+        this.categoryId = categoryId;
+    }
+
+    public String getCategoryName() {
+        return categoryName;
+    }
+
+    public void setCategoryName(String categoryName) {
+        this.categoryName = categoryName;
+    }
+
+    public java.util.List<String> getCategoryPath() {
+        return categoryPath;
+    }
+
+    public void setCategoryPath(java.util.List<String> categoryPath) {
+        this.categoryPath = categoryPath;
+    }
 }

OpenBlog-business/src/main/java/com/yqz/openblog/article/service/ArticleService.java

@@ -9,36 +9,42 @@
 import com.yqz.openblog.article.repo.ArticleMapper;
 import com.yqz.openblog.common.BizException;
 import com.yqz.openblog.common.PageResult;
+import com.yqz.openblog.category.service.CategoryService;
 import com.yqz.openblog.user.entity.User;
 import com.yqz.openblog.user.repo.UserMapper;
-import org.springframework.stereotype.Service;
-
-import java.time.Instant;
-import java.util.List;
-import java.util.Optional;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
+import java.time.Instant;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+
+import org.springframework.stereotype.Service;
+
 @Service
 public class ArticleService {
 
     private final ArticleMapper articleMapper;
     private final UserMapper userMapper;
     private final ArticleViewService articleViewService;
     private final ArticlePublishedContentCacheService publishedContentCache;
+    private final CategoryService categoryService;
 
     public ArticleService(
             ArticleMapper articleMapper,
             UserMapper userMapper,
             ArticleViewService articleViewService,
-            ArticlePublishedContentCacheService publishedContentCache) {
+            ArticlePublishedContentCacheService publishedContentCache,
+            CategoryService categoryService) {
         this.articleMapper = articleMapper;
         this.userMapper = userMapper;
         this.articleViewService = articleViewService;
         this.publishedContentCache = publishedContentCache;
+        this.categoryService = categoryService;
     }
 
     public ArticleListItemResponse mapListItem(Article a) {
@@ -56,6 +62,7 @@ public ArticleListItemResponse mapListItem(Article a) {
         resp.setViewCount(a.getViewCount() == null ? 0L : a.getViewCount());
         resp.setFavoriteCount(a.getFavoriteCount());
         resp.setCommentCount(a.getCommentCount());
+        applyCategory(resp, a.getCategoryId());
         return resp;
     }
 
@@ -77,9 +84,24 @@ public ArticleDetailResponse mapDetail(Article a) {
         resp.setCommentCount(a.getCommentCount());
         resp.setCreatedAt(a.getCreatedAt());
         resp.setUpdatedAt(a.getUpdatedAt());
+        applyCategory(resp, a.getCategoryId());
         return resp;
     }
 
+    private void applyCategory(ArticleListItemResponse resp, Long categoryId) {
+        CategoryService.CategoryMeta meta = categoryService.resolveMeta(categoryId);
+        resp.setCategoryId(meta.getCategoryId());
+        resp.setCategoryName(meta.getCategoryName());
+        resp.setCategoryPath(meta.getCategoryPath());
+    }
+
+    private void applyCategory(ArticleDetailResponse resp, Long categoryId) {
+        CategoryService.CategoryMeta meta = categoryService.resolveMeta(categoryId);
+        resp.setCategoryId(meta.getCategoryId());
+        resp.setCategoryName(meta.getCategoryName());
+        resp.setCategoryPath(meta.getCategoryPath());
+    }
+
     /**
      * 缓存命中时：正文等用缓存，计数类字段始终用当前数据库行（避免阅读量/评论数长期失真）。
      */
@@ -96,18 +118,28 @@ private ArticleDetailResponse mergePublishedDetailFromCache(ArticlePublishedCont
         r.setStatus(p.getStatus());
         r.setCreatedAt(p.getCreatedAt());
         r.setUpdatedAt(p.getUpdatedAt());
+        r.setCategoryId(p.getCategoryId());
+        r.setCategoryName(p.getCategoryName());
+        r.setCategoryPath(p.getCategoryPath());
         r.setLikeCount(a.getLikeCount() == null ? 0L : a.getLikeCount());
         r.setViewCount(a.getViewCount() == null ? 0L : a.getViewCount());
         r.setFavoriteCount(a.getFavoriteCount() == null ? 0L : a.getFavoriteCount());
         r.setCommentCount(a.getCommentCount() == null ? 0L : a.getCommentCount());
         return r;
     }
 
-    public PageResult<ArticleListItemResponse> listPublished(int page, int size) {
+    public PageResult<ArticleListItemResponse> listPublished(int page, int size, Long categoryId) {
         Page<Article> mpPage = new Page<>(page + 1L, size);
         LambdaQueryWrapper<Article> w = Wrappers.lambdaQuery();
         w.eq(Article::getStatus, ArticleStatus.PUBLISHED)
                 .orderByDesc(Article::getPublishedAt);
+        if (categoryId != null) {
+            Set<Long> ids = categoryService.collectSelfAndDescendantIds(categoryId);
+            if (ids.isEmpty()) {
+                return new PageResult<>(List.of(), page, size, 0L);
+            }
+            w.in(Article::getCategoryId, ids);
+        }
         IPage<Article> p = articleMapper.selectPage(mpPage, w);
         List<ArticleListItemResponse> items = p.getRecords().stream().map(this::mapListItem).toList();
         return new PageResult<>(items, page, size, p.getTotal());
@@ -124,6 +156,7 @@ public ArticleDetailResponse detailPublished(Long id, String clientIp) {
         Optional<ArticlePublishedContentCachePayload> cached = publishedContentCache.get(id);
         if (cached.isPresent()) {
             resp = mergePublishedDetailFromCache(cached.get(), a);
+            applyCategory(resp, a.getCategoryId());
         } else {
             resp = mapDetail(a);
             publishedContentCache.put(id, ArticlePublishedContentCachePayload.fromDetail(resp));
@@ -162,6 +195,7 @@ public ArticleListItemResponse createDraft(Long authorId, ArticleCreateRequest r
         a.setSummary(req.getSummary());
         a.setContentMarkdown(req.getContentMarkdown());
         a.setCoverMediaKey(req.getCoverMediaKey());
+        categoryService.validateCategoryId(req.getCategoryId());
         a.setCategoryId(req.getCategoryId());
         a.setStatus(ArticleStatus.DRAFT);
         a.setLikeCount(0L);
@@ -187,6 +221,7 @@ public ArticleListItemResponse updateArticle(Long authorId, Long articleId, Arti
         a.setSummary(req.getSummary());
         a.setContentMarkdown(req.getContentMarkdown());
         a.setCoverMediaKey(req.getCoverMediaKey());
+        categoryService.validateCategoryId(req.getCategoryId());
         a.setCategoryId(req.getCategoryId());
         articleMapper.updateById(a);
         if (a.getStatus() == ArticleStatus.PUBLISHED) {

OpenBlog-business/src/main/java/com/yqz/openblog/category/controller/CategoryController.java

@@ -0,0 +1,55 @@
+package com.yqz.openblog.category.controller;
+
+import com.yqz.openblog.category.dto.CategoryFlatItemResponse;
+import com.yqz.openblog.category.dto.CategoryTreeNodeResponse;
+import com.yqz.openblog.category.dto.CategoryUpsertRequest;
+import com.yqz.openblog.category.service.CategoryService;
+import com.yqz.openblog.common.ApiResponse;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/v1/categories")
+@CrossOrigin(origins = "*")
+public class CategoryController {
+
+    private final CategoryService categoryService;
+
+    public CategoryController(CategoryService categoryService) {
+        this.categoryService = categoryService;
+    }
+
+    @GetMapping("/tree")
+    public ApiResponse<List<CategoryTreeNodeResponse>> tree() {
+        return ApiResponse.ok(categoryService.listTree());
+    }
+
+    @GetMapping
+    public ApiResponse<List<CategoryFlatItemResponse>> listFlat() {
+        return ApiResponse.ok(categoryService.listFlat());
+    }
+
+    @PostMapping
+    @PreAuthorize("hasRole('ADMIN')")
+    public ApiResponse<CategoryFlatItemResponse> create(@RequestBody @Valid CategoryUpsertRequest req) {
+        return ApiResponse.ok(categoryService.create(req));
+    }
+
+    @PutMapping("/{id}")
+    @PreAuthorize("hasRole('ADMIN')")
+    public ApiResponse<CategoryFlatItemResponse> update(
+            @PathVariable Long id,
+            @RequestBody @Valid CategoryUpsertRequest req) {
+        return ApiResponse.ok(categoryService.update(id, req));
+    }
+
+    @DeleteMapping("/{id}")
+    @PreAuthorize("hasRole('ADMIN')")
+    public ApiResponse<Void> delete(@PathVariable Long id) {
+        categoryService.delete(id);
+        return ApiResponse.ok();
+    }
+}

OpenBlog-business/src/main/java/com/yqz/openblog/category/dto/CategoryFlatItemResponse.java

@@ -0,0 +1,53 @@
+package com.yqz.openblog.category.dto;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CategoryFlatItemResponse {
+
+    private Long id;
+    private String name;
+    private Long parentId;
+    private Integer sortOrder;
+    private List<String> path = new ArrayList<>();
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Long getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Long parentId) {
+        this.parentId = parentId;
+    }
+
+    public Integer getSortOrder() {
+        return sortOrder;
+    }
+
+    public void setSortOrder(Integer sortOrder) {
+        this.sortOrder = sortOrder;
+    }
+
+    public List<String> getPath() {
+        return path;
+    }
+
+    public void setPath(List<String> path) {
+        this.path = path;
+    }
+}