修改分页

ask-data-ai/ask-data-ai-biz/src/main/java/com/ask/controller/AskVectorStoreController.java

@@ -15,6 +15,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springdoc.core.annotations.ParameterObject;
 import org.springframework.ai.vectorstore.VectorStore;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
@@ -51,7 +52,7 @@ public class AskVectorStoreController {
      */
     @Operation(summary = "分页查询向量存储", description = "分页查询向量存储数据（不包含向量字段）")
     @GetMapping("/page")
-    public R<IPage<AskVectorStore>> getPage(Page page,
+    public R<IPage<AskVectorStore>> getPage(@ParameterObject Page page,
                                             @Parameter(description = "文档ID") @RequestParam Long documentId,
                                             @Parameter(description = "内容关键词") @RequestParam(required = false) String content,
                                             @Parameter(description = "标题关键词") @RequestParam(required = false) String title

ask-data-ai/ask-data-ai-biz/src/main/java/com/ask/controller/ChatConversationController.java

@@ -13,6 +13,7 @@ import jakarta.servlet.http.Cookie;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
+import org.springdoc.core.annotations.ParameterObject;
 import org.springframework.http.HttpHeaders;
 import org.springframework.web.bind.annotation.*;
 
@@ -80,7 +81,7 @@ public class ChatConversationController {
 	 */
 	@Operation(summary = "分页查询", description = "分页查询")
 	@GetMapping("/page")
-	public R<IPage<ChatConversation>> getPage(@Parameter(description = "分页对象") Page page,
+	public R<IPage<ChatConversation>> getPage(@Parameter(description = "分页对象") @ParameterObject Page page,
 											  @Parameter(description = "智能体Id") @RequestParam(required = false) Integer agentId,
 											  @Parameter(description = "用户ID") @RequestParam Long userId) {
 		if(Objects.isNull(userId)){

ask-data-ai/ask-data-ai-biz/src/main/java/com/ask/controller/ChatConversationDetailController.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
+import org.springdoc.core.annotations.ParameterObject;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -39,7 +40,7 @@ public class ChatConversationDetailController {
      */
     @Operation(summary = "根据会话ID分页获取对话详情", description = "根据会话ID分页获取对话详情")
     @GetMapping("/page/{conversationId}")
-    public R<IPage<ChatConversationDetail>> pageByConversationId(Page page, @PathVariable String conversationId) {
+    public R<IPage<ChatConversationDetail>> pageByConversationId(@ParameterObject Page page, @PathVariable String conversationId) {
 		IPage<ChatConversationDetail> result =chatConversationDetailService.page(page,Wrappers.<ChatConversationDetail>lambdaQuery()
 				.eq(ChatConversationDetail::getConversationId, conversationId)
 				.orderByAsc(ChatConversationDetail::getTimestamp));

ask-data-ai/ask-data-ai-biz/src/main/java/com/ask/controller/KnowledgeBaseController.java

@@ -11,6 +11,7 @@ import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springdoc.core.annotations.ParameterObject;
 import org.springframework.ai.document.Document;
 import org.springframework.ai.vectorstore.SearchRequest;
 import org.springframework.ai.vectorstore.VectorStore;
@@ -48,8 +49,8 @@ public class KnowledgeBaseController {
      */
     @Operation(summary = "分页查询", description = "分页查询")
     @GetMapping("/page")
-    public R<IPage<KnowledgeBase>> getPage(@Parameter(description = "分页对象") Page page,
-                                          @Parameter(description = "查询条件") KnowledgeBase knowledgeBase) {
+    public R<IPage<KnowledgeBase>> getPage(@Parameter(description = "分页对象") @ParameterObject Page page,
+                                          @Parameter(description = "查询条件") @ParameterObject KnowledgeBase knowledgeBase) {
         return R.ok(knowledgeBaseService.page(page, Wrappers.query(knowledgeBase)));
     }
 

ask-data-ai/ask-data-ai-biz/src/main/java/com/ask/controller/KnowledgeDocumentController.java

@@ -21,6 +21,7 @@ import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springdoc.core.annotations.ParameterObject;
 import org.springframework.ai.vectorstore.VectorStore;
 import org.springframework.ai.vectorstore.filter.Filter;
 import org.springframework.http.HttpHeaders;
@@ -63,7 +64,7 @@ public class KnowledgeDocumentController {
      */
     @Operation(summary = "分页查询", description = "分页查询")
     @GetMapping("/page")
-    public R<IPage<KnowledgeDocument>> getPage(Page page,
+    public R<IPage<KnowledgeDocument>> getPage(@ParameterObject Page page,
                                                @Parameter(description = "知识库id") @RequestParam Long knowledgeBaseId,
                                                @Parameter(description = "文档名称") @RequestParam(required = false) String name) {
         LambdaQueryWrapper<KnowledgeDocument> wrapper = Wrappers.lambdaQuery();

ask-data-ai/ask-data-ai-biz/src/main/java/com/ask/tools/ExcelTools.java

@@ -55,13 +55,13 @@ public class ExcelTools {
         paramMap.put("year", date.getYear());
         paramMap.put("month", date.getMonthValue());
         paramMap.put("day", date.getDayOfMonth());
-        String bucketName = "report/production";
+        String bucketName = "report";
         boolean result = convertUtils.fillWordLoop(fileName, "科环集团电力运营日报模板.docx", paramMap,bucketName);
         JSONObject jsonObject =new JSONObject();
         if(result){
             jsonObject.set("success",true);
             jsonObject.set("fileName",fileName);
-            jsonObject.set("filePath","/admin/"+bucketName+"/"+fileName);
+            jsonObject.set("filePath","/admin/sys-file/"+bucketName+"/"+fileName);
         }else{
             jsonObject.set("success",false);
             jsonObject.set("fileName","");

ask-data-ai/ask-data-ai-boot/src/main/resources/application.yml

@@ -13,7 +13,7 @@ spring:
       max-request-size: 500MB   # 请求最大大小
       file-size-threshold: 0    # 文件写入磁盘的阈值
   datasource:
-    url: jdbc:postgresql://81.70.183.25:25432/ask_data_ai_db?stringtype=unspecified
+    url: jdbc:postgresql://8.152.98.45:5432/ask_data_ai_db?stringtype=unspecified
     username: postgres
     password: postgres123
     driver-class-name: org.postgresql.Driver

ask-data-ai/ask-data-ai-common/src/main/java/com/ask/common/config/MybatisPlusConfig.java

@@ -2,23 +2,31 @@ package com.ask.common.config;
 
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 /**
  * MybatisPlus配置
  */
-@AutoConfiguration
-public class MybatisPlusConfig {
+@Configuration
+@EnableTransactionManagement
+public class MybatisPlusConfig{
 
-    /**
-     * 分页插件
-     */
     @Bean
     public MybatisPlusInterceptor mybatisPlusInterceptor() {
         MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
-        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.POSTGRE_SQL));
+        PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor();
+        paginationInnerInterceptor.setOptimizeJoin(true);
+        paginationInnerInterceptor.setDbType(DbType.POSTGRE_SQL);
+        paginationInnerInterceptor.setOverflow(true);
+        interceptor.addInnerInterceptor(paginationInnerInterceptor);
+        OptimisticLockerInnerInterceptor optimisticLockerInnerInterceptor = new OptimisticLockerInnerInterceptor();
+        interceptor.addInnerInterceptor(optimisticLockerInnerInterceptor);
         return interceptor;
     }
+
 }