修改redis、nacos、MySQL、ActiveMQ、RabbitMQ、elasticsearch配置

servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java

@@ -60,9 +60,6 @@ public class ThirdApi {
     @Value("${orgTree.orgChildTreeList}")
     private String orgChildTreeListUrl;
 
-    @Value("${userBasic.getUserBasicInfo}")
-    private String getUserBasicInfo;
-
     @Autowired
     UserDao userDao;
 
@@ -369,62 +366,6 @@ public class ThirdApi {
 
     }
 
-    /**
-     * 虽然当前已存在接口查询用户基本信息，目前仅仅包括用户名、工号、用户ID
-     */
-    public List<UserBasicInfoVo> getUserBasicInfoByWorkNums(List<String> workNums) {
-
-        UserBasicInfoDto userBasicInfoDto = new UserBasicInfoDto();
-        userBasicInfoDto.setWorkNums(workNums);
-        Response<List<UserAccount>> response = userRemoteClient.getUserBasicInfo(userBasicInfoDto);
-        String respStr = JSON.toJSONString(response);
-
-        UserBasicInfoResultVo userBasicInfoResult = JSONUtil.parseObj(respStr).toBean(UserBasicInfoResultVo.class);
-        List<UserBasicInfoVo> basicInfos = userBasicInfoResult.getResult();
-        return basicInfos;
-
-    }
-
-    public List<UserBasicInfoVo> getUserBasicInfoByWorkNums2(String workNum, String token) {
-        try {
-            // 参数校验
-            if (StringUtils.isBlank(workNum)) {
-                log.warn("getUserBasicInfoByWorkNums2 workNum为空");
-                return Collections.emptyList();
-            }
-            
-            // 构建URL参数，将单个workNum作为列表参数传递
-            Map<String, Object> params = new HashMap<>();
-            params.put("workNums", Collections.singletonList(workNum));
-            
-            log.info("getUserBasicInfoByWorkNums2 请求参数: workNum={}, url={}", workNum, getUserBasicInfo);
-            
-            // 发送HTTP GET请求
-            String responseStr = HttpRequest.get(getUserBasicInfo)
-                    .form(params)
-                    .header("token", token)
-                    .execute()
-                    .body();
-            
-            log.info("getUserBasicInfoByWorkNums2 响应结果: {}", responseStr);
-            
-            // 解析响应
-            UserBasicInfoResultVo resultVo = JSONUtil.parseObj(responseStr).toBean(UserBasicInfoResultVo.class);
-            log.info("getUserBasicInfoByWorkNums2 解析结果: {}", resultVo);
-            if (resultVo != null && resultVo.getStatus() == 200 && resultVo.getResult() != null) {
-                return resultVo.getResult();
-            } else {
-                log.error("getUserBasicInfoByWorkNums2 请求失败: status={}, message={}", 
-                        resultVo != null ? resultVo.getStatus() : "null", 
-                        resultVo != null ? resultVo.getMessage() : "响应为空");
-                return Collections.emptyList();
-            }
-        } catch (Exception e) {
-            log.error("getUserBasicInfoByWorkNums2 HTTP请求异常: workNum={}", workNum, e);
-            return Collections.emptyList();
-        }
-    }
-
     public void updateOrSaveCourse(CourseParam param, String token){
         log.info("---------------准备同步在线课到讲师管理完毕 ------- param " + param);
         String resp = Optional.ofNullable(

servers/boe-server-all/src/main/java/com/xboe/api/vo/UserBasicInfoResultVo.java

@@ -1,35 +0,0 @@
-package com.xboe.api.vo;
-
-import cn.hutool.json.JSONUtil;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
-import java.util.Date;
-import java.util.List;
-
-
-@Data
-@Slf4j
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class UserBasicInfoResultVo {
-
-    private String error;
-    private String message;
-    private String permissions;
-    private List<UserBasicInfoVo> result;
-    private int status;
-    private Date timestamp;
-
-    public UserBasicInfoResultVo success() {
-        if (this.status != 200) {
-            log.error("获取用户基本信息失败----{}", JSONUtil.toJsonPrettyStr(this));
-            return null;
-        }
-        return this;
-    }
-}

servers/boe-server-all/src/main/java/com/xboe/api/vo/UserBasicInfoVo.java

@@ -1,27 +0,0 @@
-package com.xboe.api.vo;
-
-import lombok.Data;
-
-@Data
-public class UserBasicInfoVo {
-
-    /**
-     * 用户ID
-     */
-    private String userId;
-
-    /**
-     * 用户名。
-     */
-    private String userName;
-
-    /**
-     * 工号。
-     */
-    private String workNum;
-
-    /**
-     * 邮箱
-     */
-    private String email;
-}

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/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,6 +3,9 @@ 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;
@@ -17,7 +20,6 @@ import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 import javax.servlet.http.HttpServletResponse;
 import java.nio.charset.StandardCharsets;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
 
@@ -59,13 +61,13 @@ public class CaseAiChatApi extends ApiBaseController {
         // 获取当前用户
         return caseAiChatService.chat(caseAiChatDto, getCurrent());
     }
-    
+
     /**
      * 停止当前聊天输出
      * @param conversationId 会话ID
      * @return 是否成功停止
      */
-    @PostMapping("/stop")
+    @GetMapping("/stop")
     public JsonResponse<Boolean> stopChat(@RequestParam String conversationId) {
         try {
             boolean result = caseAiChatService.stopChatOutput(conversationId);
@@ -79,7 +81,64 @@ public class CaseAiChatApi extends ApiBaseController {
             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
@@ -149,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,

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/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,6 +2,8 @@ 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;
@@ -64,4 +66,27 @@ public interface ICaseAiChatService {
      * @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/CaseAiChatServiceImpl.java

@@ -5,11 +5,15 @@ 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;
@@ -19,7 +23,6 @@ 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;
@@ -45,16 +48,18 @@ 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.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;
-import java.net.SocketTimeoutException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -98,7 +103,13 @@ 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<>();
 
@@ -120,7 +131,7 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
 
         // 2. 查询历史
         List<CaseAiMessageVo> historyMessages = elasticSearchIndexService.queryData(conversationId);
-        
+
         // 3. 构建请求参数
         String userId = currentUser.getCode();
 
@@ -129,6 +140,7 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
         conversationData.setQuery(caseAiChatDto.getQuery());
         conversationData.setConversationId(conversationId);
         conversationData.setUserId(userId);
+        conversationData.setStatus(CaseAiChatErrCodeEnum.SUCCESS.getCode());
 
         String kId = caseAiProperties.getCaseKnowledgeId();
         JSONObject chatParam = new JSONObject();
@@ -155,7 +167,7 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
         }
         String chatParamStr = chatParam.toJSONString();
         log.info("案例问答接口请求参数: [{}]", chatParamStr);
-        
+
         // 4. 设置请求头
         String accessToken;
         try {
@@ -164,6 +176,8 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
                 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;
@@ -173,6 +187,8 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
             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;
@@ -185,11 +201,12 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
         RequestBody bodyRequestBody = RequestBody.create(chatParamStr, MediaType.parse("application/json"));
         builder.post(bodyRequestBody);
         Request request = builder.build();
-        
+
         // 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")) {
@@ -223,13 +240,14 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
 
                     errMessage(sseEmitter, conversationId, sseContent);
                     sseEmitter.complete();
+                    conversationData.setStatus(CaseAiChatErrCodeEnum.AIOT_ERROR.getCode());
+                    conversationData.setErrorMsg(sseContent);
                     conversationData.appendAnswer(sseContent);
                     saveConversationData(conversationData);
                     // 关闭eventSource
                     eventSource.cancel();
                     return;
                 }
-                log.info("调用接口 [{}] 接口开始监听", request.url());
                 // 将EventSource存储到Map中，以便后续可以中断
                 conversationEventSourceMap.put(conversationId, eventSource);
             }
@@ -247,14 +265,14 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
             @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) { // 返回引用文件
@@ -278,6 +296,8 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
                                 // 异常问题，取message内容
                                 String message = jsonData.getString("message");
                                 errMessage(sseEmitter, conversationId, message);
+                                conversationData.setStatus(CaseAiChatErrCodeEnum.AIOT_ERROR.getCode());
+                                conversationData.setErrorMsg(jsonData.toJSONString());
                                 return;
                             }
                         }
@@ -336,14 +356,16 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
                 // 从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)
@@ -351,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();
@@ -378,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 {
@@ -493,44 +515,44 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
             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;
         }
     }
-    
+
     /**
      * 处理文件引用并构建返给前端的响应数据
      */
@@ -539,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");
@@ -557,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) {
@@ -579,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")) {
@@ -593,19 +615,19 @@ 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;
         }
     }
-    
+
     /**
      * 处理文件引用（原方法，保留用于数据收集）
      */
@@ -631,7 +653,7 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
             log.error("处理文件引用异常", e);
         }
     }
-    
+
     /**
      * 处理建议
      */
@@ -650,7 +672,7 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
             log.error("处理建议异常", e);
         }
     }
-    
+
     /**
      * 根据docId查询案例引用信息
      */
@@ -661,7 +683,7 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
             if (docLog == null) {
                 return null;
             }
-            
+
             // 根据 case_id 查询案例详情
             Cases caseEntity = casesDao.get(docLog.getCaseId());
             if (caseEntity == null) {
@@ -678,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());
@@ -687,14 +709,14 @@ 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 请求处理
      * 不再使用
@@ -707,12 +729,12 @@ 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")) {
@@ -746,8 +768,8 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
         jsonData.put("content", message);
 
         JSONObject finishData = new JSONObject();
-        jsonData.put("status", 4);
+        finishData.put("status", 4);
-        jsonData.put("content", "");
+        finishData.put("content", "");
         try {
             sseEmitter.send(conversationData.toJSONString());
             sseEmitter.send(jsonData.toJSONString());
@@ -760,6 +782,22 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
 
     @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 {
@@ -767,17 +805,61 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
                 eventSource.cancel();
                 // 注意：cancel()会触发onFailure回调，在onFailure中会清理资源
                 log.info("成功发送停止会话 {} 的指令", conversationId);
-                return true;
             } catch (Exception e) {
                 log.error("停止会话 {} 输出时发生异常", conversationId, e);
                 // 即使出现异常，也从Map中移除，避免内存泄漏
                 conversationEventSourceMap.remove(conversationId);
-                return false;
             }
         } else {
-            log.warn("未找到会话 {} 对应的事件源，可能已经完成或不存在", conversationId);
+            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;
     }
 
     /**
@@ -859,6 +941,8 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
         headerRow.createCell(4).setCellValue("回答");
         headerRow.createCell(5).setCellValue("开始时间");
         headerRow.createCell(6).setCellValue("问答时长(秒)");
+        headerRow.createCell(7).setCellValue("消息状态");
+        headerRow.createCell(8).setCellValue("错误信息");
 
         // 内容行
         if (!excelDataList.isEmpty()) {
@@ -879,8 +963,22 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
                         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(""); // 开始时间字段暂留空
+                        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、会话名称、用户三列）

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()) {
@@ -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" +
+        InputStream inputStream = getClass().getClassLoader().getResourceAsStream("case_ai_index.json");
-                "  \"properties\": {\n" +
+        if (inputStream != null) {
-                "    \"conversationId\": {\n" +
+            try (InputStreamReader isr = new InputStreamReader(inputStream);
-                "      \"type\": \"keyword\",\n" +
+                 BufferedReader reader = new BufferedReader(isr)) {
-                "      \"index\": true\n" +
+                return reader.lines().collect(Collectors.joining(System.lineSeparator()));
-                "    },\n" +
+            } catch (IOException e) {
-                "    \"query\": {\n" +
+                throw new RuntimeException("Resource read error: case_ai_index.json", e);
-                "      \"type\": \"text\",\n" +
+            }
-                "      \"analyzer\": \"ik_max_word\",\n" +
+        }
-                "      \"search_analyzer\": \"ik_smart\",\n" +
+        throw new RuntimeException("Resource not found: case_ai_index.json");
-                "      \"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" +
-                "}";
     }
 }

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;
@@ -43,7 +46,39 @@ 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() {
@@ -142,25 +177,44 @@ 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 queryBuilder = QueryBuilder.from(Cases.class);
-        queryBuilder.addFilter(com.xboe.core.orm.FieldFilters.eq("deleted", false));
+        queryBuilder.addFilter(FieldFilters.eq("deleted", false));
         // 只处理有文件路径的案例
-        queryBuilder.addFilter(com.xboe.core.orm.FieldFilters.isNotNull("filePath"));
+        queryBuilder.addFilter(FieldFilters.isNotNull("filePath"));
-        queryBuilder.addFilter(com.xboe.core.orm.FieldFilters.ne("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

@@ -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/api/CourseManageApi.java

@@ -7,14 +7,13 @@ import java.util.stream.Collectors;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import com.boe.feign.api.infrastructure.entity.CommonSearchVo;
 import com.boe.feign.api.infrastructure.entity.Dict;
 import com.xboe.api.ThirdApi;
-import com.xboe.api.vo.UserBasicInfoVo;
 import com.xboe.module.course.dto.*;
 import com.xboe.module.course.entity.*;
 import com.xboe.module.course.service.*;
-import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -93,7 +92,7 @@ public class CourseManageApi extends ApiBaseController{
     IDataUserSyncService userSyncService;
 	@Resource
 	private ThirdApi thirdApi;
-
+	
 //	@PostMapping("/test")
 //	public JsonResponse<PageList<Course>> findTest(Pagination pager,CourseQueryDto dto){
 //		//dto.setOrgAid("7003708665807110150");
@@ -465,7 +464,7 @@ public class CourseManageApi extends ApiBaseController{
 
 	@PostMapping("/submit")
 	@AutoLog(module = "课程",action = "提交课程",info = "")
-	public JsonResponse<CourseFullDto> submitCourseFull(HttpServletRequest request, @RequestBody CourseFullDto dto){
+	public JsonResponse<CourseFullDto> submitCourseFull(@RequestBody CourseFullDto dto){
 		if(dto.getCourse()==null){
 			return badRequest("无课程信息");
 		}
@@ -586,10 +585,7 @@ public class CourseManageApi extends ApiBaseController{
 						dto.getCourse().getOrgName(),
 						dto.getCourse().getSysCreateBy(),dto.getCourse().getName());
 				//邮件发送
-				String email= this.getEmail(dto.getAuditUser().getCode(), request);
+				String email=dto.getAuditUser().getEmail();
-				if (StringUtils.isBlank( email)) {
-					email=dto.getAuditUser().getEmail();
-				}
 				if(!isLocalDevelopment()) {
 					//只是非开发模式下才可以发送
 					service.sendMail(email,"《"+dto.getCourse().getName()+"》课程审核提醒", htmlEmail,"数字化学习平台");
@@ -607,39 +603,7 @@ public class CourseManageApi extends ApiBaseController{
 			return error("提交课程处理失败",e.getMessage());
 		}
 	}
-
+	
-	private String getEmail(String code, HttpServletRequest request) {
-
-		String token = request.getHeader("Xboe-Access-Token");
-		if (StringUtils.isEmpty(token)) {
-			token = request.getHeader("token");
-		}
-		if (StringUtils.isEmpty(token)) {
-			token = request.getHeader("x-access-token");
-		}
-
-		log.info("审批获取邮箱新 code：{}", code);
-		if (StringUtils.isBlank( code)) {
-			return null;
-		}
-		try {
-			log.info("审批获取邮箱 workNums：{}", code);
-			List<UserBasicInfoVo> userBasicInfoVoList = thirdApi.getUserBasicInfoByWorkNums2(code, token);
-			log.info("审批获取邮箱 userBasicInfoVoList：{}", userBasicInfoVoList);
-			if (CollectionUtils.isEmpty(userBasicInfoVoList)) {
-				return null;
-			}
-			String email = userBasicInfoVoList.get(0).getEmail();
-			log.info("审批获取邮箱 userBasicInfoVoList.get(0).getEmail()：{}", email);
-
-			
-			return email;
-		} catch (Exception e) {
-			log.error("获取用户邮箱错误",e);
-		}
-			return null;
-	}
-
 	private String createEmailHtml(String name,String orgId, String orgName,String createBy,String courseName) throws Exception {
 		StringBuffer htmlMsg=new StringBuffer("<div style=\"line-height:30px;border:2px solid #2990ca;padding:20px\">");
 		
@@ -750,10 +714,6 @@ public class CourseManageApi extends ApiBaseController{
 				//邮件发送
 				if(!isLocalDevelopment()) {
 					//只是非高度环境上才会发送
-					String newEmail = getEmail(ucode,request);
-					if (StringUtils.isNotBlank(newEmail)) {
-						email = newEmail;
-					}
 					service.sendMail(email,"《"+course.getName()+"》课程审核提醒",htmlEmail,"数字化学习平台");
 				}
 	            

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
+    database: 2
-    host: 192.168.0.253
+    host: 39.104.123.58
-    password: boe@123
+    password: Ebiz2020
-    port: 6379
+    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
+    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: root
+    username: ebiz_ai
-    password: boe#1234A
+    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

@@ -9,20 +9,20 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: 10.251.113.100:8848
+        server-addr: 10.232.28.76:8848,10.232.28.83:8848,10.232.28.77:8848
       config:
-        server-addr: 10.251.113.100:8848
+        server-addr: 10.232.28.76:8848,10.232.28.83:8848,10.232.28.77:8848
   redis:
     database: 1
-    host: 10.251.88.213
+    host: 10.232.27.44
-    password: qwert!W588
+    password: j2ZsxUyl
     port: 6379
   jpa:
     hibernate:
       ddl-auto: none
   datasource:
     driverClassName: com.mysql.jdbc.Driver
-    url: jdbc:mysql://10.251.88.216:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+    url: jdbc:mysql://10.232.27.47:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
     username: admin
     password: boeRds01
     type: com.zaxxer.hikari.HikariDataSource
@@ -33,6 +33,12 @@ spring:
       connection-timeout: 30000
       max-lifetime: 1800000
       maximum-pool-size: 20
+  activemq:
+    broker-url: tcp://10.232.28.73:61616
+    user: admin
+    password: admin
+  jms:
+    pub-sub-domain: true
 logging:
   level:
     org:
@@ -61,7 +67,7 @@ xboe:
       url: https://u.boe.com/userbasic
   elasticsearch:
     server:
-      ip: 10.251.88.218
+      ip: 10.232.27.40
       port: 9200
       user:
       password:
@@ -308,6 +314,7 @@ xboe:
         - "120434"
         - "126466"
         - "98050020"
+        - "10928732"
       alert-email-recipients:
         - chengmeng@boe.com.cn
         - liyubing@boe.com.cn
@@ -331,9 +338,9 @@ aop-log-record:
   #不进行拦截的包或者类
   excludeClassNames:
   activemq:
-    broker-url: tcp://10.251.113.100:61616
+    broker-url: tcp://10.232.28.73:61616
     user: admin
     password: admin
   elasticsearch:
-    host: 10.251.88.218
+    host: 10.232.27.40
     port: 9200

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-basic/src/main/resources/application-prod.yml

@@ -2,8 +2,8 @@
 spring:
   redis:
     database: 1
-    host: 10.251.88.213
+    host: 10.232.27.44
-    password: qwert!W588
+    password: j2ZsxUyl
     port: 6379
   jpa:
     hibernate:
@@ -16,12 +16,12 @@ spring:
     driverClassName: com.mysql.jdbc.Driver
     db1:
       driverClassName: com.mysql.jdbc.Driver
-      jdbc-url: jdbc:mysql://10.251.88.216:3306/boe_basic?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+      jdbc-url: jdbc:mysql://10.232.27.47:3306/boe_basic?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
       username: admin
       password: boeRds01
     db2:
       driverClassName: com.mysql.jdbc.Driver
-      jdbc-url: jdbc:mysql://10.251.88.216:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+      jdbc-url: jdbc:mysql://10.232.27.47:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
       username: admin
       password: boeRds01