优化调整

backend-single/src/main/java/com/emotion/common/BaseEntity.java

@@ -3,6 +3,9 @@ package com.emotion.common;
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import lombok.experimental.SuperBuilder;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
@@ -14,6 +17,9 @@ import java.time.LocalDateTime;
  * @date 2025-07-22
  */
 @Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
 public class BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;

backend-single/src/main/java/com/emotion/config/AsyncConfig.java

@@ -0,0 +1,45 @@
+package com.emotion.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+
+import java.util.concurrent.Executor;
+
+/**
+ * 多线程异步任务线程池配置
+ */
+@Configuration
+@EnableAsync
+public class AsyncConfig {
+
+    @Value("${async.core-pool-size:10}")
+    private int corePoolSize;
+
+    @Value("${async.max-pool-size:50}")
+    private int maxPoolSize;
+
+    @Value("${async.queue-capacity:200}")
+    private int queueCapacity;
+
+    @Value("${async.keep-alive-seconds:60}")
+    private int keepAliveSeconds;
+
+    @Value("${async.thread-name-prefix:single-async-}")
+    private String threadNamePrefix;
+
+    @Bean(name = "taskExecutor")
+    public Executor taskExecutor() {
+        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+        executor.setCorePoolSize(corePoolSize);
+        executor.setMaxPoolSize(maxPoolSize);
+        executor.setQueueCapacity(queueCapacity);
+        executor.setKeepAliveSeconds(keepAliveSeconds);
+        executor.setThreadNamePrefix(threadNamePrefix);
+        executor.setRejectedExecutionHandler(new java.util.concurrent.ThreadPoolExecutor.CallerRunsPolicy());
+        executor.initialize();
+        return executor;
+    }
+} 

backend-single/src/main/java/com/emotion/controller/EmotionSummaryController.java

@@ -8,7 +8,8 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
+import org.springframework.scheduling.annotation.Async;
+import java.util.concurrent.CompletableFuture;
 import java.util.Map;
 
 /**
@@ -29,16 +30,11 @@ public class EmotionSummaryController {
     @Operation(summary = "生成用户当天的情绪记录总结", description = "基于用户当天的聊天记录生成情绪分析和记录")
     @PostMapping("/generate")
     public Result<Map<String, Object>> generateEmotionSummary() {
-
         try {
-            // 从上下文中获取当前用户ID
             String userId = CurrentUserUtil.requireCurrentUserId();
-
             log.info("收到生成情绪记录总结请求: userId={}", userId);
-
-            // 调用AI服务生成情绪总结
-            Map<String, Object> result = aiChatService.generateEmotionSummary(userId);
-
+            // 调用AI服务异步生成情绪总结（阻塞获取结果）
+            Map<String, Object> result = aiChatService.generateEmotionSummaryAsync(userId).get();
             if ((Boolean) result.get("success")) {
                 log.info("情绪记录总结生成成功: userId={}", userId);
                 return Result.success("情绪记录总结生成成功", result);
@@ -47,7 +43,6 @@ public class EmotionSummaryController {
                 log.warn("情绪记录总结生成失败: userId={}, message={}", userId, message);
                 return Result.error(message);
             }
-
         } catch (IllegalStateException e) {
             log.warn("用户认证失败: {}", e.getMessage());
             return Result.error(e.getMessage());

backend-single/src/main/java/com/emotion/entity/Achievement.java

@@ -2,11 +2,11 @@ package com.emotion.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.emotion.common.BaseEntity;
+import lombok.experimental.SuperBuilder;
+import lombok.NoArgsConstructor;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -19,7 +19,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@Builder
+@SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
 @TableName("achievement")

backend-single/src/main/java/com/emotion/entity/Comment.java

@@ -2,11 +2,11 @@ package com.emotion.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.emotion.common.BaseEntity;
+import lombok.experimental.SuperBuilder;
+import lombok.NoArgsConstructor;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
 
 /**
  * 评论实体类
@@ -16,7 +16,7 @@ import lombok.NoArgsConstructor;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@Builder
+@SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
 @TableName("comment")

backend-single/src/main/java/com/emotion/entity/CommunityPost.java

@@ -2,11 +2,11 @@ package com.emotion.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.emotion.common.BaseEntity;
+import lombok.experimental.SuperBuilder;
+import lombok.NoArgsConstructor;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
 
 /**
  * 社区帖子实体类
@@ -16,7 +16,7 @@ import lombok.NoArgsConstructor;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@Builder
+@SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
 @TableName("community_post")

backend-single/src/main/java/com/emotion/entity/Conversation.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.emotion.common.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.Builder;
+import lombok.experimental.SuperBuilder;
 import lombok.NoArgsConstructor;
 import lombok.AllArgsConstructor;
 
@@ -19,7 +19,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@Builder
+@SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
 @TableName("conversation")

backend-single/src/main/java/com/emotion/entity/CozeApiCall.java

@@ -3,7 +3,7 @@ package com.emotion.entity;
 import com.baomidou.mybatisplus.annotation.*;
 import com.emotion.common.BaseEntity;
 import lombok.Data;
-import lombok.Builder;
+import lombok.experimental.SuperBuilder;
 import lombok.NoArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
@@ -19,7 +19,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@Builder
+@SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
 @TableName("coze_api_call")

backend-single/src/main/java/com/emotion/entity/EmotionAnalysis.java

@@ -2,11 +2,11 @@ package com.emotion.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.emotion.common.BaseEntity;
+import lombok.experimental.SuperBuilder;
+import lombok.NoArgsConstructor;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -19,7 +19,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@Builder
+@SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
 @TableName("emotion_analysis")

backend-single/src/main/java/com/emotion/entity/EmotionRecord.java

@@ -2,11 +2,11 @@ package com.emotion.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.emotion.common.BaseEntity;
+import lombok.experimental.SuperBuilder;
+import lombok.NoArgsConstructor;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
@@ -19,7 +19,7 @@ import java.time.LocalDate;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@Builder
+@SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
 @TableName("emotion_record")

backend-single/src/main/java/com/emotion/entity/GrowthTopic.java

@@ -2,11 +2,11 @@ package com.emotion.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.emotion.common.BaseEntity;
+import lombok.experimental.SuperBuilder;
+import lombok.NoArgsConstructor;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -19,7 +19,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@Builder
+@SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
 @TableName("growth_topic")

backend-single/src/main/java/com/emotion/entity/GuestUser.java

@@ -2,11 +2,11 @@ package com.emotion.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.emotion.common.BaseEntity;
+import lombok.experimental.SuperBuilder;
+import lombok.NoArgsConstructor;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
 
 import java.time.LocalDateTime;
 
@@ -18,7 +18,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@Builder
+@SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
 @TableName("guest_user")

backend-single/src/main/java/com/emotion/entity/LocationPin.java

@@ -2,11 +2,11 @@ package com.emotion.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.emotion.common.BaseEntity;
+import lombok.experimental.SuperBuilder;
+import lombok.NoArgsConstructor;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -19,7 +19,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@Builder
+@SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
 @TableName("location_pin")

backend-single/src/main/java/com/emotion/entity/Message.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.emotion.common.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.Builder;
+import lombok.experimental.SuperBuilder;
 import lombok.NoArgsConstructor;
 import lombok.AllArgsConstructor;
 
@@ -19,7 +19,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@Builder
+@SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
 @TableName("message")

backend-single/src/main/java/com/emotion/entity/Reward.java

@@ -2,11 +2,11 @@ package com.emotion.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.emotion.common.BaseEntity;
+import lombok.experimental.SuperBuilder;
+import lombok.NoArgsConstructor;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
 
 import java.time.LocalDateTime;
 
@@ -18,7 +18,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@Builder
+@SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
 @TableName("reward")

backend-single/src/main/java/com/emotion/entity/TopicInteraction.java

@@ -2,11 +2,11 @@ package com.emotion.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.emotion.common.BaseEntity;
+import lombok.experimental.SuperBuilder;
+import lombok.NoArgsConstructor;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
 
 import java.time.LocalDateTime;
 
@@ -18,7 +18,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@Builder
+@SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
 @TableName("topic_interaction")

backend-single/src/main/java/com/emotion/entity/User.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.emotion.common.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.Builder;
+import lombok.experimental.SuperBuilder;
 import lombok.NoArgsConstructor;
 import lombok.AllArgsConstructor;
 
@@ -20,7 +20,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@Builder
+@SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
 @TableName("user")

backend-single/src/main/java/com/emotion/entity/UserStats.java

@@ -2,11 +2,11 @@ package com.emotion.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.emotion.common.BaseEntity;
+import lombok.experimental.SuperBuilder;
+import lombok.NoArgsConstructor;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
 
 /**
  * 用户统计实体类
@@ -16,7 +16,7 @@ import lombok.NoArgsConstructor;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@Builder
+@SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
 @TableName("user_stats")

backend-single/src/main/java/com/emotion/service/AiChatService.java

@@ -1,76 +1,110 @@
 package com.emotion.service;
 
-import java.util.Map;
 
 /**
  * AI聊天服务接口
- * 
+ *
  * @author emotion-museum
  * @date 2025-07-24
  */
 public interface AiChatService {
 
     /**
-     * 发送聊天消息
+     * 发送聊天消息（保存用户消息和AI回复）
+     * @param conversationId 会话ID
+     * @param message 用户消息内容
+     * @param userId 用户ID
+     * @return AI回复内容
      */
     String sendChatMessage(String conversationId, String message, String userId);
 
     /**
-     * 发送聊天消息（仅获取AI回复，不保存用户消息）
-     * 用于WebSocket场景，避免重复保存用户消息
+     * WebSocket方式发送聊天消息（只保存AI回复）
+     * @param conversationId 会话ID
+     * @param message 用户消息内容
+     * @param userId 用户ID
+     * @return AI回复内容
      */
     String sendChatMessageForWebSocket(String conversationId, String message, String userId);
 
     /**
      * 生成对话总结
+     * @param conversationId 会话ID
+     * @param userId 用户ID
+     * @return 总结内容
      */
     String generateConversationSummary(String conversationId, String userId);
 
     /**
-     * 检查服务是否可用
+     * 检查AI服务是否可用
+     * @return 可用返回true，否则false
      */
     boolean isServiceAvailable();
 
     /**
-     * 获取服务状态
+     * 获取AI服务状态
+     * @return "available" 或 "unavailable"
      */
     String getServiceStatus();
 
     /**
-     * 发送消息到Coze AI
+     * 发送消息到Coze AI（不保存消息，仅AI交互）
+     * @param conversationId 会话ID
+     * @param userMessage 用户消息内容
+     * @param userId 用户ID
+     * @return AI回复内容
      */
     String sendMessage(String conversationId, String userMessage, String userId);
 
     /**
-     * 访客聊天（不需要登录）
+     * 访客聊天（不登录情况下）
+     * @param message 用户消息内容
+     * @param clientIp 客户端IP
+     * @return 包含AI回复等信息的Map
      */
-    Map<String, Object> guestChat(String message, String clientIp);
+    java.util.Map<String, Object> guestChat(String message, String clientIp);
 
     /**
-     * 创建对话
+     * 创建新对话
+     * @param userId 用户ID
+     * @param title 对话标题
+     * @return 包含对话信息的Map
      */
-    Map<String, Object> createConversation(String userId, String title);
+    java.util.Map<String, Object> createConversation(String userId, String title);
 
     /**
      * 获取访客用户信息
+     * @param clientIp 客户端IP
+     * @return 包含访客信息的Map
      */
-    Map<String, Object> getGuestUserInfo(String clientIp);
+    java.util.Map<String, Object> getGuestUserInfo(String clientIp);
 
     /**
-     * 流式聊天
+     * 流式聊天（暂时降级为普通聊天）
+     * @param conversationId 会话ID
+     * @param message 用户消息内容
+     * @param userId 用户ID
+     * @return AI回复内容
      */
     String streamChat(String conversationId, String message, String userId);
 
     /**
      * 健康检查
+     * @return 健康返回true，否则false
      */
     boolean healthCheck();
 
     /**
-     * 生成用户当天的情绪记录总结
-     *
+     * 生成用户情绪记录总结
      * @param userId 用户ID
-     * @return 情绪记录结果
+     * @return 包含情绪总结等信息的Map
      */
-    Map<String, Object> generateEmotionSummary(String userId);
+    java.util.Map<String, Object> generateEmotionSummary(String userId);
+
+    /**
+     * 异步生成用户情绪记录总结
+     * @param userId 用户ID
+     * @return 包含情绪总结等信息的CompletableFuture
+     */
+    java.util.concurrent.CompletableFuture<java.util.Map<String, Object>> generateEmotionSummaryAsync(String userId);
 }

backend-single/src/main/java/com/emotion/service/impl/AiChatServiceImpl.java

@@ -24,6 +24,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
+import org.springframework.scheduling.annotation.Async;
+import java.util.concurrent.CompletableFuture;
 
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
@@ -34,6 +36,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import java.util.Arrays;
 
 /**
  * AI聊天服务实现类
@@ -1017,12 +1020,12 @@ public class AiChatServiceImpl implements AiChatService {
             String chatHistory = integrateChatHistory(todayMessages);
             log.info("聊天记录整合完成，总长度: {}", chatHistory.length());
 
-            // 构建情绪分析提示词
-            String emotionPrompt = buildEmotionAnalysisPrompt(chatHistory);
+            // Coze 中已经在工作流设置了提示词，目前不需要构建情绪分析提示词
+            // String emotionPrompt = buildEmotionAnalysisPrompt(chatHistory);
 
             // 调用Coze API进行情绪分析总结
             String conversationId = "emotion_summary_" + userId + "_" + today.format(DateTimeFormatter.ofPattern("yyyyMMdd"));
-            String emotionSummary = sendSummaryMessage(conversationId, emotionPrompt, userId);
+            String emotionSummary = sendSummaryMessage(conversationId, chatHistory, userId);
             log.info("情绪分析总结生成完成: {}", emotionSummary);
 
             // 解析AI返回的情绪分析结果
@@ -1049,6 +1052,13 @@ public class AiChatServiceImpl implements AiChatService {
         return result;
     }
 
+    @Override
+    @Async("taskExecutor")
+    public CompletableFuture<Map<String, Object>> generateEmotionSummaryAsync(String userId) {
+        Map<String, Object> result = generateEmotionSummary(userId);
+        return CompletableFuture.completedFuture(result);
+    }
+
     /**
      * 整合聊天记录
      */
@@ -1106,7 +1116,7 @@ public class AiChatServiceImpl implements AiChatService {
                 return EmotionAnalysis.builder()
                         .primaryEmotion(json.getString("primaryEmotion"))
                         .intensity(BigDecimal.valueOf(json.getDoubleValue("intensity")))
-                        .keywords(json.getString("triggers"))
+                        .keywords(JSON.toJSONString(Arrays.asList(json.getString("triggers"))))
                         .suggestion(json.getString("suggestions"))
                         .text(summary)
                         .polarity(determinePolarity(json.getString("primaryEmotion")))
@@ -1122,7 +1132,7 @@ public class AiChatServiceImpl implements AiChatService {
         return EmotionAnalysis.builder()
                 .primaryEmotion("平静")
                 .intensity(BigDecimal.valueOf(0.5))
-                .keywords("日常对话")
+                .keywords(JSON.toJSONString(Arrays.asList("日常对话")))
                 .suggestion("保持当前的积极状态")
                 .text(summary)
                 .polarity("neutral")
@@ -1192,7 +1202,7 @@ public class AiChatServiceImpl implements AiChatService {
                 .triggers(analysisResult.getKeywords())
                 .description(analysisResult.getText())
                 .notes("基于当天聊天记录自动生成的情绪分析")
-                .tags("AI分析,聊天记录,情绪总结")
+                .tags(JSON.toJSONString(Arrays.asList("AI分析", "聊天记录", "情绪总结")))
                 .build();
 
         emotionRecordService.save(record);