Merge remote-tracking branch 'origin/feature/20240918_chain' into feature/20240918_chain

src/main/java/cn/breeze/elleai/application/dto/request/WikiCategoryRequestDto.java

@@ -20,5 +20,7 @@ public class WikiCategoryRequestDto implements Serializable {
     @Schema(description = "名称")
     private String name;
 
-    
+    @Schema(description = "父级ID")
+    @JsonProperty("parent_id")
+    private Integer parentId;
 }

src/main/java/cn/breeze/elleai/application/service/AppExamineService.java

@@ -807,6 +807,9 @@ public class AppExamineService {
     public PageResult<WikiCategoryDto> wikiCategoryPaginQuery(WikiCategoryRequestDto request) {
 
         WikiCategoryRequestModel requestModel = BeanUtil.copyProperties(request, WikiCategoryRequestModel.class);
+        if(Objects.isNull(requestModel.getParentId())) {
+            requestModel.setParentId(0);
+        }
 
         Page<WikiCategoryResponseModel> page = examineService.wikiCategoryPaginQuery(requestModel);
 
@@ -832,6 +835,9 @@ public class AppExamineService {
 
         WikiCategoryRequestModel requestModel = BeanUtil.copyProperties(request, WikiCategoryRequestModel.class);
         requestModel.setStatus(1);
+        if(Objects.isNull(requestModel.getParentId())) {
+            requestModel.setLevel(3);
+        }
 
         Page<WikiCategoryResponseModel> page = examineService.wikiCategoryPaginQuery(requestModel);
 

src/main/java/cn/breeze/elleai/domain/sparring/model/request/WikiCategoryRequestModel.java

@@ -14,5 +14,8 @@ public class WikiCategoryRequestModel implements Serializable {
     private String name;
 
     private Integer status;
-    
+
+    private Integer parentId;
+
+    private Integer level;
 }

src/main/java/cn/breeze/elleai/domain/sparring/service/ChatCompletionServiceImpl.java

@@ -163,7 +163,7 @@ public class ChatCompletionServiceImpl implements ChatCompletionService{
         if(Objects.nonNull(request.getStatus())) {
             queryWrapper.and(QA_ASSISTANT_ENTITY.STATUS.eq(request.getStatus()));
         }
-        queryWrapper.orderBy(QA_ASSISTANT_ENTITY.CREATE_TIME, false);
+        queryWrapper.orderBy(QA_ASSISTANT_ENTITY.CREATE_TIME, true);
 
         Page<QaAssistantResponseModel> page = qaAssistantMapper.paginateAs(pageNo, pageSize, queryWrapper, QaAssistantResponseModel.class);
 

src/main/java/cn/breeze/elleai/domain/sparring/service/ExamineServiceImpl.java

@@ -556,10 +556,13 @@ public class ExamineServiceImpl implements ExamineService {
         QueryWrapper queryWrapper = QueryWrapper.create()
                 .where(WIKI_CATEGORY_ENTITY.DELETED.eq(0));
         if(StrUtil.isNotEmpty(request.getName())) {
-            queryWrapper.where(WIKI_CATEGORY_ENTITY.NAME.like("%"+request.getName()+"%"));
+            queryWrapper.and(WIKI_CATEGORY_ENTITY.NAME.like("%"+request.getName()+"%"));
         }
         if(Objects.nonNull(request.getStatus())) {
-            queryWrapper.where(WIKI_CATEGORY_ENTITY.STATUS.eq(request.getStatus()));
+            queryWrapper.and(WIKI_CATEGORY_ENTITY.STATUS.eq(request.getStatus()));
+        }
+        if(Objects.nonNull(request.getLevel())) {
+            queryWrapper.and(WIKI_CATEGORY_ENTITY.LEVEL.eq(request.getLevel()));
         }
         queryWrapper.orderBy(WIKI_CATEGORY_ENTITY.CREATE_TIME, false);
 

src/main/java/cn/breeze/elleai/infra/entity/WikiCategoryEntity.java

@@ -37,6 +37,11 @@ public class WikiCategoryEntity implements Serializable {
      */
     private String name;
 
+    /**
+     * 层级
+     */
+    private Integer level;
+
     /**
      * 分类描述
      */

src/main/java/cn/breeze/elleai/infra/entity/table/WikiCategoryTableDef.java

@@ -29,6 +29,11 @@ public class WikiCategoryTableDef extends TableDef {
      */
     public final QueryColumn NAME = new QueryColumn(this, "name");
 
+    /**
+     * 层级
+     */
+    public final QueryColumn LEVEL = new QueryColumn(this, "level");
+
     /**
      * 状态（0禁用 1启用）
      */
@@ -67,7 +72,7 @@ public class WikiCategoryTableDef extends TableDef {
     /**
      * 默认字段，不包含逻辑删除或者 large 等字段。
      */
-    public final QueryColumn[] DEFAULT_COLUMNS = new QueryColumn[]{ID, NAME, DESCRIPTION, STATUS, DELETED, CREATE_TIME, UPDATE_TIME, PARENT_ID};
+    public final QueryColumn[] DEFAULT_COLUMNS = new QueryColumn[]{ID, NAME, LEVEL, DESCRIPTION, STATUS, DELETED, CREATE_TIME, UPDATE_TIME, PARENT_ID};
 
     public WikiCategoryTableDef() {
         super("", "ai_wiki_category");