[prod] 增加一个白名单用户

增加日志

servers/boe-server-all/src/main/java/com/xboe/config/MqConfig.java

@@ -0,0 +1,39 @@
+package com.xboe.config;
+
+import org.apache.activemq.command.ActiveMQTopic;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.jms.annotation.EnableJms;
+import org.springframework.jms.config.DefaultJmsListenerContainerFactory;
+import org.springframework.jms.config.JmsListenerContainerFactory;
+
+import javax.jms.ConnectionFactory;
+import javax.jms.Topic;
+
+@EnableJms
+@Configuration
+public class MqConfig {
+
+    @Value("${activemq.topic.name}")
+    private String topicName;
+
+
+    /**
+     * 配置topic
+     */
+    @Bean
+    public Topic broadcastTopic() {
+        return new ActiveMQTopic(topicName);
+    }
+
+    // 配置JmsListenerContainerFactory为发布/订阅模式
+    @Bean
+    public JmsListenerContainerFactory<?> jmsListenerContainerFactory(ConnectionFactory connectionFactory) {
+        DefaultJmsListenerContainerFactory factory = new DefaultJmsListenerContainerFactory();
+        factory.setConnectionFactory(connectionFactory);
+        factory.setPubSubDomain(true); // 设置为发布/订阅模式
+        factory.setSubscriptionDurable(false); // 非持久订阅
+        return factory;
+    }
+}

servers/boe-server-all/src/main/java/com/xboe/config/ThreadPoolConfig.java

@@ -65,6 +65,24 @@ public class ThreadPoolConfig {
         return executor;
     }
 
+    /**
+     * 异步存会话数据线程池
+     * @return
+     */
+    @Bean(name = "esChatExecutor")
+    public ThreadPoolTaskExecutor esChatExecutor() {
+        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+        executor.setCorePoolSize(10);
+        executor.setMaxPoolSize(500);
+        executor.setQueueCapacity(10);
+        executor.setThreadNamePrefix("es-chat-");
+        executor.setKeepAliveSeconds(300);
+        executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
+        executor.setWaitForTasksToCompleteOnShutdown(true);
+        executor.initialize();
+        return executor;
+    }
+
     @Bean(name = "customDispatcher")
     public Dispatcher customDispatcher(@Qualifier("eventStreamExecutor") ThreadPoolTaskExecutor eventStreamExecutor) {
         return new Dispatcher(eventStreamExecutor.getThreadPoolExecutor());

servers/boe-server-all/src/main/java/com/xboe/constants/CaseAiConstants.java

@@ -7,4 +7,8 @@ public class CaseAiConstants {
     public static final String CASE_DOC_UPLOAD_INTERFACE_NAME = "文档上传";
 
     public static final String CASE_DOC_DELETE_INTERFACE_NAME = "文档删除";
+
+    public static final String CHAT_SYS_ERR_MSG = "服务繁忙，请稍后再试。";
+
+    public static final String CHAT_NET_ERR_MSG = "网络异常，请稍后再试。";
 }

servers/boe-server-all/src/main/java/com/xboe/enums/CaseAiChatErrCodeEnum.java

@@ -0,0 +1,33 @@
+package com.xboe.enums;
+
+import lombok.Getter;
+
+import java.util.Arrays;
+
+/**
+ * 错误码枚举
+ */
+@Getter
+public enum CaseAiChatErrCodeEnum {
+
+    SUCCESS(0, "成功"),
+
+    INTERNAL_ERROR(1, "内部错误"),
+
+    AIOT_ERROR(2, "AIoT平台错误"),
+    ;
+
+    private final int code;
+
+    private final String label;
+
+    CaseAiChatErrCodeEnum(int code, String label) {
+        this.code = code;
+        this.label = label;
+    }
+
+    public static CaseAiChatErrCodeEnum getByCode(int code) {
+        return Arrays.stream(values()).filter(e -> e.code == code)
+                .findFirst().orElse(SUCCESS);
+    }
+}

servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CaseAiChatApi.java

@@ -3,13 +3,14 @@ package com.xboe.module.boecase.api;
 import com.xboe.core.api.ApiBaseController;
 import com.xboe.core.JsonResponse;
 import com.xboe.module.boecase.dto.CaseAiChatDto;
+import com.xboe.module.boecase.dto.CaseAiMsgLikeDto;
+import com.xboe.module.boecase.dto.EsFieldDTO;
+import com.xboe.module.boecase.dto.GetCaseAiMsgDto;
 import com.xboe.module.boecase.entity.AiChatConversationData;
 import com.xboe.module.boecase.service.ICaseAiChatService;
 import com.xboe.module.boecase.service.ICaseAiPermissionService;
 import com.xboe.module.boecase.service.IElasticSearchIndexService;
 import com.xboe.module.boecase.vo.CaseAiMessageVo;
-import com.xboe.module.excel.ExportsExcelSenderUtil;
-import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
@@ -17,18 +18,15 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 
 import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import java.time.LocalDateTime;
+import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
 import java.util.List;
 
 /**
  * AI对话管理API
  */
-@Slf4j
+@Slf4j(topic = "caseAiChatLogger")
 @RestController
 @RequestMapping(value = "/xboe/m/boe/case/ai")
 public class CaseAiChatApi extends ApiBaseController {
@@ -63,7 +61,84 @@ public class CaseAiChatApi extends ApiBaseController {
         // 获取当前用户
         return caseAiChatService.chat(caseAiChatDto, getCurrent());
     }
-    
+
+    /**
+     * 停止当前聊天输出
+     * @param conversationId 会话ID
+     * @return 是否成功停止
+     */
+    @GetMapping("/stop")
+    public JsonResponse<Boolean> stopChat(@RequestParam String conversationId) {
+        try {
+            boolean result = caseAiChatService.stopChatOutput(conversationId);
+            if (result) {
+                return success(true, "成功停止输出");
+            } else {
+                return success(false, "未找到对应的会话或会话已结束");
+            }
+        } catch (Exception e) {
+            log.error("停止聊天输出异常", e);
+            return error("停止输出失败", e.getMessage());
+        }
+    }
+
+    /**
+     * 赞消息
+     * @param caseAiMsgLikeDto
+     * @return
+     */
+    @PostMapping("/likeMsg")
+    public JsonResponse<Boolean> likeMsg(@RequestBody CaseAiMsgLikeDto caseAiMsgLikeDto) {
+        try {
+            caseAiMsgLikeDto.setOperation(true);
+            if (caseAiChatService.msgFeedback(caseAiMsgLikeDto)) {
+                return success(true, "保存成功");
+            } else {
+                return success(false, "保存失败");
+            }
+        } catch (Exception e) {
+            log.error("消息赞/踩操作保存异常", e);
+            return error("保存失败", e.getMessage());
+        }
+    }
+
+
+    /**
+     * 消息问题反馈保存
+     * @param caseAiMsgLikeDto
+     * @return
+     */
+    @PostMapping("/msgFeedback")
+    public JsonResponse<Boolean> msgFeedback(@RequestBody CaseAiMsgLikeDto caseAiMsgLikeDto) {
+        try {
+            caseAiMsgLikeDto.setOperation(false);
+            if (caseAiChatService.msgFeedback(caseAiMsgLikeDto)) {
+                return success(true, "保存成功");
+            } else {
+                return success(false, "保存失败");
+            }
+        } catch (Exception e) {
+            log.error("消息问题反馈保存异常", e);
+            return error("保存失败", e.getMessage());
+        }
+    }
+
+    /**
+     * 获取消息
+     *
+     * @param getCaseAiMsgDto
+     */
+    @PostMapping("/getCaseAiMsg")
+    public JsonResponse<List<CaseAiMessageVo>> getCaseAiMsgDetail(@RequestBody GetCaseAiMsgDto getCaseAiMsgDto) {
+        try {
+            List<CaseAiMessageVo> caseAiMessageVoList = caseAiChatService.getCaseAiMsg(getCaseAiMsgDto);
+            return success(caseAiMessageVoList);
+        } catch (Exception e) {
+            log.error("获取消息详情异常", e);
+            return error("获取失败", e.getMessage());
+        }
+    }
+
     /**
      * 根据conversationId查看会话内消息记录
      * @param conversationId 会话ID
@@ -90,32 +165,10 @@ public class CaseAiChatApi extends ApiBaseController {
     public void downloadConversationExcel(@RequestParam String startTime, 
                                           @RequestParam String endTime, 
                                           HttpServletResponse response) {
-        try {
-            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-            LocalDateTime start = LocalDateTime.parse(startTime, formatter);
-            LocalDateTime end = LocalDateTime.parse(endTime, formatter);
-            
-            // TODO: 这里需要修改为实际返回数据的方法
-            caseAiChatService.downloadConversationExcel(start, end);
-            
-            response.setContentType("application/vnd.ms-excel");
-            response.setHeader("Content-Disposition", "attachment; filename=conversations.xls");
-            
-            // 示例数据，实际应该从Service获取
-            LinkedHashMap<String, String> headers = new LinkedHashMap<>();
-            headers.put("会话ID", "conversationId");
-            headers.put("会话名称", "conversationName");
-            headers.put("用户", "user");
-            headers.put("开始时间", "startTime");
-            headers.put("会话时长", "duration");
-            
-            List<ConversationExcelVo> dataList = new ArrayList<>();
-            // 这里应该填充实际数据
-            
-            ExportsExcelSenderUtil.export(headers, dataList, response.getOutputStream(), "yyyy-MM-dd HH:mm:ss");
-        } catch (Exception e) {
-            log.error("导出会话记录为Excel异常", e);
-        }
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        LocalDate startDate = LocalDate.parse(startTime, formatter);
+        LocalDate endDate = LocalDate.parse(endTime, formatter);
+        caseAiChatService.getConversationExcel(startDate.atStartOfDay(), endDate.atTime(23, 59, 59), response);
     }
     
     /**
@@ -155,6 +208,17 @@ public class CaseAiChatApi extends ApiBaseController {
         return error("刷新失败");
     }
 
+    /**
+     * 添加索引字段
+     * @param esFieldDTO
+     * @return
+     */
+    @PostMapping("/index/add_field")
+    public JsonResponse<String> addField(@RequestBody EsFieldDTO esFieldDTO) {
+        boolean result = elasticSearchIndexService.updateIndex(esFieldDTO.getFieldName(), esFieldDTO.getIndexProperties());
+        return result ? success("添加成功") : error("添加失败");
+    }
+
     @PostMapping("/es/create")
     public JsonResponse<String> createNewConversation(@RequestBody CaseAiMessageVo caseAiMessageVo,
                                                       @RequestParam String conversationId,
@@ -171,16 +235,4 @@ public class CaseAiChatApi extends ApiBaseController {
         }
         return error("创建失败");
     }
-    
-    /**
-     * 用于Excel导出的VO类
-     */
-    @Data
-    static class ConversationExcelVo {
-        private String conversationId;
-        private String conversationName;
-        private String user;
-        private String startTime;
-        private String duration;
-    }
 }

servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CaseUploadTaskApi.java

@@ -1,5 +1,6 @@
 package com.xboe.module.boecase.api;
 
+import com.xboe.module.boecase.task.CaseUploadTask;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
@@ -20,14 +21,21 @@ public class CaseUploadTaskApi {
     @Autowired
     private StringRedisTemplate stringRedisTemplate;
 
-    private static final String CASE_UPLOAD_LAST_ID_KEY = "case:upload:last:id";
-
     /**
      * 清除处理位置标记，使下次任务从头开始执行
      */
     @PostMapping("/reset")
     public void resetLastProcessedId() {
-        stringRedisTemplate.delete(CASE_UPLOAD_LAST_ID_KEY);
+        stringRedisTemplate.delete(CaseUploadTask.CASE_UPLOAD_LAST_ID_KEY);
+        log.info("已清除上次处理位置标记");
+    }
+
+    /**
+     * 清除处理位置标记，使下次任务从头开始执行
+     */
+    @PostMapping("/reload/reset")
+    public void resetReloadProcessedId() {
+        stringRedisTemplate.delete(CaseUploadTask.CASE_RELOAD_LAST_ID_KEY);
         log.info("已清除上次处理位置标记");
     }
 }

servers/boe-server-all/src/main/java/com/xboe/module/boecase/async/CaseAiDocumentAsyncHandler.java

@@ -17,6 +17,11 @@ public class CaseAiDocumentAsyncHandler {
 
     private final AtomicInteger currentTaskCount = new AtomicInteger(0);
 
+    /**
+     * 限流，默认QPS 40
+     */
+    private final TokenBucketRateLimiter rateLimiter = new TokenBucketRateLimiter(40);
+
     @Autowired
     @Qualifier("aiDocExecutor")
     private ThreadPoolTaskExecutor aiDocExecutor;
@@ -27,7 +32,7 @@ public class CaseAiDocumentAsyncHandler {
     public void process(CaseDocumentLogOptTypeEnum optTypeEnum, Cases... caseList) {
         for (Cases cases : caseList) {
             // 控制并发数量
-            while (currentTaskCount.get() >= 15) {
+            while (currentTaskCount.get() >= 5) {
                 try {
                     Thread.sleep(100);
                 } catch (InterruptedException e) {
@@ -39,8 +44,13 @@ public class CaseAiDocumentAsyncHandler {
             currentTaskCount.incrementAndGet();
 
             aiDocExecutor.submit(() -> {
-                processCases(cases, optTypeEnum);
-                currentTaskCount.decrementAndGet();
+                try {
+                    // 限流
+                    rateLimiter.acquire();
+                    processCases(cases, optTypeEnum);
+                } finally {
+                    currentTaskCount.decrementAndGet();
+                }
             });
         }
     }

servers/boe-server-all/src/main/java/com/xboe/module/boecase/async/TokenBucketRateLimiter.java

@@ -0,0 +1,55 @@
+package com.xboe.module.boecase.async;
+
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
+
+/**
+ * 令牌桶限流算法实现
+ */
+public class TokenBucketRateLimiter {
+
+    private final double permitsPerSecond; // 每秒生成的令牌数（即 TPS）
+    private final AtomicLong nextFreeTicketMicros = new AtomicLong(0); // 下一个令牌可用的时间（微秒）
+    private final AtomicLong storedPermits = new AtomicLong(0);       // 当前桶中存储的令牌数（本简化版不支持突发，可省略）
+    private static final long MICROSECONDS_PER_SECOND = 1_000_000L;
+
+    public TokenBucketRateLimiter(double permitsPerSecond) {
+        this.permitsPerSecond = permitsPerSecond;
+        this.nextFreeTicketMicros.set(System.nanoTime() / 1000); // 初始化为当前时间（微秒）
+    }
+
+    /**
+     * 获取一个令牌，阻塞直到可用
+     */
+    public void acquire() {
+        long waitMicros = reserve(1);
+        if (waitMicros > 0) {
+            try {
+                long waitNanos = waitMicros * 1000; // 转为纳秒
+                TimeUnit.NANOSECONDS.sleep(waitNanos);
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+            }
+        }
+    }
+
+    /**
+     * 预留 1 个令牌，返回需要等待的微秒数
+     */
+    private long reserve(int permits) {
+        long nowMicros = System.nanoTime() / 1000;
+        long nextFreeTicket = nextFreeTicketMicros.get();
+        long waitMicros = Math.max(0, nextFreeTicket - nowMicros);
+
+        long newNextFreeTicket = nowMicros + waitMicros + (long) (permits * MICROSECONDS_PER_SECOND / permitsPerSecond);
+        while (!nextFreeTicketMicros.compareAndSet(nextFreeTicket, newNextFreeTicket)) {
+            // CAS 失败，说明其他线程修改了时间，重试
+            nowMicros = System.nanoTime() / 1000;
+            nextFreeTicket = nextFreeTicketMicros.get();
+            waitMicros = Math.max(0, nextFreeTicket - nowMicros);
+            newNextFreeTicket = nowMicros + waitMicros + (long) (permits * MICROSECONDS_PER_SECOND / permitsPerSecond);
+        }
+
+        return waitMicros;
+    }
+}

servers/boe-server-all/src/main/java/com/xboe/module/boecase/dto/CaseAiMsgLikeDto.java

@@ -0,0 +1,32 @@
+package com.xboe.module.boecase.dto;
+
+import lombok.Data;
+
+@Data
+public class CaseAiMsgLikeDto {
+    /**
+     * 文档id
+     */
+    private String docId;
+
+    /**
+     * 点赞状态:
+     * -1 踩
+     * 1 赞
+     * 0/null 无操作
+     */
+    private String likeStatus;
+
+    /**
+     * 反馈
+     */
+    private String feedback;
+
+    /**
+     * 操作
+     * true: 点踩
+     * false: 反馈
+     * 为空：其他情况
+     */
+    private Boolean operation;
+}

servers/boe-server-all/src/main/java/com/xboe/module/boecase/dto/EsFieldDTO.java

@@ -0,0 +1,49 @@
+package com.xboe.module.boecase.dto;
+
+import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Data
+public class EsFieldDTO {
+
+    /**
+     * 字段名称
+     */
+    private String fieldName;
+
+    /**
+     * 字段属性
+     */
+    private Properties properties;
+
+    public Map<String, Object> getIndexProperties() {
+        Map<String, Object> indexProperties = new HashMap<>();
+        if (properties != null) {
+            indexProperties.put("type", properties.type);
+            if (properties.index != null) {
+                indexProperties.put("index", properties.index);
+            }
+            if (StringUtils.isNotBlank(properties.analyzer)) {
+                indexProperties.put("analyzer", properties.analyzer);
+            }
+            if (StringUtils.isNotBlank(properties.searchAnalyzer)) {
+                indexProperties.put("search_analyzer", properties.searchAnalyzer);
+            }
+        }
+        return indexProperties;
+    }
+
+    @Data
+    public static class Properties {
+        private String type;
+
+        private Boolean index;
+
+        private String analyzer;
+
+        private String searchAnalyzer;
+    }
+}

servers/boe-server-all/src/main/java/com/xboe/module/boecase/dto/GetCaseAiMsgDto.java

@@ -0,0 +1,16 @@
+package com.xboe.module.boecase.dto;
+
+import lombok.Data;
+
+@Data
+public class GetCaseAiMsgDto {
+    /**
+     * 会话Id
+     */
+    private String conversationId;
+
+    /**
+     * ES DocId
+     */
+    private String docId;
+}

servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/AiChatConversationData.java

@@ -34,6 +34,19 @@ public class AiChatConversationData {
      */
     private StringBuilder answer = new StringBuilder();
 
+    /**
+     * 状态
+     * 0-正常
+     * 1-系统错误
+     * 2-AIoT平台错误
+     */
+    private Integer status;
+
+    /**
+     * 错误信息
+     */
+    private String errorMsg;
+
     /**
      * 案例引用列表
      */
@@ -44,6 +57,20 @@ public class AiChatConversationData {
      */
     private List<String> suggestions = new ArrayList<>();
 
+    /**
+     * 用户点赞状态
+     * -1: 踩
+     * 1：赞
+     * 0/null 无操作
+     */
+    private String likeStatus;
+
+    /**
+     * 用户踩的时候, 可以填写反馈意见
+     * 反馈意见
+     */
+    private String feedback;
+
     /**
      * 用户ID
      */

servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/CaseDocumentLog.java

@@ -93,4 +93,12 @@ public class CaseDocumentLog extends BaseEntity {
      */
     @Column(name = "execute_duration")
     private Long executeDuration;
+
+    /**
+     * 元数据处理状态
+     * 0-未处理
+     * 1-已处理
+     */
+    @Column(name = "metadata_status")
+    private Integer metadataStatus;
 }

servers/boe-server-all/src/main/java/com/xboe/module/boecase/mq/BroadcastMessageConsumer.java

@@ -0,0 +1,27 @@
+package com.xboe.module.boecase.mq;
+
+
+import com.xboe.module.boecase.service.ICaseAiChatService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jms.annotation.JmsListener;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+public class BroadcastMessageConsumer {
+
+    @Autowired
+    private ICaseAiChatService iCaseAiChatService;
+
+    /**
+     * 接收会话终止广播消息
+     *
+     * @param conversationId 会话ID
+     */
+    @JmsListener(destination = "${activemq.topic.name}")
+    public void receiveSessionTerminationBroadcastMessage(String conversationId) {
+        log.info("收到会话终止广播消息：{}", conversationId);
+        iCaseAiChatService.eventSourceCancel(conversationId);
+    }
+}

servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICaseAiChatService.java

@@ -2,10 +2,13 @@ package com.xboe.module.boecase.service;
 
 import com.xboe.core.CurrentUser;
 import com.xboe.module.boecase.dto.CaseAiChatDto;
+import com.xboe.module.boecase.dto.CaseAiMsgLikeDto;
+import com.xboe.module.boecase.dto.GetCaseAiMsgDto;
 import com.xboe.module.boecase.entity.CaseAiConversations;
 import com.xboe.module.boecase.vo.CaseAiMessageVo;
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 
+import javax.servlet.http.HttpServletResponse;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -16,6 +19,7 @@ public interface ICaseAiChatService {
 
     /**
      * 聊天
+     *
      * @param caseAiChatDto
      * @param currentUser
      * @return
@@ -24,7 +28,8 @@ public interface ICaseAiChatService {
 
     /**
      * 创建新的AI对话会话
-     * @param userId 用户ID
+     *
+     * @param userId           用户ID
      * @param conversationName 对话名称
      * @return 创建的会话信息
      */
@@ -32,6 +37,7 @@ public interface ICaseAiChatService {
 
     /**
      * 根据conversationId查看会话内消息记录
+     *
      * @param conversationId 会话ID
      * @return 消息记录列表
      */
@@ -41,6 +47,46 @@ public interface ICaseAiChatService {
      * 导出会话记录为Excel
      * @param startTime 开始时间
      * @param endTime 结束时间
+     * @param response
+     */
+    void getConversationExcel(LocalDateTime startTime, LocalDateTime endTime, HttpServletResponse response);
+
+    /**
+     * 导出会话记录为Excel
+     *
+     * @param startTime 开始时间
+     * @param endTime   结束时间
      */
     void downloadConversationExcel(LocalDateTime startTime, LocalDateTime endTime);
-}
+
+    /**
+     * 停止当前聊天输出
+     *
+     * @param conversationId 会话ID
+     * @return 是否成功停止
+     */
+    boolean stopChatOutput(String conversationId);
+
+    /**
+     * 取消eventSource
+     *
+     * @param conversationId 会话ID
+     */
+    void eventSourceCancel(String conversationId);
+
+    /**
+     * 消息反馈保存
+     * likeStatus: 踩/赞
+     * feedBack: 反馈消息内容
+     *
+     * @param caseAiMsgLikeDto
+     */
+    boolean msgFeedback(CaseAiMsgLikeDto caseAiMsgLikeDto);
+
+    /**
+     * 获取消息
+     *
+     * @param getCaseAiMsgDto
+     */
+    List<CaseAiMessageVo> getCaseAiMsg(GetCaseAiMsgDto getCaseAiMsgDto);
+}

servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/IElasticSearchIndexService.java

@@ -4,6 +4,7 @@ import com.xboe.module.boecase.entity.AiChatConversationData;
 import com.xboe.module.boecase.vo.CaseAiMessageVo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * es索引
@@ -27,6 +28,14 @@ public interface IElasticSearchIndexService {
      */
     boolean deleteIndex();
 
+    /**
+     * 更新索引：添加索引字段
+     * @param fieldName
+     * @param fieldProperties
+     * @return
+     */
+    boolean updateIndex(String fieldName, Map<String, Object> fieldProperties);
+
     /**
      * 新增数据
      * @param data
@@ -40,4 +49,20 @@ public interface IElasticSearchIndexService {
      * @return
      */
     List<CaseAiMessageVo> queryData(String conversationId);
+
+    /**
+     * 更新数据
+     * @param docId
+     * @param data
+     * @return
+     */
+    boolean updateData(String docId, AiChatConversationData data);
+
+    /**
+     * 通过docId查询数据
+     *
+     * @param docId ES docId
+     * @return
+     */
+    List<CaseAiMessageVo> queryDataByDocId(String docId);
 }

servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/AiAccessTokenServiceImpl.java

@@ -22,7 +22,7 @@ import java.util.concurrent.TimeUnit;
 
 @EnableConfigurationProperties({CaseAiProperties.class})
 @Service
-@Slf4j
+@Slf4j(topic = "caseAiChatLogger")
 public class AiAccessTokenServiceImpl implements IAiAccessTokenService {
 
     private static final String ACCESS_TOKEN_CACHE_KEY = "case_ai_access_token";

servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CaseAiChatServiceImpl.java

@@ -2,13 +2,18 @@ package com.xboe.module.boecase.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.xboe.constants.CaseAiConstants;
 import com.xboe.core.CurrentUser;
 import com.xboe.core.orm.FieldFilters;
+import com.xboe.enums.CaseAiChatErrCodeEnum;
 import com.xboe.enums.CaseAiChatStatusEnum;
 import com.xboe.module.boecase.dao.CaseAiConversationsDao;
 import com.xboe.module.boecase.dao.CaseDocumentLogDao;
 import com.xboe.module.boecase.dao.CasesDao;
 import com.xboe.module.boecase.dto.CaseAiChatDto;
+import com.xboe.module.boecase.dto.GetCaseAiMsgDto;
+import com.xboe.module.boecase.entity.AiChatConversationData;
+import com.xboe.module.boecase.dto.CaseAiMsgLikeDto;
 import com.xboe.module.boecase.entity.CaseAiConversations;
 import com.xboe.module.boecase.entity.CaseDocumentLog;
 import com.xboe.module.boecase.entity.Cases;
@@ -18,17 +23,15 @@ import com.xboe.module.boecase.service.ICaseAiChatService;
 import com.xboe.module.boecase.service.IElasticSearchIndexService;
 import com.xboe.module.boecase.vo.CaseAiMessageVo;
 import com.xboe.module.boecase.vo.CaseReferVo;
-import com.xboe.module.boecase.entity.AiChatConversationData;
 import com.xboe.module.boecase.vo.ConversationExcelVo;
 import com.xboe.system.organization.vo.OrgSimpleVo;
 import com.xboe.system.user.service.IUserService;
-import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.*;
 import okhttp3.sse.EventSource;
 import okhttp3.sse.EventSourceListener;
 import okhttp3.sse.EventSources;
-import org.apache.http.HttpEntity;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.StringEntity;
@@ -40,27 +43,20 @@ import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.elasticsearch.action.index.IndexRequest;
-import org.elasticsearch.action.index.IndexResponse;
-import org.elasticsearch.action.search.SearchRequest;
-import org.elasticsearch.action.search.SearchResponse;
-import org.elasticsearch.client.RequestOptions;
-import org.elasticsearch.client.RestHighLevelClient;
-import org.elasticsearch.common.xcontent.XContentType;
-import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.search.SearchHit;
-import org.elasticsearch.search.SearchHits;
-import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.jms.JmsException;
+import org.springframework.jms.core.JmsTemplate;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.StringUtils;
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 
+import javax.jms.Topic;
+import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -71,16 +67,21 @@ import java.nio.file.Paths;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 
 @EnableConfigurationProperties({CaseAiProperties.class})
 @Service
-@Slf4j
+@Slf4j(topic = "caseAiChatLogger")
 public class CaseAiChatServiceImpl implements ICaseAiChatService {
 
     @Autowired
     private CaseAiProperties caseAiProperties;
 
+    @Autowired
+    @Qualifier("esChatExecutor")
+    private ThreadPoolTaskExecutor esChatExecutor;
+
     @Autowired
     @Qualifier("customDispatcher")
     private Dispatcher dispatcher;
@@ -103,6 +104,15 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
     @Autowired
     private CasesDao casesDao;
 
+    @Autowired
+    private JmsTemplate jmsTemplate;
+
+    @Autowired
+    private Topic topic;
+
+    // 用于存储会话ID与EventSource的映射关系，以便能够中断特定会话
+    private final Map<String, EventSource> conversationEventSourceMap = new ConcurrentHashMap<>();
+
     @Override
     @Transactional
     public SseEmitter chat(CaseAiChatDto caseAiChatDto, CurrentUser currentUser) {
@@ -114,16 +124,24 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
             conversationId = getOrCreateConversationId(caseAiChatDto, currentUser);
         } catch (Exception e) {
             log.error("获取会话ID失败", e);
-            errMessage(sseEmitter, "服务繁忙，请稍后再试。");
+            errMessage(sseEmitter, null, CaseAiConstants.CHAT_SYS_ERR_MSG);
             sseEmitter.complete();
             return sseEmitter;
         }
 
         // 2. 查询历史
         List<CaseAiMessageVo> historyMessages = elasticSearchIndexService.queryData(conversationId);
-        
+
         // 3. 构建请求参数
         String userId = currentUser.getCode();
+
+        // 6. 用于收集对话数据的容器
+        AiChatConversationData conversationData = new AiChatConversationData();
+        conversationData.setQuery(caseAiChatDto.getQuery());
+        conversationData.setConversationId(conversationId);
+        conversationData.setUserId(userId);
+        conversationData.setStatus(CaseAiChatErrCodeEnum.SUCCESS.getCode());
+
         String kId = caseAiProperties.getCaseKnowledgeId();
         JSONObject chatParam = new JSONObject();
         chatParam.put("userId", userId);
@@ -149,15 +167,30 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
         }
         String chatParamStr = chatParam.toJSONString();
         log.info("案例问答接口请求参数: [{}]", chatParamStr);
-        
+
         // 4. 设置请求头
         String accessToken;
         try {
             accessToken = aiAccessTokenService.getAccessToken();
+            if (org.apache.commons.lang3.StringUtils.isBlank(accessToken)) {
+                errMessage(sseEmitter, conversationId, CaseAiConstants.CHAT_SYS_ERR_MSG);
+                // 先响应给前端
+                sseEmitter.complete();
+                conversationData.setStatus(CaseAiChatErrCodeEnum.AIOT_ERROR.getCode());
+                conversationData.setErrorMsg("获取AccessToken时发生异常");
+                conversationData.appendAnswer(CaseAiConstants.CHAT_SYS_ERR_MSG);
+                saveConversationData(conversationData);
+                return sseEmitter;
+            }
         } catch (Exception e) {
             log.error("获取access_token失败", e);
-            errMessage(sseEmitter, "服务繁忙，请稍后再试。");
+            errMessage(sseEmitter, conversationId, CaseAiConstants.CHAT_SYS_ERR_MSG);
+            // 先响应给前端
             sseEmitter.complete();
+            conversationData.setStatus(CaseAiChatErrCodeEnum.AIOT_ERROR.getCode());
+            conversationData.setErrorMsg("获取AccessToken时发生异常" + e.getMessage());
+            conversationData.appendAnswer(CaseAiConstants.CHAT_SYS_ERR_MSG);
+            saveConversationData(conversationData);
             return sseEmitter;
         }
         String apiCode = caseAiProperties.getChatApiCode();
@@ -169,39 +202,77 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
         builder.post(bodyRequestBody);
         Request request = builder.build();
 
-        
-        // 6. 用于收集对话数据的容器
-        AiChatConversationData conversationData = new AiChatConversationData();
-        conversationData.setQuery(caseAiChatDto.getQuery());
-        conversationData.setConversationId(conversationId);
-        conversationData.setUserId(userId);
-        
         // 7. 创建事件监听器
         EventSourceListener listener = new EventSourceListener() {
             @Override
             public void onOpen(@NotNull EventSource eventSource, @NotNull Response response) {
                 log.info("调用接口 [{}] 接口开始监听", request.url());
+                // 检查contentType
+                String contentType = response.header("Content-Type");
+                if (contentType == null || !contentType.contains("text/event-stream")) {
+                    // 服务器返回的不是SSE流，需要额外处理
+                    log.error("调用接口 [{}] 返回的Content-Type不是text/event-stream，实际ContentType: {}", request.url(), contentType);
+                    String sseContent;
+                    try {
+                        ResponseBody responseBody = response.body();
+                        if (responseBody == null) {
+                            sseContent = CaseAiConstants.CHAT_SYS_ERR_MSG;
+                        } else {
+                            String responseBodyStr = responseBody.string();
+                            log.error("调用 [{}] 返回值: {}", request.url(), responseBodyStr);
+                            // 判断是否为json
+                            if (contentType != null && contentType.contains("application/json")) {
+                                JSONObject responseData = JSONObject.parseObject(responseBodyStr);
+                                if (responseData.containsKey("message") && StringUtils.isNotBlank(responseData.getString("message"))) {
+                                    sseContent = responseData.getString("message");
+                                } else {
+                                    sseContent = CaseAiConstants.CHAT_SYS_ERR_MSG;
+                                }
+                            } else {
+                                sseContent = CaseAiConstants.CHAT_SYS_ERR_MSG;
+                            }
+                        }
+                    } catch (IOException e) {
+                        log.error("解析接口响应失败", e);
+                        // 处理失败的情况
+                        sseContent = CaseAiConstants.CHAT_SYS_ERR_MSG;
+                    }
+
+                    errMessage(sseEmitter, conversationId, sseContent);
+                    sseEmitter.complete();
+                    conversationData.setStatus(CaseAiChatErrCodeEnum.AIOT_ERROR.getCode());
+                    conversationData.setErrorMsg(sseContent);
+                    conversationData.appendAnswer(sseContent);
+                    saveConversationData(conversationData);
+                    // 关闭eventSource
+                    eventSource.cancel();
+                    return;
+                }
+                // 将EventSource存储到Map中，以便后续可以中断
+                conversationEventSourceMap.put(conversationId, eventSource);
             }
 
             @Override
             public void onClosed(@NotNull EventSource eventSource) {
                 log.info("调用接口 [{}] 接口关闭", request.url());
                 // 对话完成，保存到ES
-                elasticSearchIndexService.createData(conversationData);
+                saveConversationData(conversationData);
+                // 从Map中移除已完成的会话
+                conversationEventSourceMap.remove(conversationId);
                 sseEmitter.complete();
             }
 
             @Override
             public void onEvent(@NotNull EventSource eventSource, @Nullable String id, @Nullable String type, @NotNull String data) {
                 log.info("调用接口 [{}] 监听数据 id: [{}] type: [{}] data: [{}]", request.url(), id, type, data);
-                
+
                 try {
                     // 解析返回的数据
                     JSONObject jsonData = JSONObject.parseObject(data);
                     if (jsonData.getBooleanValue("success") && jsonData.getIntValue("code") == 0) {
                         JSONObject responseData = jsonData.getJSONObject("data");
                         Integer status = responseData.getInteger("status");
-                        
+
                         if (status != null) {
                             CaseAiChatStatusEnum statusEnum = CaseAiChatStatusEnum.getByCode(status);
                             if (statusEnum == CaseAiChatStatusEnum.REFERS) { // 返回引用文件
@@ -224,7 +295,9 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
                             } else {
                                 // 异常问题，取message内容
                                 String message = jsonData.getString("message");
-                                errMessage(sseEmitter, message);
+                                errMessage(sseEmitter, conversationId, message);
+                                conversationData.setStatus(CaseAiChatErrCodeEnum.AIOT_ERROR.getCode());
+                                conversationData.setErrorMsg(jsonData.toJSONString());
                                 return;
                             }
                         }
@@ -246,26 +319,53 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
 
             @Override
             public void onFailure(@NotNull EventSource eventSource, @Nullable Throwable e, @Nullable Response response) {
-                log.error("调用接口 [{}] 接口异常", request.url(), e);
-                
-                // 如果是 content-type 错误，尝试作为普通 HTTP 请求处理
-                if (e instanceof IllegalStateException && e.getMessage() != null && e.getMessage().contains("Invalid content-type")) {
-                    log.warn("服务器返回的 Content-Type 不是 text/event-stream，尝试作为普通 HTTP 请求处理");
-                    handleAsRegularHttpRequest(request, sseEmitter, conversationData);
-                    return;
-                }
-                
+                // 只要有异常，必打日志
                 if (e != null) {
-                    sseEmitter.completeWithError(e);
+                    log.error("调用接口 [{}] 时发生错误，捕获到异常", request.url(), e);
                 } else {
-                    sseEmitter.completeWithError(new RuntimeException("调用接口异常, 异常未捕获"));
+                    log.error("调用接口 [{}] 时发生错误，未捕获到异常", request.url());
                 }
+                String errorMessage = CaseAiConstants.CHAT_SYS_ERR_MSG;
+                // 优先处理错误响应
+                if (response != null) {
+                    try {
+                        log.error("调用接口 [{}] 时发生错误，响应码: {}", request.url(), response.code());
+                        if (response.body() != null) {
+                            String body = response.body().string();
+                            log.error("调用接口 [{}] 时的错误响应内容: {}", request.url(), body);
+                            // 将错误内容发送至SseEmitter
+                            if (StringUtils.contains(response.header("Content-Type"), "application/json")) {
+                                // json解析
+                                JSONObject jsonData = JSONObject.parseObject(body);
+                                if (jsonData.containsKey("message") && StringUtils.isNotBlank(jsonData.getString("message"))) {
+                                    errorMessage = jsonData.getString("message");
+                                }
+                            }
+                        }
+                    } catch (IOException ex) {
+                        log.error("解析异常请求时错误", ex);
+                    }
+                } else if (e != null) {
+                    if (isTimeoutException(e)) {
+                        errorMessage = CaseAiConstants.CHAT_NET_ERR_MSG;
+                    }
+                }
+
+                errMessage(sseEmitter, conversationId, errorMessage);
+                sseEmitter.complete();
+                // 从Map中移除失败的会话
+                conversationEventSourceMap.remove(conversationId);
+                // 即使失败，也要将已有的对话数据保存到ES
+                conversationData.setStatus(CaseAiChatErrCodeEnum.AIOT_ERROR.getCode());
+                conversationData.setErrorMsg(errorMessage);
+                conversationData.appendAnswer(errorMessage);
+                saveConversationData(conversationData);
             }
         };
-        
+
         // 8. 执行HTTP请求
         OkHttpClient client = new OkHttpClient.Builder()
-                .connectTimeout(60, TimeUnit.SECONDS)
+                .connectTimeout(100, TimeUnit.SECONDS)
                 .writeTimeout(600, TimeUnit.SECONDS)
                 .readTimeout(600, TimeUnit.SECONDS)
                 .callTimeout(600, TimeUnit.SECONDS)
@@ -273,16 +373,16 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
                 .build();
         EventSource.Factory factory = EventSources.createFactory(client);
         factory.newEventSource(request, listener);
-        
+
         return sseEmitter;
     }
-    
+
     /**
      * 获取或创建会话ID
      */
     private String getOrCreateConversationId(CaseAiChatDto caseAiChatDto, CurrentUser currentUser) {
         String conversationId = caseAiChatDto.getConversationId();
-        
+
         if (StringUtils.isEmpty(conversationId)) {
             // 新会话，调用创建会话接口
             String conversationName = "AI案例咨询-" + LocalDateTime.now().toString();
@@ -300,39 +400,39 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
         try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
             String url = caseAiProperties.getBaseUrl() + "/apigateway/knowledge/v1/conversation";
             HttpPost httpPost = new HttpPost(url);
-            
+
             // 设置请求头
             String accessToken = aiAccessTokenService.getAccessToken();
             String apiCode = caseAiProperties.getChatApiCode();
             httpPost.setHeader("access_token", accessToken);
             httpPost.setHeader("X-AI-ApiCode", apiCode);
             httpPost.setHeader("Content-Type", "application/json");
-            
+
             // 设置请求体
             JSONObject requestBody = new JSONObject();
             requestBody.put("userId", userId);
             requestBody.put("name", conversationName);
             StringEntity entity = new StringEntity(requestBody.toJSONString(), StandardCharsets.UTF_8);
             httpPost.setEntity(entity);
-            
+
             try (CloseableHttpResponse response = httpClient.execute(httpPost)) {
                 int statusCode = response.getStatusLine().getStatusCode();
                 String responseBody = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
-                
+
                 if (statusCode == 200) {
                     JSONObject result = JSONObject.parseObject(responseBody);
                     if (result.getIntValue("code") == 0 && result.getBooleanValue("success")) {
                         JSONObject data = result.getJSONObject("data");
                         String aiConversationId = data.getString("id");
                         String name = data.getString("name");
-                        
+
                         // 保存到数据库
                         CaseAiConversations conversation = new CaseAiConversations();
                         conversation.setAiConversationId(aiConversationId);
                         conversation.setConversationName(name);
                         conversation.setConversationUser(userId);
                         caseAiConversationsDao.save(conversation);
-                        
+
                         log.info("创建AI会话成功，aiConversationId: {}, name: {}", aiConversationId, name);
                         return conversation;
                     } else {
@@ -359,92 +459,24 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
         return elasticSearchIndexService.queryData(conversationId);
     }
 
+    @Override
+    public void getConversationExcel(LocalDateTime startTime, LocalDateTime endTime, HttpServletResponse response) {
+        Workbook workbook = getChatMessageExcel(startTime, endTime);
+        // 写入response.getOutputStream()
+        try (OutputStream out = response.getOutputStream()) {
+            response.setContentType("application/octet-stream");
+            response.setHeader("Content-Disposition", "attachment;filename=chat_message.xlsx");
+            workbook.write(out);
+            out.flush();
+        } catch (Exception e) {
+            log.error("导出Excel异常", e);
+        }
+    }
+
     @Override
     public void downloadConversationExcel(LocalDateTime startTime, LocalDateTime endTime) {
-        // 1. 根据startTime和endTime，查询在这个时间区间内的CaseAiConversations数据
-        List<CaseAiConversations> conversations = caseAiConversationsDao.getGenericDao().findList(
-            CaseAiConversations.class,
-            FieldFilters.ge("sysCreateTime", startTime),
-            FieldFilters.le("sysCreateTime", endTime)
-        );
-        
-        // 准备Excel数据
-        List<ConversationExcelVo> excelDataList = new ArrayList<>();
-        
-        // 2. 遍历这组数据，根据aiConversationId从es中查询数据（可调用getConversationMessages()方法）
-        for (CaseAiConversations conversation : conversations) {
-            String aiConversationId = conversation.getAiConversationId();
-            String conversationName = conversation.getConversationName();
-            String conversationUser = conversation.getConversationUser();
-            
-            List<CaseAiMessageVo> messages = getConversationMessages(aiConversationId);
-            
-            // 计算会话时长
-            long duration = 0; // 默认为0，如果需要精确计算，需要从消息中提取时间信息
-            
-            // 3. 写入Excel，包括每个会话的用户，会话标题，会话内的问答记录，每次对话时长等
-            ConversationExcelVo excelData = new ConversationExcelVo();
-            excelData.setConversationId(aiConversationId);
-            excelData.setConversationName(conversationName);
-            excelData.setUser(conversationUser);
-            excelData.setMessages(messages);
-            
-            excelDataList.add(excelData);
-        }
-        
-        // 写入Excel文件
-        Workbook workbook = new XSSFWorkbook();
-        Sheet sheet = workbook.createSheet("AI会话数据");
-        // 标题行
-        Row headerRow = sheet.createRow(0);
-        headerRow.createCell(0).setCellValue("会话ID");
-        headerRow.createCell(1).setCellValue("会话名称");
-        headerRow.createCell(2).setCellValue("用户");
-        headerRow.createCell(3).setCellValue("提问");
-        headerRow.createCell(4).setCellValue("回答");
-        headerRow.createCell(5).setCellValue("开始时间");
-        headerRow.createCell(6).setCellValue("问答时长(秒)");
-        
-        // 内容行
-        if (!excelDataList.isEmpty()) {
-            int rowNum = 1; // 从第二行开始写入数据
-            for (ConversationExcelVo excelData : excelDataList) {
-                List<CaseAiMessageVo> messages = excelData.getMessages();
-                
-                if (messages != null && !messages.isEmpty()) {
-                    // 记录起始行号，用于后续合并单元格
-                    int startRow = rowNum;
-                    
-                    // 遍历每个消息
-                    for (CaseAiMessageVo message : messages) {
-                        Row row = sheet.createRow(rowNum++);
-                        // 填充每行数据
-                        row.createCell(0).setCellValue(excelData.getConversationId());
-                        row.createCell(1).setCellValue(excelData.getConversationName());
-                        row.createCell(2).setCellValue(excelData.getUser());
-                        row.createCell(3).setCellValue(message.getQuery() != null ? message.getQuery() : "");
-                        row.createCell(4).setCellValue(message.getAnswer() != null ? message.getAnswer() : "");
-                        row.createCell(5).setCellValue(""); // 开始时间字段暂留空
-                        row.createCell(6).setCellValue(message.getDurationSeconds() != null ? message.getDurationSeconds() : 0);
-                    }
-                    
-                    // 合并单元格（会话ID、会话名称、用户三列）
-                    // 参数说明：起始行号，结束行号，起始列号，结束列号
-                    if (rowNum > startRow + 1) { // 只有当有多行时才合并
-                        sheet.addMergedRegion(new CellRangeAddress(startRow, rowNum - 1, 0, 0));
-                        sheet.addMergedRegion(new CellRangeAddress(startRow, rowNum - 1, 1, 1));
-                        sheet.addMergedRegion(new CellRangeAddress(startRow, rowNum - 1, 2, 2));
-                    }
-                } else {
-                    // 如果没有消息，则仍然创建一行显示基本信息
-                    Row row = sheet.createRow(rowNum++);
-                    row.createCell(0).setCellValue(excelData.getConversationId());
-                    row.createCell(1).setCellValue(excelData.getConversationName());
-                    row.createCell(2).setCellValue(excelData.getUser());
-                }
-            }
-        }
-        // 3. 创建Excel文件并保存
+        Workbook workbook = getChatMessageExcel(startTime, endTime);
+        // 创建Excel文件并保存
         if (caseAiProperties.isAiChatDataSendEmail()) {
             // TODO 发送邮件附件
         } else {
@@ -471,52 +503,56 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
 
     /**
      * 从 ES 数据中解析消息对象
+     * 已迁移
+     * @see IElasticSearchIndexService
+     *
      * @param sourceMap ES数据
      * @return 消息对象
      */
+    @Deprecated
     private CaseAiMessageVo parseMessageFromES(Map<String, Object> sourceMap) {
         try {
             CaseAiMessageVo messageVo = new CaseAiMessageVo();
             messageVo.setQuery((String) sourceMap.get("query"));
             messageVo.setAnswer((String) sourceMap.get("answer"));
-            
+
             // 解析 suggestions
             Object suggestionsObj = sourceMap.get("suggestions");
             if (suggestionsObj instanceof List) {
                 messageVo.setSuggestions((List<String>) suggestionsObj);
             }
-            
+
             // 解析 caseRefer
             Object caseReferObj = sourceMap.get("caseRefer");
             if (caseReferObj instanceof List) {
                 List<CaseReferVo> caseReferList = new ArrayList<>();
                 List<Map<String, Object>> caseReferMaps = (List<Map<String, Object>>) caseReferObj;
-                
+
                 for (Map<String, Object> caseReferMap : caseReferMaps) {
                     CaseReferVo caseRefer = new CaseReferVo();
                     caseRefer.setCaseId((String) caseReferMap.get("caseId"));
                     caseRefer.setTitle((String) caseReferMap.get("title"));
                     caseRefer.setAuthorName((String) caseReferMap.get("authorName"));
                     caseRefer.setContent((String) caseReferMap.get("content"));
-                    
+
                     // 解析 keywords
                     Object keywordsObj = caseReferMap.get("keywords");
                     if (keywordsObj instanceof List) {
                         caseRefer.setKeywords((List<String>) keywordsObj);
                     }
-                    
+
                     caseReferList.add(caseRefer);
                 }
                 messageVo.setCaseRefer(caseReferList);
             }
-            
+
             return messageVo;
         } catch (Exception e) {
             log.error("解析ES消息数据异常", e);
             return null;
         }
     }
-    
+
     /**
      * 处理文件引用并构建返给前端的响应数据
      */
@@ -525,7 +561,7 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
             // 先处理文件引用，收集CaseReferVo数据
             List<CaseReferVo> currentCaseRefers = new ArrayList<>();
             Set<String> docIds = new HashSet<>();
-            
+
             JSONObject fileRefer = responseData.getJSONObject("fileRefer");
             if (fileRefer != null && fileRefer.containsKey("files")) {
                 JSONArray files = fileRefer.getJSONArray("files");
@@ -543,13 +579,13 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
                     }
                 }
             }
-            
+
             // 构建返给前端的数据结构
             JSONObject data = new JSONObject();
             data.put("status", 0);
             data.put("conversationId", conversationData.getConversationId());
             data.put("content", responseData.getString("content"));
-            
+
             // 添加处理后的案例引用数据
             JSONArray caseReferArray = new JSONArray();
             for (CaseReferVo caseRefer : currentCaseRefers) {
@@ -565,11 +601,11 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
 
                 caseReferArray.add(caseReferObj);
             }
-            
+
             // 构建新的fileRefer结构，包含案例引用
             JSONObject newFileRefer = new JSONObject();
             newFileRefer.put("caseRefers", caseReferArray);
-            
+
             // 保留原始的docs和files信息（如果需要）
             if (fileRefer != null) {
                 if (fileRefer.containsKey("docs")) {
@@ -579,22 +615,23 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
                     newFileRefer.put("files", fileRefer.get("files"));
                 }
             }
-            
+
             data.put("fileRefer", newFileRefer);
             data.put("suggestions", responseData.get("suggestions"));
-            
+
             log.info("处理文件引用成功，返回 {} 个案例引用", currentCaseRefers.size());
             return data;
-            
+
         } catch (Exception e) {
             log.error("处理文件引用并构建响应数据异常", e);
             return null;
         }
     }
-    
+
     /**
      * 处理文件引用（原方法，保留用于数据收集）
      */
+    @Deprecated
     private void handleFileRefer(JSONObject responseData, AiChatConversationData conversationData) {
         try {
             JSONObject fileRefer = responseData.getJSONObject("fileRefer");
@@ -616,7 +653,7 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
             log.error("处理文件引用异常", e);
         }
     }
-    
+
     /**
      * 处理建议
      */
@@ -635,7 +672,7 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
             log.error("处理建议异常", e);
         }
     }
-    
+
     /**
      * 根据docId查询案例引用信息
      */
@@ -646,7 +683,7 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
             if (docLog == null) {
                 return null;
             }
-            
+
             // 根据 case_id 查询案例详情
             Cases caseEntity = casesDao.get(docLog.getCaseId());
             if (caseEntity == null) {
@@ -663,7 +700,7 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
             caseRefer.setContent(caseEntity.getSummary());
             caseRefer.setUploadTime(caseEntity.getSysCreateTime());
             caseRefer.setOrgInfo(authorOrg.getName());
-            
+
             // 构建关键词列表
             List<String> keywords = new ArrayList<>();
             if (caseEntity.getKeyword1() != null) keywords.add(caseEntity.getKeyword1());
@@ -672,17 +709,19 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
             if (caseEntity.getKeyword4() != null) keywords.add(caseEntity.getKeyword4());
             if (caseEntity.getKeyword5() != null) keywords.add(caseEntity.getKeyword5());
             caseRefer.setKeywords(keywords);
-            
+
             return caseRefer;
         } catch (Exception e) {
             log.error("根据docId查询案例引用信息异常", e);
             return null;
         }
     }
-    
+
     /**
      * 当 SSE 失败时，作为普通 HTTP 请求处理
+     * 不再使用
      */
+    @Deprecated
     private void handleAsRegularHttpRequest(Request request, SseEmitter sseEmitter, AiChatConversationData conversationData) {
         try {
             OkHttpClient client = new OkHttpClient.Builder()
@@ -690,16 +729,16 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
                     .writeTimeout(60, TimeUnit.SECONDS)
                     .readTimeout(60, TimeUnit.SECONDS)
                     .build();
-            
+
             Response response = client.newCall(request).execute();
             if (response.isSuccessful()) {
                 String responseBody = response.body().string();
                 log.info("作为普通 HTTP 请求处理成功，将响应原封不动推送给前端");
-                
+
                 // 将响应内容原封不动地推送到 SseEmitter
                 JSONObject responseData = JSONObject.parseObject(responseBody);
                 if (responseBody.contains("message")) {
-                    errMessage(sseEmitter, responseData.getString("message"));
+                    errMessage(sseEmitter, conversationData.getConversationId(), responseData.getString("message"));
                     sseEmitter.complete();
                     return;
                 }
@@ -715,15 +754,258 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
         }
     }
 
-    private void errMessage(SseEmitter sseEmitter, String message) {
+    /**
+     * 发送错误信息
+     */
+    private void errMessage(SseEmitter sseEmitter, String conversationId, String message) {
+        JSONObject conversationData = new JSONObject();
+        conversationData.put("conversationId", conversationId);
+        conversationData.put("content", "");
+        conversationData.put("status", 0);
+
         JSONObject jsonData = new JSONObject();
         jsonData.put("status", 1);
         jsonData.put("content", message);
+
+        JSONObject finishData = new JSONObject();
+        finishData.put("status", 4);
+        finishData.put("content", "");
         try {
+            sseEmitter.send(conversationData.toJSONString());
             sseEmitter.send(jsonData.toJSONString());
+            sseEmitter.send(finishData.toJSONString());
         } catch (IOException e) {
             log.error("发送错误信息异常", e);
             sseEmitter.completeWithError(e);
         }
     }
+
+    @Override
+    public boolean stopChatOutput(String conversationId) {
+        log.info("收到停止会话 {} 的指令", conversationId);
+        // 发送广播消息，通知中断连接
+        try {
+            jmsTemplate.convertAndSend(topic, conversationId);
+        } catch (JmsException e) {
+            log.error("发送停止会话 {} 输出时发生异常", conversationId, e);
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * 取消eventSource
+     */
+    @Override
+    public void eventSourceCancel(String conversationId) {
+        EventSource eventSource = conversationEventSourceMap.get(conversationId);
+        if (eventSource != null) {
+            try {
+                // 取消事件源，中断连接
+                eventSource.cancel();
+                // 注意：cancel()会触发onFailure回调，在onFailure中会清理资源
+                log.info("成功发送停止会话 {} 的指令", conversationId);
+            } catch (Exception e) {
+                log.error("停止会话 {} 输出时发生异常", conversationId, e);
+                // 即使出现异常，也从Map中移除，避免内存泄漏
+                conversationEventSourceMap.remove(conversationId);
+            }
+        } else {
+            log.info("未找到会话 {} 对应的事件源，可能已经完成或不存在", conversationId);
+        }
+    }
+
+    @Override
+    public boolean msgFeedback(CaseAiMsgLikeDto caseAiMsgLikeDto) {
+        AiChatConversationData aiChatConversationData = new AiChatConversationData();
+        if (StringUtils.isBlank(caseAiMsgLikeDto.getDocId())) {
+            log.error("操作失败，docId为空");
+            return false;
+        }
+        if (Boolean.TRUE.equals(caseAiMsgLikeDto.getOperation())) {
+            String likeStatus = caseAiMsgLikeDto.getLikeStatus();
+            if (!StringUtils.equals(likeStatus, "1") && !StringUtils.equals(likeStatus, "0") && !StringUtils.equals(likeStatus, "-1")) {
+                log.error("操作失败，参数错误");
+                return false;
+            }
+        } else if (Boolean.FALSE.equals(caseAiMsgLikeDto.getOperation())) {
+            if (StringUtils.isBlank(caseAiMsgLikeDto.getFeedback())) {
+                log.error("操作失败，参数错误");
+                return false;
+            }
+        }
+        aiChatConversationData.setLikeStatus(caseAiMsgLikeDto.getLikeStatus());
+        aiChatConversationData.setFeedback(caseAiMsgLikeDto.getFeedback());
+        return elasticSearchIndexService.updateData(caseAiMsgLikeDto.getDocId() ,aiChatConversationData);
+    }
+
+    /**
+     * 获取消息详情
+     *
+     * @param getCaseAiMsgDto
+     */
+    @Override
+    public List<CaseAiMessageVo> getCaseAiMsg(GetCaseAiMsgDto getCaseAiMsgDto) {
+        String conversationId = getCaseAiMsgDto.getConversationId();
+        String docId = getCaseAiMsgDto.getDocId();
+        if (StringUtils.isBlank(conversationId) && StringUtils.isBlank(docId)) {
+            log.error("获取消息详情失败，会话id与docId不可同时为空");
+            throw new RuntimeException("获取消息详情失败，会话id与docId不可同时为空");
+        }
+        List<CaseAiMessageVo> list = new ArrayList<>();
+        if (StringUtils.isNotBlank(conversationId)) {
+            return elasticSearchIndexService.queryData(conversationId);
+        }
+        if (StringUtils.isNotBlank(docId)) {
+           return elasticSearchIndexService.queryDataByDocId(conversationId);
+        }
+        return list;
+    }
+
+    /**
+     * 判断Throwable是否为超时类异常
+     * @param e
+     * @return
+     */
+    private boolean isTimeoutException(@Nullable Throwable e) {
+        if (e == null) {
+            return false;
+        }
+
+        // ConnectException SocketTimeoutException
+        if (e instanceof java.net.ConnectException || e instanceof java.net.SocketTimeoutException) {
+            return true;
+        }
+
+        // 可能是包装后的异常，递归检查 cause
+        Throwable cause = e.getCause();
+        while (cause != null) {
+            if (cause instanceof java.net.ConnectException || cause instanceof java.net.SocketTimeoutException) {
+                return true;
+            }
+            cause = cause.getCause();
+        }
+
+        // 有些情况下 OkHttp 会抛出 IOException 并包含 "timeout" 字样
+        if (e instanceof java.io.IOException) {
+            String msg = e.getMessage();
+            if (msg != null && msg.toLowerCase().contains("timeout")) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private Workbook getChatMessageExcel(LocalDateTime startTime, LocalDateTime endTime) {
+        // 1. 根据startTime和endTime，查询在这个时间区间内的CaseAiConversations数据
+        List<CaseAiConversations> conversations = caseAiConversationsDao.getGenericDao().findList(
+                CaseAiConversations.class,
+                FieldFilters.ge("sysCreateTime", startTime),
+                FieldFilters.le("sysCreateTime", endTime)
+        );
+
+        // 准备Excel数据
+        List<ConversationExcelVo> excelDataList = new ArrayList<>();
+
+        // 2. 遍历这组数据，根据aiConversationId从es中查询数据（可调用getConversationMessages()方法）
+        for (CaseAiConversations conversation : conversations) {
+            String aiConversationId = conversation.getAiConversationId();
+            String conversationName = conversation.getConversationName();
+            String conversationUser = conversation.getConversationUser();
+
+            List<CaseAiMessageVo> messages = getConversationMessages(aiConversationId);
+
+            // 计算会话时长
+            long duration = 0; // 默认为0，如果需要精确计算，需要从消息中提取时间信息
+
+            // 3. 写入Excel，包括每个会话的用户，会话标题，会话内的问答记录，每次对话时长等
+            ConversationExcelVo excelData = new ConversationExcelVo();
+            excelData.setConversationId(aiConversationId);
+            excelData.setConversationName(conversationName);
+            excelData.setUser(conversationUser);
+            excelData.setMessages(messages);
+
+            excelDataList.add(excelData);
+        }
+
+        // 写入Excel文件
+        Workbook workbook = new XSSFWorkbook();
+        Sheet sheet = workbook.createSheet("AI会话数据");
+        // 标题行
+        Row headerRow = sheet.createRow(0);
+        headerRow.createCell(0).setCellValue("会话ID");
+        headerRow.createCell(1).setCellValue("会话名称");
+        headerRow.createCell(2).setCellValue("用户");
+        headerRow.createCell(3).setCellValue("提问");
+        headerRow.createCell(4).setCellValue("回答");
+        headerRow.createCell(5).setCellValue("开始时间");
+        headerRow.createCell(6).setCellValue("问答时长(秒)");
+        headerRow.createCell(7).setCellValue("消息状态");
+        headerRow.createCell(8).setCellValue("错误信息");
+
+        // 内容行
+        if (!excelDataList.isEmpty()) {
+            int rowNum = 1; // 从第二行开始写入数据
+            for (ConversationExcelVo excelData : excelDataList) {
+                List<CaseAiMessageVo> messages = excelData.getMessages();
+
+                if (messages != null && !messages.isEmpty()) {
+                    // 记录起始行号，用于后续合并单元格
+                    int startRow = rowNum;
+
+                    // 遍历每个消息
+                    for (CaseAiMessageVo message : messages) {
+                        Row row = sheet.createRow(rowNum++);
+                        // 填充每行数据
+                        row.createCell(0).setCellValue(excelData.getConversationId());
+                        row.createCell(1).setCellValue(excelData.getConversationName());
+                        row.createCell(2).setCellValue(excelData.getUser());
+                        row.createCell(3).setCellValue(message.getQuery() != null ? message.getQuery() : "");
+                        row.createCell(4).setCellValue(message.getAnswer() != null ? message.getAnswer() : "");
+                        LocalDateTime messageStartTime = message.getStartTime();
+                        if (messageStartTime != null) {
+                            String startTimeStr = messageStartTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+                            row.createCell(5).setCellValue(startTimeStr);
+                        } else {
+                            row.createCell(5).setCellValue("");
+                        }
+                        row.createCell(6).setCellValue(message.getDurationSeconds() != null ? message.getDurationSeconds() : 0);
+                        if (message.getStatus() != null) {
+                            int status = message.getStatus();
+                            CaseAiChatErrCodeEnum errCodeEnum = CaseAiChatErrCodeEnum.getByCode(status);
+                            row.createCell(7).setCellValue(errCodeEnum.getLabel());
+                        }
+                        if (StringUtils.isNotBlank(message.getErrorMsg())) {
+                            row.createCell(8).setCellValue(message.getErrorMsg());
+                        }
+                    }
+
+                    // 合并单元格（会话ID、会话名称、用户三列）
+                    // 参数说明：起始行号，结束行号，起始列号，结束列号
+                    if (rowNum > startRow + 1) { // 只有当有多行时才合并
+                        sheet.addMergedRegion(new CellRangeAddress(startRow, rowNum - 1, 0, 0));
+                        sheet.addMergedRegion(new CellRangeAddress(startRow, rowNum - 1, 1, 1));
+                        sheet.addMergedRegion(new CellRangeAddress(startRow, rowNum - 1, 2, 2));
+                    }
+                } else {
+                    // 如果没有消息，则仍然创建一行显示基本信息
+                    Row row = sheet.createRow(rowNum++);
+                    row.createCell(0).setCellValue(excelData.getConversationId());
+                    row.createCell(1).setCellValue(excelData.getConversationName());
+                    row.createCell(2).setCellValue(excelData.getUser());
+                }
+            }
+        }
+
+        return workbook;
+    }
+
+    /**
+     * 异步存储会话数据
+     * @param conversationData
+     */
+    private void saveConversationData(AiChatConversationData conversationData) {
+        esChatExecutor.execute(() -> elasticSearchIndexService.createData(conversationData));
+    }
 }

servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CaseKnowledgeServiceImpl.java

@@ -205,7 +205,8 @@ public class CaseKnowledgeServiceImpl implements ICaseKnowledgeService {
             }
         }
 
-        builder.addTextBody("fileMetaData", fileMetaData.toJSONString(), ContentType.TEXT_PLAIN);
+        ContentType contentType = ContentType.create("text/plain", StandardCharsets.UTF_8);
+        builder.addTextBody("fileMetaData", fileMetaData.toJSONString(), contentType);
         requestBody.put("fileMetaData", fileMetaData);
         // 由于接口权限，目前采用不回调，而是通过批处理的方式，处理文件状态
         if (caseAiProperties.isFileUploadUseCallback()) {
@@ -542,7 +543,8 @@ public class CaseKnowledgeServiceImpl implements ICaseKnowledgeService {
             }
         }
 
-        builder.addTextBody("fileMetaData", fileMetaData.toJSONString(), ContentType.TEXT_PLAIN);
+        ContentType contentType = ContentType.create("text/plain", StandardCharsets.UTF_8);
+        builder.addTextBody("fileMetaData", fileMetaData.toJSONString(), contentType);
         requestBody.put("fileMetaData", fileMetaData);
         // 由于接口权限，目前采用不回调，而是通过批处理的方式，处理文件状态
         if (caseAiProperties.isFileUploadUseCallback()) {
@@ -650,7 +652,8 @@ public class CaseKnowledgeServiceImpl implements ICaseKnowledgeService {
                 .findList(CaseDocumentLog.class, 1,
                         OrderCondition.desc("sysCreateTime"),
                         FieldFilters.eq("caseId", caseId),
-                        FieldFilters.eq("requestUrl", CaseAiConstants.CASE_DOC_UPLOAD_INTERFACE_NAME));
+                        FieldFilters.eq("requestUrl", CaseAiConstants.CASE_DOC_UPLOAD_INTERFACE_NAME),
+                        FieldFilters.eq("caseStatus", CaseDocumentLogCaseStatusEnum.SUCCESS.getCode()));
 
         if (logList.isEmpty()) {
             log.info("删除案例文档失败，未找到相关的日志记录，caseId: {}", caseId);
@@ -856,7 +859,8 @@ public class CaseKnowledgeServiceImpl implements ICaseKnowledgeService {
             }
         }
 
-        builder.addTextBody("fileMetaData", fileMetaData.toJSONString(), ContentType.TEXT_PLAIN);
+        ContentType contentType = ContentType.create("text/plain", StandardCharsets.UTF_8);
+        builder.addTextBody("fileMetaData", fileMetaData.toJSONString(), contentType);
         requestBody.put("fileMetaData", fileMetaData);
         // 由于接口权限，目前采用不回调，而是通过批处理的方式，处理文件状态
         if (caseAiProperties.isFileUploadUseCallback()) {
@@ -1358,6 +1362,7 @@ public class CaseKnowledgeServiceImpl implements ICaseKnowledgeService {
                 caseLog.setRunStatus(CaseDocumentLogRunStatusEnum.COMPLETED.getCode());
                 caseLog.setOptStatus(CaseDocumentLogOptStatusEnum.SUCCESS.getCode());
                 caseLog.setCaseStatus(CaseDocumentLogCaseStatusEnum.SUCCESS.getCode());
+                caseLog.setMetadataStatus(1);
                 needUpdate = true;
 //                log.info("文档向量化成功，更新状态，taskId: {}, caseId: {}", caseLog.getTaskId(), caseLog.getCaseId());
             } else if ("failed".equals(fileStatus)) {

servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/ElasticSearchIndexServiceImpl.java

@@ -8,32 +8,43 @@ import com.xboe.module.boecase.service.IElasticSearchIndexService;
 import com.xboe.module.boecase.vo.CaseAiMessageVo;
 import com.xboe.module.boecase.vo.CaseReferVo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest;
 import org.elasticsearch.action.index.IndexRequest;
 import org.elasticsearch.action.index.IndexResponse;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.action.support.master.AcknowledgedResponse;
+import org.elasticsearch.action.update.UpdateRequest;
 import org.elasticsearch.client.RequestOptions;
 import org.elasticsearch.client.RestHighLevelClient;
 import org.elasticsearch.client.indices.CreateIndexRequest;
 import org.elasticsearch.client.indices.CreateIndexResponse;
 import org.elasticsearch.client.indices.GetIndexRequest;
+import org.elasticsearch.client.indices.PutMappingRequest;
+import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentType;
 import org.elasticsearch.index.query.QueryBuilders;
+import org.elasticsearch.rest.RestStatus;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.SearchHits;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.time.Duration;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service
 @Slf4j
@@ -121,6 +132,36 @@ public class ElasticSearchIndexServiceImpl implements IElasticSearchIndexService
         }
     }
 
+    @Override
+    public boolean updateIndex(String fieldName, Map<String, Object> fieldProperties) {
+        if (elasticsearchClient == null) {
+            log.error("ElasticSearch客户端未配置");
+            return false;
+        }
+        // 执行新增字段请求
+        JSONObject newField = new JSONObject();
+        newField.put(fieldName, fieldProperties);
+
+        JSONObject properties = new JSONObject();
+        properties.put("properties", newField);
+
+        PutMappingRequest request = new PutMappingRequest(CaseAiConstants.CASE_AI_INDEX_NAME);
+        request.source(properties.toJSONString(), XContentType.JSON);
+        try {
+            AcknowledgedResponse response = elasticsearchClient.indices().putMapping(request, RequestOptions.DEFAULT);
+            if (response.isAcknowledged()) {
+                log.info("成功更新Elasticsearch索引: {}, 新增字段: {}", CaseAiConstants.CASE_AI_INDEX_NAME, fieldName);
+                return true;
+            } else {
+                log.error("更新索引 [{}] 未被确认（可能部分节点未响应）", CaseAiConstants.CASE_AI_INDEX_NAME);
+                return false;
+            }
+        } catch (Exception e) {
+            log.error("更新ElasticSearch索引时发生异常", e);
+            return false;
+        }
+    }
+
     @Override
     public boolean createData(AiChatConversationData conversationData) {
         if (elasticsearchClient == null) {
@@ -141,6 +182,9 @@ public class ElasticSearchIndexServiceImpl implements IElasticSearchIndexService
             esData.put("timestamp", now.toString());
             esData.put("durationSeconds", Duration.between(conversationData.getStartTime(), now).getSeconds());
 
+            esData.put("status", conversationData.getStatus());
+            esData.put("errorMsg", conversationData.getErrorMsg());
+
             // 构建 caseRefer 数据
             JSONArray caseReferArray = new JSONArray();
             for (CaseReferVo caseRefer : conversationData.getCaseRefers()) {
@@ -216,7 +260,7 @@ public class ElasticSearchIndexServiceImpl implements IElasticSearchIndexService
                 messageVo.setStartTime(LocalDateTime.parse(startTimeStr));
             }
             if (sourceMap.containsKey("durationSeconds")) {
-                messageVo.setDurationSeconds((Long) sourceMap.get("durationSeconds"));
+                messageVo.setDurationSeconds((Integer) sourceMap.get("durationSeconds"));
             }
 
             // 解析 suggestions
@@ -227,6 +271,20 @@ public class ElasticSearchIndexServiceImpl implements IElasticSearchIndexService
                 }
             }
 
+            if (sourceMap.containsKey("status")) {
+                Object statusObj = sourceMap.get("status");
+                if (statusObj != null) {
+                    messageVo.setStatus(Integer.valueOf(statusObj.toString()));
+                }
+            }
+
+            if (sourceMap.containsKey("errorMsg")) {
+                Object errorMsgObj = sourceMap.get("errorMsg");
+                if (errorMsgObj != null) {
+                    messageVo.setErrorMsg(errorMsgObj.toString());
+                }
+            }
+
             // 解析 caseRefer
             if (sourceMap.containsKey("caseRefer")) {
                 Object caseReferObj = sourceMap.get("caseRefer");
@@ -253,6 +311,15 @@ public class ElasticSearchIndexServiceImpl implements IElasticSearchIndexService
                 }
             }
 
+            // 解析点赞状态
+            if (sourceMap.containsKey("likeStatus")) {
+                messageVo.setLikeStatus((String) sourceMap.get("likeStatus"));
+            }
+            // 解析反馈信息
+            if (sourceMap.containsKey("feedback")) {
+                messageVo.setFeedback((String) sourceMap.get("feedback"));
+            }
+
             return messageVo;
         } catch (Exception e) {
             log.error("解析ES消息数据异常", e);
@@ -260,6 +327,78 @@ public class ElasticSearchIndexServiceImpl implements IElasticSearchIndexService
         }
     }
 
+    @Override
+    public boolean updateData(String docId, AiChatConversationData data) {
+        if (elasticsearchClient == null) {
+            log.error("未配置Elasticsearch客户端，无法更新对话记录");
+            return false;
+        }
+        try{
+            UpdateRequest updateRequest = new UpdateRequest(CaseAiConstants.CASE_AI_INDEX_NAME, docId);
+            JSONObject esData = new JSONObject();
+            // 目前只支持更新点赞状态和反馈信息
+            if (StringUtils.isNotBlank(data.getLikeStatus())) {
+                // 进行点赞/踩或取消操作是, 将feedback字段置空
+                esData.put("likeStatus", data.getLikeStatus());
+                esData.put("feedback", "");
+            }
+            if (StringUtils.isNotBlank(data.getFeedback())) {
+                esData.put("feedback", data.getFeedback());
+            }
+            updateRequest.doc(esData.toJSONString(), XContentType.JSON);
+            elasticsearchClient.update(updateRequest, RequestOptions.DEFAULT);
+            return true;
+        } catch (ElasticsearchException e) {
+            if (e.status() == RestStatus.NOT_FOUND) {
+                log.error("文档不存在", e);
+            }
+            return false;
+        } catch (Exception e) {
+            log.error("更新对话记录异常", e);
+            return false;
+        }
+    }
+
+    /**
+     * 通过docId查询数据
+     *
+     * @param docId 会话ID
+     * @return
+     */
+    @Override
+    public List<CaseAiMessageVo> queryDataByDocId(String docId) {
+        List<CaseAiMessageVo> list = new ArrayList<>();
+        if (elasticsearchClient == null) {
+            log.error("未配置Elasticsearch客户端，无法查询消息记录");
+            return list;
+        }
+        try {
+            SearchRequest searchRequest = new SearchRequest(CaseAiConstants.CASE_AI_INDEX_NAME);
+            SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
+            searchSourceBuilder.query(QueryBuilders.matchQuery("_id", docId));
+            searchSourceBuilder.size(1000); // 设置最大返回数量
+            searchRequest.source(searchSourceBuilder);
+
+
+            SearchResponse searchResponse = elasticsearchClient.search(searchRequest, RequestOptions.DEFAULT);
+            SearchHits hits = searchResponse.getHits();
+
+            for (SearchHit hit : hits) {
+                Map<String, Object> sourceMap = hit.getSourceAsMap();
+                CaseAiMessageVo data = parseMessageFromES(sourceMap);
+                if (data != null) {
+                    list.add(data);
+                }
+            }
+
+            log.info("从 ES 中查询到 {} 条消息记录", list.size());
+
+        } catch (Exception e) {
+            log.error("从 ES 查询消息异常", e);
+        }
+        return list;
+    }
+
     /**
      * 获取ai_chat_messages索引的字段映射配置
      * 根据项目中的会话消息数据结构规范定义映射
@@ -267,70 +406,15 @@ public class ElasticSearchIndexServiceImpl implements IElasticSearchIndexService
      * @return JSON格式的映射配置
      */
     private String getAiChatMessagesMapping() {
-        return "{\n" +
-                "  \"properties\": {\n" +
-                "    \"conversationId\": {\n" +
-                "      \"type\": \"keyword\",\n" +
-                "      \"index\": true\n" +
-                "    },\n" +
-                "    \"query\": {\n" +
-                "      \"type\": \"text\",\n" +
-                "      \"analyzer\": \"ik_max_word\",\n" +
-                "      \"search_analyzer\": \"ik_smart\",\n" +
-                "      \"fields\": {\n" +
-                "        \"keyword\": {\n" +
-                "          \"type\": \"keyword\",\n" +
-                "          \"ignore_above\": 256\n" +
-                "        }\n" +
-                "      }\n" +
-                "    },\n" +
-                "    \"answer\": {\n" +
-                "      \"type\": \"text\",\n" +
-                "      \"analyzer\": \"ik_max_word\",\n" +
-                "      \"search_analyzer\": \"ik_smart\"\n" +
-                "    },\n" +
-                "    \"caseRefer\": {\n" +
-                "      \"type\": \"nested\",\n" +
-                "      \"properties\": {\n" +
-                "        \"caseId\": {\n" +
-                "          \"type\": \"keyword\",\n" +
-                "          \"index\": true\n" +
-                "        },\n" +
-                "        \"title\": {\n" +
-                "          \"type\": \"text\",\n" +
-                "          \"analyzer\": \"ik_max_word\",\n" +
-                "          \"search_analyzer\": \"ik_smart\"\n" +
-                "        },\n" +
-                "        \"authorName\": {\n" +
-                "          \"type\": \"keyword\",\n" +
-                "          \"index\": true\n" +
-                "        },\n" +
-                "        \"keywords\": {\n" +
-                "          \"type\": \"text\",\n" +
-                "          \"analyzer\": \"ik_max_word\",\n" +
-                "          \"search_analyzer\": \"ik_smart\"\n" +
-                "        },\n" +
-                "        \"content\": {\n" +
-                "          \"type\": \"text\",\n" +
-                "          \"analyzer\": \"ik_max_word\",\n" +
-                "          \"search_analyzer\": \"ik_smart\"\n" +
-                "        }\n" +
-                "      }\n" +
-                "    },\n" +
-                "    \"suggestions\": {\n" +
-                "      \"type\": \"text\",\n" +
-                "      \"analyzer\": \"ik_max_word\",\n" +
-                "      \"search_analyzer\": \"ik_smart\"\n" +
-                "    },\n" +
-                "    \"userId\": {\n" +
-                "      \"type\": \"keyword\",\n" +
-                "      \"index\": true\n" +
-                "    },\n" +
-                "    \"timestamp\": {\n" +
-                "      \"type\": \"date\",\n" +
-                "      \"format\": \"yyyy-MM-dd HH:mm:ss||yyyy-MM-dd'T'HH:mm:ss||yyyy-MM-dd'T'HH:mm:ss.SSS||yyyy-MM-dd'T'HH:mm:ss.SSS'Z'||epoch_millis\"\n" +
-                "    }\n" +
-                "  }\n" +
-                "}";
+        InputStream inputStream = getClass().getClassLoader().getResourceAsStream("case_ai_index.json");
+        if (inputStream != null) {
+            try (InputStreamReader isr = new InputStreamReader(inputStream);
+                 BufferedReader reader = new BufferedReader(isr)) {
+                return reader.lines().collect(Collectors.joining(System.lineSeparator()));
+            } catch (IOException e) {
+                throw new RuntimeException("Resource read error: case_ai_index.json", e);
+            }
+        }
+        throw new RuntimeException("Resource not found: case_ai_index.json");
     }
 }

servers/boe-server-all/src/main/java/com/xboe/module/boecase/task/CaseUploadTask.java

@@ -1,6 +1,9 @@
 package com.xboe.module.boecase.task;
 
+import com.xboe.common.OrderCondition;
 import com.xboe.constants.CaseAiConstants;
+import com.xboe.core.orm.FieldFilters;
+import com.xboe.core.orm.QueryBuilder;
 import com.xboe.enums.CaseDocumentLogCaseStatusEnum;
 import com.xboe.enums.CaseDocumentLogOptStatusEnum;
 import com.xboe.enums.CaseDocumentLogOptTypeEnum;
@@ -22,6 +25,7 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * 旧案例上传
@@ -42,10 +46,43 @@ public class CaseUploadTask {
     @Autowired
     private StringRedisTemplate stringRedisTemplate;
 
-    private static final String CASE_UPLOAD_LAST_ID_KEY = "case:upload:last:id";
+    public static final String CASE_UPLOAD_LAST_ID_KEY = "case:upload:last:id";
+
+    public static final String CASE_RELOAD_LAST_ID_KEY = "case:reload:last:id";
+
+    @XxlJob("reloadJob")
+    public void reloadJob() {
+        String currentLastId = null;
+        try {
+            // 从Redis获取上次处理的最后一条记录ID
+            String lastProcessedId = stringRedisTemplate.opsForValue().get(CASE_RELOAD_LAST_ID_KEY);
+            // 查询需要重新加载的案例
+            List<CaseDocumentLog> logsToReload = listToReload(lastProcessedId);
+            if (logsToReload.isEmpty()) {
+                return;
+            }
+            currentLastId = logsToReload.get(logsToReload.size() - 1).getId();
+            for (CaseDocumentLog log : logsToReload) {
+                String caseId = log.getCaseId();
+                Cases cases = casesDao.get(caseId);
+                if (cases != null && StringUtils.isNotBlank(cases.getFilePath())) {
+                    // 更新
+                    caseAiDocumentAsyncHandler.process(CaseDocumentLogOptTypeEnum.UPDATE, cases);
+                }
+            }
+        } catch (Exception e) {
+            log.error("[reload]执行重新上传任务时发生异常", e);
+        } finally {
+            if (currentLastId != null) {
+                stringRedisTemplate.opsForValue().set(CASE_RELOAD_LAST_ID_KEY, currentLastId);
+                log.info("[reload] 已重新上传案例，最后一条caseDocumentLogId 已更新为: {}", currentLastId);
+            }
+        }
+    }
 
     @XxlJob("oldDataUploadJob")
     public void oldDataUploadJob() {
+        String currentLastId = null;
         try {
 //            log.info("开始执行旧案例上传任务");
 
@@ -61,6 +98,7 @@ public class CaseUploadTask {
 //                log.info("没有需要处理的案例数据");
                 return;
             }
+            currentLastId = casesToProcess.get(casesToProcess.size() - 1).getId();
 
             // 批量检查这些案例是否已在CaseDocumentLog中存在记录，提升性能
             List<String> caseIds = new ArrayList<>();
@@ -76,18 +114,37 @@ public class CaseUploadTask {
             // 过滤出未在CaseDocumentLog中存在的案例
             List<Cases> casesList = new ArrayList<>();
             for (Cases cases : casesToProcess) {
-                boolean exists = false;
-                for (CaseDocumentLog log : existingLogs) {
-                    if (cases.getId().equals(log.getCaseId())
-                            && StringUtils.equals(log.getRequestUrl(), CaseAiConstants.CASE_DOC_UPLOAD_INTERFACE_NAME)
-                            && Objects.equals(log.getRunStatus(), CaseDocumentLogRunStatusEnum.COMPLETED.getCode())
-                            && Objects.equals(log.getOptStatus(), CaseDocumentLogOptStatusEnum.SUCCESS.getCode())
-                            && Objects.equals(log.getRunStatus(), CaseDocumentLogCaseStatusEnum.SUCCESS.getCode())) {
-                        exists = true;
-                        break;
-                    }
-                }
-                if (!exists) {
+//                boolean exists = false;
+//                for (CaseDocumentLog log : existingLogs) {
+//                    if (cases.getId().equals(log.getCaseId())
+//                            && StringUtils.equals(log.getRequestUrl(), CaseAiConstants.CASE_DOC_UPLOAD_INTERFACE_NAME)
+//                            && Objects.equals(log.getRunStatus(), CaseDocumentLogRunStatusEnum.COMPLETED.getCode())
+//                            && Objects.equals(log.getOptStatus(), CaseDocumentLogOptStatusEnum.SUCCESS.getCode())
+//                            && Objects.equals(log.getRunStatus(), CaseDocumentLogCaseStatusEnum.SUCCESS.getCode())) {
+//                        exists = true;
+//                        break;
+//                    }
+//                }
+//                if (!exists) {
+//                    casesList.add(cases);
+//                }
+                List<CaseDocumentLog> thisCaseLogs = existingLogs.stream()
+                        .filter(log -> cases.getId().equals(log.getCaseId()))
+                        .collect(Collectors.toList());
+                if (thisCaseLogs == null || thisCaseLogs.isEmpty()) {
+                    casesList.add(cases);
+                } else if (thisCaseLogs.stream()
+                            .noneMatch(caseLog -> {
+                                // 1. 是否存在已上传完成的案例
+                                boolean hasCompleted = StringUtils.equals(caseLog.getRequestUrl(), CaseAiConstants.CASE_DOC_UPLOAD_INTERFACE_NAME)
+                                        && Objects.equals(caseLog.getRunStatus(), CaseDocumentLogRunStatusEnum.COMPLETED.getCode())
+                                        && Objects.equals(caseLog.getOptStatus(), CaseDocumentLogOptStatusEnum.SUCCESS.getCode())
+                                        && Objects.equals(caseLog.getRunStatus(), CaseDocumentLogCaseStatusEnum.SUCCESS.getCode());
+                                // 2. 是否存在上传中的案例
+                                boolean hasUploading = StringUtils.equals(caseLog.getRequestUrl(), CaseAiConstants.CASE_DOC_UPLOAD_INTERFACE_NAME)
+                                        && Objects.equals(caseLog.getRunStatus(), CaseDocumentLogRunStatusEnum.RUNNING.getCode());
+                                return hasCompleted || hasUploading;
+                            })) {
                     casesList.add(cases);
                 }
             }
@@ -98,17 +155,18 @@ public class CaseUploadTask {
                 // 调用异步处理方法
                 caseAiDocumentAsyncHandler.process(CaseDocumentLogOptTypeEnum.CREATE, casesList.toArray(new Cases[0]));
 
-                // 将当前处理的最后一条数据ID存入Redis
-                String currentLastId = casesList.get(casesList.size() - 1).getId();
-                stringRedisTemplate.opsForValue().set(CASE_UPLOAD_LAST_ID_KEY, currentLastId);
-                log.info("已处理案例，最后一条记录ID已更新为: {}", currentLastId);
             } else {
                 log.info("没有新的案例需要处理");
             }
+            // 将当前处理的最后一条数据ID存入Redis
 
 //            log.info("旧案例上传任务执行完成");
         } catch (Exception e) {
             log.error("执行旧案例上传任务时发生异常", e);
+        } finally {
+            if (currentLastId != null) {
+                fixOnLastCase(currentLastId);
+            }
         }
     }
 
@@ -119,22 +177,46 @@ public class CaseUploadTask {
      * @return 案例列表
      */
     private List<Cases> findCasesToProcess(String lastProcessedId) {
-        com.xboe.core.orm.QueryBuilder queryBuilder = com.xboe.core.orm.QueryBuilder.from(Cases.class);
-        queryBuilder.addFilter(com.xboe.core.orm.FieldFilters.eq("deleted", false));
+        QueryBuilder queryBuilder = QueryBuilder.from(Cases.class);
+        queryBuilder.addFilter(FieldFilters.eq("deleted", false));
         // 只处理有文件路径的案例
-        queryBuilder.addFilter(com.xboe.core.orm.FieldFilters.isNotNull("filePath"));
-        queryBuilder.addFilter(com.xboe.core.orm.FieldFilters.ne("filePath", ""));
+        queryBuilder.addFilter(FieldFilters.isNotNull("filePath"));
+        queryBuilder.addFilter(FieldFilters.ne("filePath", ""));
         
         // 如果有上次处理的ID，则从该ID之后开始查询
         if (lastProcessedId != null && !lastProcessedId.isEmpty()) {
-            queryBuilder.addFilter(com.xboe.core.orm.FieldFilters.gt("id", lastProcessedId));
+            queryBuilder.addFilter(FieldFilters.gt("id", lastProcessedId));
         }
         
         // 按创建时间升序排序
-        queryBuilder.addOrder(com.xboe.common.OrderCondition.asc("id"));
+        queryBuilder.addOrder(OrderCondition.asc("id"));
         // 限制每次处理的数量，避免一次性处理太多数据
         queryBuilder.setPageSize(100);
         
         return casesDao.findList(queryBuilder.builder());
     }
+
+    /**
+     * 获取需要重新加载的案例
+     * @param lastProcessedId
+     * @return
+     */
+    private List<CaseDocumentLog> listToReload(String lastProcessedId) {
+        QueryBuilder queryBuilder = QueryBuilder.from(CaseDocumentLog.class);
+        queryBuilder.addFilter(FieldFilters.eq("deleted", false));
+        queryBuilder.addFilter(FieldFilters.eq("requestUrl", CaseAiConstants.CASE_DOC_UPLOAD_INTERFACE_NAME));
+        queryBuilder.addFilter(FieldFilters.eq("caseStatus", CaseDocumentLogCaseStatusEnum.SUCCESS.getCode()));
+        queryBuilder.addFilter(FieldFilters.eq("metadataStatus", 0));
+        if (lastProcessedId != null && !lastProcessedId.isEmpty()) {
+            queryBuilder.addFilter(FieldFilters.gt("id", lastProcessedId));
+        }
+        queryBuilder.addOrder(OrderCondition.asc("id"));
+        queryBuilder.setPageSize(100);
+        return caseDocumentLogDao.findList(queryBuilder.builder());
+    }
+
+    private void fixOnLastCase(String currentLastId) {
+        stringRedisTemplate.opsForValue().set(CASE_UPLOAD_LAST_ID_KEY, currentLastId);
+        log.info("已处理案例，最后一条记录ID已更新为: {}", currentLastId);
+    }
 }

servers/boe-server-all/src/main/java/com/xboe/module/boecase/vo/CaseAiMessageVo.java

@@ -29,7 +29,7 @@ public class CaseAiMessageVo {
     /**
      * 会话时长(秒)
      */
-    private Long durationSeconds;
+    private Integer durationSeconds;
 
     /**
      * 案例引用列表
@@ -40,4 +40,31 @@ public class CaseAiMessageVo {
      * 建议列表
      */
     private List<String> suggestions;
+
+    /**
+     * 状态
+     * 0-正常
+     * 1-系统错误
+     * 2-AIoT平台错误
+     */
+    private Integer status;
+
+    /**
+     * 错误信息
+     */
+    private String errorMsg;
+
+    /**
+     * 用户点赞状态
+     * -1: 踩
+     * 1：赞
+     * 0/null 无操作
+     */
+    private String likeStatus;
+
+    /**
+     * 用户踩的时候, 可以填写反馈意见
+     * 反馈意见
+     */
+    private String feedback;
 }

servers/boe-server-all/src/main/java/com/xboe/module/course/dao/ThreadLogDao.java

@@ -0,0 +1,9 @@
+package com.xboe.module.course.dao;
+
+import com.xboe.core.orm.BaseDao;
+import com.xboe.module.course.entity.ThreadLog;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public class ThreadLogDao extends BaseDao<ThreadLog> {
+}

servers/boe-server-all/src/main/java/com/xboe/module/course/entity/ThreadLog.java

@@ -0,0 +1,120 @@
+package com.xboe.module.course.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xboe.core.SysConstant;
+import com.xboe.core.orm.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.time.LocalDateTime;
+
+/**
+ * 线程日志表实体
+ */
+@Data
+@Entity
+@EqualsAndHashCode(callSuper = false)
+@Table(name = SysConstant.TABLE_PRE + "thread_log")
+public class ThreadLog  {
+
+    /**
+     * 主键ID
+     */
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", columnDefinition = "BIGINT UNSIGNED COMMENT '主键'")
+    private Long id;
+
+    /**
+     * 系统/子系统标识
+     */
+    @Column(name = "system_name", nullable = false, length = 64)
+    private String systemName;
+
+    /**
+     * 功能模块
+     */
+    @Column(name = "module_name", nullable = false, length = 64)
+    private String moduleName;
+
+    /**
+     * 具体动作/事件
+     */
+    @Column(name = "action_name", nullable = false, length = 64)
+    private String actionName;
+
+    /**
+     * 日志级别(INFO/WARN/ERROR/DEBUG等)
+     */
+    @Column(name = "level", nullable = false, length = 16)
+    private String level;
+
+    /**
+     * 日志正文/描述
+     */
+    @Column(name = "content", columnDefinition = "TEXT COMMENT '日志正文/描述'")
+    private String content;
+
+    /**
+     * 线程名称
+     */
+    @Column(name = "thread_name", length = 64)
+    private String threadName;
+
+    /**
+     * 结构化扩展信息(JSON)
+     * 注：用String接收JSON字符串，如需反序列化可自行处理（如使用ObjectMapper转换为Map/自定义DTO）
+     */
+    @Column(name = "extra_data", columnDefinition = "JSON COMMENT '结构化扩展信息(JSON)'")
+    private String extraData;
+
+    /**
+     * 备注
+     */
+    @Column(name = "remark", length = 255)
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Column(name = "create_time", nullable = false)
+    private LocalDateTime createTime;
+
+    /**
+     * 创建人ID
+     */
+    @Column(name = "create_id", columnDefinition = "BIGINT COMMENT '创建人ID'")
+    private Long createId;
+
+    /**
+     * 创建人姓名
+     */
+    @Column(name = "create_name", length = 128)
+    private String createName;
+
+    /**
+     * 更新时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Column(name = "update_time", nullable = false)
+    private LocalDateTime updateTime;
+
+    /**
+     * 更新人ID
+     */
+    @Column(name = "update_id", columnDefinition = "BIGINT COMMENT '更新人ID'")
+    private Long updateId;
+
+    /**
+     * 更新人姓名
+     */
+    @Column(name = "update_name", length = 128)
+    private String updateName;
+}

servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java

@@ -363,7 +363,8 @@ public class StudyCourseApi extends ApiBaseController{
 	 */
 	@PostMapping("/study")
 	public JsonResponse<String> study(@RequestBody StudyContentDto sci, HttpServletRequest request){
-		
+
+		log.info("study已进入");
 		if(StringUtils.isBlank(sci.getStudyId())){
 			return error("参数错误");
 		}

servers/boe-server-all/src/main/java/com/xboe/school/study/dao/StudyCourseDao.java

@@ -4,8 +4,11 @@ import java.time.LocalDateTime;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+import com.alibaba.fastjson.JSONObject;
 import com.xboe.api.ThirdApi;
 import com.xboe.constants.CacheName;
+import com.xboe.module.course.dao.ThreadLogDao;
+import com.xboe.school.study.dto.StudyContentDto;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,7 +35,8 @@ public class StudyCourseDao extends BaseDao<StudyCourse> {
 	StudyCourseItemDao scItemDao;
 	@Autowired
 	StringRedisTemplate redisTemplate;
-
+	@Autowired
+	private ThreadLogDao threadLogDao;
 
 	@Resource
 	private ThirdApi thirdApi;
@@ -45,6 +49,8 @@ public class StudyCourseDao extends BaseDao<StudyCourse> {
 	public void finishCheck(String studyId,String courseId,Integer total,String token){
 
 		if(StringUtils.isNotEmpty(redisTemplate.opsForValue().get(studyId + "_" + courseId + "_" + total))){
+			log.info("进入埋点finishCheck");
+			saveThreadLog(studyId, courseId, total, token);
 			return ;
 		}
 
@@ -73,6 +79,8 @@ public class StudyCourseDao extends BaseDao<StudyCourse> {
 					UpdateBuilder.create("finishTime",now),
 					UpdateBuilder.create("status",StudyCourse.STATUS_FINISH));
 			redisTemplate.opsForValue().set(studyId + "_" + courseId + "_" + total, "100", 24, TimeUnit.HOURS);
+			log.info("进入埋点finishCheck");
+			saveThreadLog(studyId, courseId, total, token);
 		}else {
 			super.updateMultiFieldById(studyId,
 					UpdateBuilder.create("progress",percent),
@@ -85,6 +93,41 @@ public class StudyCourseDao extends BaseDao<StudyCourse> {
 		log.info("在线课学习记录"+allUserList);
 	}
 
+	private void saveThreadLog(String studyId,String courseId,Integer total,String token) {
+		try {
+			JSONObject extraData = new JSONObject();
+			extraData.put("studyId", studyId);
+			extraData.put("courseId", courseId);
+			extraData.put("total", total);
+			extraData.put("token", token);
+
+			LocalDateTime now = LocalDateTime.now();
+			String threadName = Thread.currentThread().getName();
+
+			String sql = "INSERT INTO boe_thread_log (system_name,module_name,action_name,level,content,thread_name,extra_data,remark,create_time,create_id,create_name,update_time,update_id,update_name) "
+					+ "VALUES (?1,?2,?3,?4,?5,?6,?7,?8,?9,?10,?11,?12,?13,?14)";
+
+			threadLogDao.sqlUpdate(sql,
+					"学习",
+					"学习进度更新",
+					"更新StudyCourse进度完成",
+					"info",
+					null,
+					threadName,
+					extraData.toJSONString(),
+					null,
+					now,
+					null,
+					null,
+					now,
+					null,
+					null);
+			log.info("saveThreadLog插入成功");
+		} catch (Exception ex) {
+			log.error("保存线程日志失败", ex);
+		}
+	}
+
 	public void finishCheck1(String studyId,String courseId,Integer total){
 		LocalDateTime now=LocalDateTime.now();
 		//已完成的内容

servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java

@@ -10,11 +10,13 @@ import java.util.Map;
 
 import javax.transaction.Transactional;
 
+import com.xboe.module.course.dao.ThreadLogDao;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.xboe.common.OrderCondition;
 import com.xboe.common.PageList;
 import com.xboe.core.orm.FieldFilters;
@@ -52,6 +54,8 @@ public class StudyServiceImpl implements IStudyService{
 	@Autowired
 	StringRedisTemplate redisTemplate;
 
+	@Autowired
+	private ThreadLogDao threadLogDao;
 
 	@Override
 	public StudyCourseItem checkHas(String studyId,String contentId) {
@@ -82,6 +86,8 @@ public class StudyServiceImpl implements IStudyService{
 			sci.setStudyDuration(0);
 			sci.setCourseId(dto.getCourseId());
 			sci.setCsectionId(dto.getCsectionId());
+			log.info("saveStudyInfo进入埋点");
+			saveThreadLog(dto);
 		}
 		//进度状态
 		if(dto.getProgress()==null) {
@@ -494,4 +500,52 @@ public class StudyServiceImpl implements IStudyService{
 	    scDao.finishCheck(studyId,courseId,cnum,token);
 	}
 
+	private void saveThreadLog(StudyContentDto dto) {
+		try {
+			JSONObject extraData = new JSONObject();
+			extraData.put("studyId", dto.getStudyId());
+			extraData.put("contentId", dto.getContentId());
+			extraData.put("aid", dto.getAid());
+
+			LocalDateTime now = LocalDateTime.now();
+			Long creatorId = parseLong(dto.getAid());
+			String creatorName = dto.getAname();
+			String threadName = Thread.currentThread().getName();
+
+			String sql = "INSERT INTO boe_thread_log (system_name,module_name,action_name,level,content,thread_name,extra_data,remark,create_time,create_id,create_name,update_time,update_id,update_name) "
+					+ "VALUES (?1,?2,?3,?4,?5,?6,?7,?8,?9,?10,?11,?12,?13,?14)";
+
+			threadLogDao.sqlUpdate(sql,
+					"学习",
+					"学习进度更新",
+					"新增StudyCourseItem",
+					"info",
+					null,
+					threadName,
+					extraData.toJSONString(),
+					null,
+					now,
+					creatorId,
+					creatorName,
+					now,
+					creatorId,
+					creatorName);
+			log.info("saveStudyInfo埋点插入成功");
+		} catch (Exception ex) {
+			log.error("保存线程日志失败 studyId={}, contentId={}, aid={}", dto.getStudyId(), dto.getContentId(), dto.getAid(), ex);
+		}
+	}
+
+	private Long parseLong(String value) {
+		if(StringUtils.isBlank(value)) {
+			return null;
+		}
+		try {
+			return Long.valueOf(value);
+		}catch (NumberFormatException ex){
+			log.warn("无法解析为数字的aid: {}", value);
+			return null;
+		}
+	}
+
 }

servers/boe-server-all/src/main/resources/application-dev.yml

@@ -11,22 +11,22 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: 192.168.0.253:8848
+        server-addr: 192.168.10.74:8848
       config:
-        server-addr: 192.168.0.253:8848
+        server-addr: 192.168.10.74:8848
   redis:
-    database: 1
-    host: 192.168.0.253
-    password: boe@123
-    port: 6379
+    database: 2
+    host: 39.104.123.58
+    password: Ebiz2020
+    port: 6378
   jpa:
     hibernate:
       ddl-auto: none
   datasource:
     driverClassName: com.mysql.jdbc.Driver
-    url: jdbc:mysql://192.168.0.253:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
-    username: root
-    password: boe#1234A
+    url: jdbc:mysql://rm-hp3cpkk0u50q90eu9vo.mysql.huhehaote.rds.aliyuncs.com:3306/ebiz_doc_manage?characterEncoding=utf8&useUnicode=true&serverTimezone=Asia/Shanghai&useSSL=false&allowMultiQueries=true
+    username: ebiz_ai
+    password: ebiz_ai123
     type: com.zaxxer.hikari.HikariDataSource
     hikari:
       auto-commit: true
@@ -35,6 +35,12 @@ spring:
       connection-timeout: 30000
       max-lifetime: 1800000
       maximum-pool-size: 20
+  activemq:
+    broker-url: tcp://192.168.10.74:61616
+    user: admin
+    password: admin
+  jms:
+    pub-sub-domain: true
 logging:
   level:
     org:
@@ -107,7 +113,7 @@ aop-log-record:
   #不进行拦截的包或者类
   excludeClassNames:
   activemq:
-    broker-url: tcp://192.168.0.253:61616
+    broker-url: tcp://192.168.10.74:61616
     user: admin
     password: admin
   elasticsearch:

servers/boe-server-all/src/main/resources/application-pre.yml

@@ -40,6 +40,12 @@ spring:
   web:
     resources:
       static-locations: file:E:/Projects/BOE/10/static
+  activemq:
+    broker-url: tcp://10.251.129.51:61616
+    user: admin
+    password: admin
+  jms:
+    pub-sub-domain: true
 server:
   port: 9090
   tomcat:

servers/boe-server-all/src/main/resources/application-prod.yml

@@ -33,6 +33,12 @@ spring:
       connection-timeout: 30000
       max-lifetime: 1800000
       maximum-pool-size: 20
+  activemq:
+    broker-url: tcp://10.251.113.100:61616
+    user: admin
+    password: admin
+  jms:
+    pub-sub-domain: true
 logging:
   level:
     org:
@@ -111,6 +117,204 @@ xboe:
         - "10827857"
         - "11339772"
         - "pctest06"
+        # 20251202 新增天使用户
+        - "30103141"
+        - "60001391"
+        - "61001278"
+        - "30101301"
+        - "10444837"
+        - "50102190"
+        - "10745030"
+        - "11417101"
+        - "11305432"
+        - "10103037"
+        - "10035168"
+        - "30118060"
+        - "11490910"
+        - "11402931"
+        - "50102196"
+        - "00004896"
+        - "98050025"
+        - "15014359"
+        - "98000758"
+        - "10111538"
+        - "62000137"
+        - "10621476"
+        - "11698996"
+        - "10626304"
+        - "1215826"
+        - "30101887"
+        - "10111915"
+        - "11456852"
+        - "126458"
+        - "30141438"
+        - "10209179"
+        - "22BT15420"
+        - "21BB2053"
+        - "10449861"
+        - "130325"
+        - "11331818"
+        - "10117022"
+        - "10105891"
+        - "121649"
+        - "110338"
+        - "1217784"
+        - "30105038"
+        - "98000792"
+        - "60001146"
+        - "11698607"
+        - "11493629"
+        - "10164819"
+        - "11463452"
+        - "10412122"
+        - "11677116"
+        - "98000780"
+        - "61004269"
+        - "1218902"
+        - "111038"
+        - "10056775"
+        - "50125311"
+        - "50100445"
+        - "00003320"
+        - "11672602"
+        - "30129421"
+        - "11433296"
+        - "11759796"
+        - "10063656"
+        - "10829939"
+        - "98050190"
+        - "10061076"
+        - "60001460"
+        - "10415155"
+        - "60000626"
+        - "110791"
+        - "60000984"
+        - "62000025"
+        - "11794394"
+        - "11681568"
+        - "00002915"
+        - "1210874"
+        - "132046"
+        - "10157955"
+        - "00004409"
+        - "10773520"
+        - "102403"
+        - "10119108"
+        - "10062300"
+        - "10334899"
+        - "10111689"
+        - "10258267"
+        - "60000327"
+        - "50100096"
+        - "10075741"
+        - "1000477"
+        - "1218405"
+        - "132666"
+        - "10183064"
+        - "50101990"
+        - "120869"
+        - "11291711"
+        - "11670020"
+        - "11321710"
+        - "10855714"
+        - "11331449"
+        - "50108923"
+        - "66001553"
+        - "81011081"
+        - "11098405"
+        - "10158509"
+        - "11327800"
+        - "10065717"
+        - "10897206"
+        - "30135784"
+        - "1200373"
+        - "10048566"
+        - "10059710"
+        - "11834720"
+        - "1200384"
+        - "60000973"
+        - "11282207"
+        - "40865"
+        - "10811920"
+        - "00003324"
+        - "00003937"
+        - "10031853"
+        - "1201730"
+        - "00004615"
+        - "10613607"
+        - "10166435"
+        - "11407507"
+        - "21BB0031"
+        - "00002198"
+        - "30104243"
+        - "10840493"
+        - "10046158"
+        - "132164"
+        - "11257354"
+        - "11753398"
+        - "10230265"
+        - "11293165"
+        - "10114925"
+        - "S638"
+        - "10833174"
+        - "10926203"
+        - "124046"
+        - "201181"
+        - "11319329"
+        - "10884794"
+        - "10331955"
+        - "60000847"
+        - "1411"
+        - "126581"
+        - "00003375"
+        - "132539"
+        - "98050455"
+        - "10053666"
+        - "11697194"
+        - "61002398"
+        - "00002971"
+        - "14157"
+        - "132989"
+        - "50103467"
+        - "37315"
+        - "10088583"
+        - "11048954"
+        - "110202"
+        - "30141433"
+        - "1000079"
+        - "11783149"
+        - "10025448"
+        - "98000579"
+        - "10614158"
+        - "30104381"
+        - "60000122"
+        - "11074875"
+        - "10009047"
+        - "10228087"
+        - "10875722"
+        - "10041401"
+        - "110679"
+        - "11167945"
+        - "11288196"
+        - "00003111"
+        - "11780879"
+        - "10836255"
+        - "10753364"
+        - "50102132"
+        - "10711537"
+        - "15001329"
+        - "11733703"
+        - "10450632"
+        - "98050011"
+        - "10224644"
+        - "120931"
+        - "10743223"
+        - "107873"
+        - "11141942"
+        - "120434"
+        - "126466"
+        - "98050020"
+        - "10928732"
       alert-email-recipients:
         - chengmeng@boe.com.cn
         - liyubing@boe.com.cn

servers/boe-server-all/src/main/resources/application-test.yml

@@ -40,6 +40,12 @@ spring:
   web:
     resources:
       static-locations: file:E:/Projects/BOE/10/static
+  activemq:
+    broker-url: tcp://10.251.129.25:61616
+    user: admin
+    password: admin
+  jms:
+    pub-sub-domain: true
 server:
   port: 9090
   tomcat:

servers/boe-server-all/src/main/resources/application.yml

@@ -50,6 +50,9 @@ ok:
     write-timeout: 300
     max-idle-connections: 200
     keep-alive-duration: 300
+activemq:
+  topic:
+    name: case_ai_chat_stop_topic
 boe:
   domain: http://127.0.0.1
 orgTree:

servers/boe-server-all/src/main/resources/case_ai_index.json

@@ -0,0 +1,82 @@
+{
+  "properties": {
+    "conversationId": {
+      "type": "keyword",
+      "index": true
+    },
+    "query": {
+      "type": "text",
+      "analyzer": "ik_max_word",
+      "search_analyzer": "ik_smart",
+      "fields": {
+        "keyword": {
+          "type": "keyword",
+          "ignore_above": 256
+        }
+      }
+    },
+    "answer": {
+      "type": "text",
+      "analyzer": "ik_max_word",
+      "search_analyzer": "ik_smart"
+    },
+    "caseRefer": {
+      "type": "nested",
+      "properties": {
+        "caseId": {
+          "type": "keyword",
+          "index": true
+        },
+        "title": {
+          "type": "text",
+          "analyzer": "ik_max_word",
+          "search_analyzer": "ik_smart"
+        },
+        "authorName": {
+          "type": "keyword",
+          "index": true
+        },
+        "keywords": {
+          "type": "text",
+          "analyzer": "ik_max_word",
+          "search_analyzer": "ik_smart"
+        },
+        "content": {
+          "type": "text",
+          "analyzer": "ik_max_word",
+          "search_analyzer": "ik_smart"
+        }
+      }
+    },
+    "suggestions": {
+      "type": "text",
+      "analyzer": "ik_max_word",
+      "search_analyzer": "ik_smart"
+    },
+    "userId": {
+      "type": "keyword",
+      "index": true
+    },
+    "timestamp": {
+      "type": "date",
+      "format": "yyyy-MM-dd HH:mm:ss||yyyy-MM-dd'T'HH:mm:ss||yyyy-MM-dd'T'HH:mm:ss.SSS||yyyy-MM-dd'T'HH:mm:ss.SSS'Z'||epoch_millis"
+    },
+    "status": {
+      "type": "integer"
+    },
+    "errorMsg": {
+      "type": "text",
+      "analyzer": "ik_max_word",
+      "search_analyzer": "ik_smart"
+    },
+    "likeStatus": {
+      "type": "keyword",
+      "index": true
+    },
+    "feedback": {
+      "type": "text",
+      "analyzer": "ik_max_word",
+      "search_analyzer": "ik_smart"
+    }
+  }
+}

servers/boe-server-all/src/main/resources/log/logback-prod.xml

@@ -31,26 +31,42 @@
         </encoder>
     </appender>
 
-    <!-- Log file error output -->
-    <appender name="error" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/error.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
-            <maxFileSize>50MB</maxFileSize>
-            <maxHistory>30</maxHistory>
-        </rollingPolicy>
+    <appender name="caseAiChat"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
         <encoder>
             <pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
+            <charset>UTF-8</charset>
         </encoder>
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>ERROR</level>
-        </filter>
+        <file>${log.path}/caseAiChat.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/caseAiChat.%d{yyyy-MM-dd}.log</fileNamePattern>
+        </rollingPolicy>
     </appender>
 
+    <!-- Log file error output -->
+<!--    <appender name="caseAiChat" class="ch.qos.logback.core.rolling.RollingFileAppender">-->
+<!--        <file>${log.path}/caseAiChat.log</file>-->
+<!--        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">-->
+<!--            <fileNamePattern>${log.path}/%d{yyyy-MM}/caseAiChat.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>-->
+<!--            <maxFileSize>50MB</maxFileSize>-->
+<!--            <maxHistory>30</maxHistory>-->
+<!--        </rollingPolicy>-->
+<!--        <encoder>-->
+<!--            <pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>-->
+<!--        </encoder>-->
+<!--        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">-->
+<!--            <level>ERROR</level>-->
+<!--        </filter>-->
+<!--    </appender>-->
+
     <!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
     <root level="INFO">
         <appender-ref ref="info"/>
 <!--        <appender-ref ref="console"/>-->
        <!-- <appender-ref ref="error"/> --> 
     </root>
+
+    <logger name="caseAiChatLogger" additivity="false" level="INFO">
+        <appender-ref ref="caseAiChat"/>
+    </logger>
 </configuration>

servers/boe-server-all/src/main/resources/log/logback-test.xml

@@ -47,10 +47,26 @@
         </filter>
     </appender>
 
+    <appender name="caseAiChat"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <encoder>
+            <pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <File>${log.path}/caseAiChat.log</File>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <FileNamePattern>${log.path}/caseAiChat.%d{yyyy-MM-dd}.log</FileNamePattern>
+        </rollingPolicy>
+    </appender>
+
     <!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
     <root level="INFO">
         <appender-ref ref="debug"/>
         <appender-ref ref="error"/>
         <appender-ref ref="console"/>
     </root>
+
+    <logger name="caseAiChatLogger" additivity="false" level="INFO">
+        <appender-ref ref="caseAiChat"/>
+    </logger>
 </configuration>