feat: 专栏文章分组

Author: liuyueyi

README.md

@@ -247,7 +247,11 @@ GitHub 上标星 13000+ 的开源知识库《 [二哥的 Java 进阶之路](http
 
 ![沉默王二公众号](https://cdn.tobebetterjavaer.com/tobebetterjavaer/images/gongzhonghao.png)
 
-## 九、许可证
+## 九、更新记录
+
+[关键版本迭代记录](docs/version.md)
+
+## 十、许可证
 
 [Apache License 2.0](https://github.com/itwanger/paicoding/edit/main/README.md)
 

docs/version.md

@@ -1,5 +1,19 @@
 ## 技术派迭代关键历史进程
 
+### 2024年度
+
+- 2024/12/06 完成微信支付集成，微信支付解锁文章付费阅读
+  - [Feature/241203/h5 pay by liuyueyi · Pull Request #89 · itwanger/paicoding](https://github.com/itwanger/paicoding/pull/89)
+  - [Feature/241206/pay reconsitution by liuyueyi · Pull Request #91 · itwanger/paicoding](https://github.com/itwanger/paicoding/pull/91)
+  - [Feature/241203/h5 pay by liuyueyi · Pull Request #88 · itwanger/paicoding](https://github.com/itwanger/paicoding/pull/88)
+- 2024/11/27 完成WebSocket的消息实时通知
+  - [完成消息通知长连接 by liuyueyi · Pull Request #87 · itwanger/paicoding](https://github.com/itwanger/paicoding/pull/87)
+- 2024/11/12 新增文章付费解锁功能
+  - [新增文章付费解锁功能 by liuyueyi · Pull Request #85 · itwanger/paicoding](https://github.com/itwanger/paicoding/pull/85)
+
+
+### 2023年度
+
 - 2023//06/30 基于ChatGPT，讯飞星火大模型的派聪明上线
 - 2023/06/09 mysql同步es，支持es查询集成
 - 2023/05 动态数据源方案集成

paicoding-api/src/main/java/com/github/paicoding/forum/api/model/vo/article/ColumnArticleGroupReq.java

@@ -0,0 +1,36 @@
+
+package com.github.paicoding.forum.api.model.vo.article;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 保存Column分组请求参数
+ *
+ * @author yihui
+ * @date 2024/12/17
+ */
+@Data
+public class ColumnArticleGroupReq implements Serializable {
+
+    /**
+     * 主键ID
+     */
+    private Long id;
+
+    /**
+     * 专栏ID
+     */
+    private Long columnId;
+
+    /**
+     * 文章ID
+     */
+    private String title;
+
+    /**
+     * 专栏排序
+     */
+    private Integer sort;
+}

paicoding-service/src/main/java/com/github/paicoding/forum/service/article/conveter/ColumnStructMapper.java

@@ -1,9 +1,11 @@
 package com.github.paicoding.forum.service.article.conveter;
 
+import com.github.paicoding.forum.api.model.vo.article.ColumnArticleGroupReq;
 import com.github.paicoding.forum.api.model.vo.article.ColumnReq;
 import com.github.paicoding.forum.api.model.vo.article.SearchColumnReq;
 import com.github.paicoding.forum.api.model.vo.article.dto.ColumnDTO;
 import com.github.paicoding.forum.api.model.vo.article.dto.SimpleColumnDTO;
+import com.github.paicoding.forum.service.article.repository.entity.ColumnArticleGroupDO;
 import com.github.paicoding.forum.service.article.repository.entity.ColumnInfoDO;
 import com.github.paicoding.forum.service.article.repository.params.SearchColumnParams;
 import org.mapstruct.Mapper;
@@ -59,4 +61,8 @@ public interface ColumnStructMapper {
     @Mapping(target = "freeStartTime", expression = "java(new java.util.Date(req.getFreeStartTime()))")
     @Mapping(target = "freeEndTime", expression = "java(new java.util.Date(req.getFreeEndTime()))")
     ColumnInfoDO toDo(ColumnReq req);
+
+
+    @Mapping(source = "sort", target = "section")
+    ColumnArticleGroupDO toDO(ColumnArticleGroupReq req);
 }

paicoding-service/src/main/java/com/github/paicoding/forum/service/article/repository/dao/ColumnArticleGroupDao.java

@@ -0,0 +1,17 @@
+package com.github.paicoding.forum.service.article.repository.dao;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.paicoding.forum.service.article.repository.entity.ColumnArticleGroupDO;
+import com.github.paicoding.forum.service.article.repository.mapper.ColumnArticleGroupMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 专栏文章分组
+ *
+ * @author yihui
+ * @date 24/12/17
+ */
+@Repository
+public class ColumnArticleGroupDao extends ServiceImpl<ColumnArticleGroupMapper, ColumnArticleGroupDO> {
+
+}

paicoding-service/src/main/java/com/github/paicoding/forum/service/article/repository/entity/ColumnArticleDO.java

@@ -18,10 +18,21 @@
 public class ColumnArticleDO extends BaseDO {
     private static final long serialVersionUID = -2372103913090667453L;
 
+    /**
+     * 专栏
+     */
     private Long columnId;
 
+    /**
+     * 专栏文章
+     */
     private Long articleId;
 
+    /**
+     * 专栏文章分组
+     */
+    private Long groupId;
+
     /**
      * 顺序，越小越靠前
      */

paicoding-service/src/main/java/com/github/paicoding/forum/service/article/repository/entity/ColumnArticleGroupDO.java

@@ -0,0 +1,28 @@
+package com.github.paicoding.forum.service.article.repository.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.paicoding.forum.api.model.entity.BaseDO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 专栏文章
+ *
+ * @author YiHui
+ * @date 2022/9/14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("column_article_group")
+public class ColumnArticleGroupDO extends BaseDO {
+    private static final long serialVersionUID = -2372103913090667453L;
+
+    private Long columnId;
+
+    private String title;
+
+    /**
+     * 顺序，越小越靠前
+     */
+    private Integer section;
+}

paicoding-service/src/main/java/com/github/paicoding/forum/service/article/repository/mapper/ColumnArticleGroupMapper.java

@@ -0,0 +1,13 @@
+package com.github.paicoding.forum.service.article.repository.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.paicoding.forum.service.article.repository.entity.ColumnArticleGroupDO;
+
+/**
+ * 专栏文章分组
+ *
+ * @author YiHui
+ * @date 2024/12/17
+ */
+public interface ColumnArticleGroupMapper extends BaseMapper<ColumnArticleGroupDO> {
+}

paicoding-service/src/main/java/com/github/paicoding/forum/service/article/service/ColumnSettingService.java

@@ -31,6 +31,13 @@ public interface ColumnSettingService {
      */
     void saveColumn(ColumnReq columnReq);
 
+    /**
+     * 保存专栏文章分组
+     * @param req
+     * @return
+     */
+    void saveColumnArticleGroup(ColumnArticleGroupReq req);
+
     /**
      * 保存专栏文章
      *

paicoding-service/src/main/java/com/github/paicoding/forum/service/article/service/impl/ColumnSettingServiceImpl.java

@@ -18,9 +18,11 @@
 import com.github.paicoding.forum.service.article.conveter.ColumnStructMapper;
 import com.github.paicoding.forum.service.article.repository.dao.ArticleDao;
 import com.github.paicoding.forum.service.article.repository.dao.ColumnArticleDao;
+import com.github.paicoding.forum.service.article.repository.dao.ColumnArticleGroupDao;
 import com.github.paicoding.forum.service.article.repository.dao.ColumnDao;
 import com.github.paicoding.forum.service.article.repository.entity.ArticleDO;
 import com.github.paicoding.forum.service.article.repository.entity.ColumnArticleDO;
+import com.github.paicoding.forum.service.article.repository.entity.ColumnArticleGroupDO;
 import com.github.paicoding.forum.service.article.repository.entity.ColumnInfoDO;
 import com.github.paicoding.forum.service.article.repository.params.SearchColumnArticleParams;
 import com.github.paicoding.forum.service.article.repository.params.SearchColumnParams;
@@ -51,6 +53,9 @@ public class ColumnSettingServiceImpl implements ColumnSettingService {
     @Autowired
     private ColumnArticleDao columnArticleDao;
 
+    @Autowired
+    private ColumnArticleGroupDao columnArticleGroupDao;
+
     @Autowired
     private ColumnDao columnDao;
 
@@ -71,6 +76,17 @@ public void saveColumn(ColumnReq req) {
         }
     }
 
+    @Override
+    public void saveColumnArticleGroup(ColumnArticleGroupReq req) {
+        ColumnArticleGroupDO groupDO = columnStructMapper.toDO(req);
+        if (NumUtil.nullOrZero(req.getId())) {
+            columnArticleGroupDao.save(groupDO);
+        } else {
+            groupDO.setId(req.getId());
+            columnArticleGroupDao.updateById(groupDO);
+        }
+    }
+
 
     /**
      * 将文章保存到对应的专栏中

paicoding-web/src/main/java/com/github/paicoding/forum/web/admin/rest/ColumnSettingRestController.java

@@ -52,6 +52,12 @@ public ResVo<String> saveColumn(@RequestBody ColumnReq req) {
         return ResVo.ok();
     }
 
+    @Permission(role = UserRole.ADMIN)
+    @PostMapping(path = "saveColumnGroup")
+    public ResVo<Boolean> saveColumnArticleGroup(@RequestBody ColumnArticleGroupReq req) {
+        
+    }
+
     @Permission(role = UserRole.ADMIN)
     @PostMapping(path = "saveColumnArticle")
     public ResVo<String> saveColumnArticle(@RequestBody ColumnArticleReq req) {

paicoding-web/src/main/resources/liquibase/data/update_schema_241217.sql

@@ -0,0 +1,15 @@
+-- 专栏文章分组；主要用于前台列表显示时，对文章进行聚合
+CREATE TABLE `column_article_group`
+(
+    `id`          bigint unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID',
+    `column_id`   int unsigned NOT NULL DEFAULT '0' COMMENT '专栏ID',
+    `title`       varchar   NOT NULL DEFAULT '' COMMENT '分组名',
+    `section`     int unsigned NOT NULL DEFAULT '0' COMMENT '分组顺序，越小越靠前',
+    `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后更新时间',
+    PRIMARY KEY (`id`),
+    KEY           `column_id` (`column_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4  COMMENT='专栏文章分组';
+
+alter table column_article
+    add column group_id bigint unsigned not null default 0 comment '文章对应的分组id，为0时归属在未分组的集合中';