[DAT] 配合业务处理挡板

增加临时接口

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

@@ -1,39 +0,0 @@
-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,24 +65,6 @@ 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,8 +7,4 @@ 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

@@ -1,33 +0,0 @@
-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/assistance/service/impl/SmtpEmailServiceImpl.java

@@ -1,7 +1,6 @@
 package com.xboe.module.assistance.service.impl;
 
 import java.util.Date;
-import java.util.List;
 import java.util.Properties;
 
 import javax.mail.Authenticator;
@@ -23,13 +22,12 @@ import com.xboe.module.assistance.service.ISmtpEmailService;
 @Slf4j
 public class SmtpEmailServiceImpl implements ISmtpEmailService {
 
-    //region 默认SMTP服务器配置信息
+    // SMTP服务器配置信息
     private static final String SMTP_HOST = "mail.boe.com.cn";
     private static final String SMTP_USERNAME = "boeu_learning@boe.com.cn";
-    private static final String SMTP_PASSWORD = "boeLms20251112Syse";
+    private static final String SMTP_PASSWORD = "boeLms20250814Syse";
     private static final String SMTP_PORT = "465";
     private static final String SMTP_ENCRYPTION = "ssl";
-    //endregion
 
     @Override
     public void sendMailBySmtp(String to, String subject, String htmlMsg, String from) throws Exception {
@@ -45,7 +43,6 @@ public class SmtpEmailServiceImpl implements ISmtpEmailService {
         if (StringUtils.isBlank(htmlMsg)) {
             throw new Exception("发送邮件失败，未指定邮件内容");
         }
-        // 初始化配置项
 
         // 设置SMTP属性
         Properties props = new Properties();

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

@@ -3,9 +3,6 @@ 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;
@@ -19,14 +16,12 @@ 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.format.DateTimeFormatter;
 import java.util.List;
 
 /**
  * AI对话管理API
  */
-@Slf4j(topic = "caseAiChatLogger")
+@Slf4j
 @RestController
 @RequestMapping(value = "/xboe/m/boe/case/ai")
 public class CaseAiChatApi extends ApiBaseController {
@@ -61,84 +56,7 @@ 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
@@ -155,22 +73,6 @@ public class CaseAiChatApi extends ApiBaseController {
         }
     }
     
-    /**
-     * 导出会话记录为Excel
-     * @param startTime 开始时间
-     * @param endTime 结束时间
-     * @param response HTTP响应
-     */
-    @GetMapping("/export-conversations")
-    public void downloadConversationExcel(@RequestParam String startTime, 
-                                          @RequestParam String endTime, 
-                                          HttpServletResponse response) {
-        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);
-    }
-    
     /**
      * 判断当前登录用户是否显示"案例专家"功能入口
      * @return 是否显示功能入口
@@ -180,10 +82,7 @@ public class CaseAiChatApi extends ApiBaseController {
         try {
             String currentUserCode = getCurrent().getCode();
             boolean shouldShow = caseAiPermissionService.shouldShowCaseAiEntrance(currentUserCode);
-//            return success(shouldShow);
-            JsonResponse<Boolean> result = success(shouldShow);
-            result.setMessage(currentUserCode);
-            return result;
+            return success(shouldShow);
         } catch (Exception e) {
             log.error("判断案例专家功能入口显示权限异常", e);
             return error("判断失败", e.getMessage());
@@ -208,17 +107,6 @@ 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,
@@ -235,4 +123,4 @@ public class CaseAiChatApi extends ApiBaseController {
         }
         return error("创建失败");
     }
-}
+}

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

@@ -1,6 +1,5 @@
 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;
@@ -21,21 +20,14 @@ 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(CaseUploadTask.CASE_UPLOAD_LAST_ID_KEY);
-        log.info("已清除上次处理位置标记");
-    }
-
-    /**
-     * 清除处理位置标记，使下次任务从头开始执行
-     */
-    @PostMapping("/reload/reset")
-    public void resetReloadProcessedId() {
-        stringRedisTemplate.delete(CaseUploadTask.CASE_RELOAD_LAST_ID_KEY);
+        stringRedisTemplate.delete(CASE_UPLOAD_LAST_ID_KEY);
         log.info("已清除上次处理位置标记");
     }
 }

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

@@ -17,11 +17,6 @@ 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;
@@ -32,7 +27,7 @@ public class CaseAiDocumentAsyncHandler {
     public void process(CaseDocumentLogOptTypeEnum optTypeEnum, Cases... caseList) {
         for (Cases cases : caseList) {
             // 控制并发数量
-            while (currentTaskCount.get() >= 5) {
+            while (currentTaskCount.get() >= 15) {
                 try {
                     Thread.sleep(100);
                 } catch (InterruptedException e) {
@@ -44,13 +39,8 @@ public class CaseAiDocumentAsyncHandler {
             currentTaskCount.incrementAndGet();
 
             aiDocExecutor.submit(() -> {
-                try {
-                    // 限流
-                    rateLimiter.acquire();
-                    processCases(cases, optTypeEnum);
-                } finally {
-                    currentTaskCount.decrementAndGet();
-                }
+                processCases(cases, optTypeEnum);
+                currentTaskCount.decrementAndGet();
             });
         }
     }

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

@@ -1,55 +0,0 @@
-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

@@ -1,32 +0,0 @@
-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

@@ -1,49 +0,0 @@
-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

@@ -1,16 +0,0 @@
-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,19 +34,6 @@ public class AiChatConversationData {
      */
     private StringBuilder answer = new StringBuilder();
 
-    /**
-     * 状态
-     * 0-正常
-     * 1-系统错误
-     * 2-AIoT平台错误
-     */
-    private Integer status;
-
-    /**
-     * 错误信息
-     */
-    private String errorMsg;
-
     /**
      * 案例引用列表
      */
@@ -57,20 +44,6 @@ public class AiChatConversationData {
      */
     private List<String> suggestions = new ArrayList<>();
 
-    /**
-     * 用户点赞状态
-     * -1: 踩
-     * 1：赞
-     * 0/null 无操作
-     */
-    private String likeStatus;
-
-    /**
-     * 用户踩的时候, 可以填写反馈意见
-     * 反馈意见
-     */
-    private String feedback;
-
     /**
      * 用户ID
      */
@@ -81,27 +54,28 @@ public class AiChatConversationData {
      */
     private String userName;
 
-    /**
-     * 消息时间戳
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private LocalDateTime startTime;
-
     /**
      * 消息时间戳
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime timestamp;
 
-    /**
-     * 聊天时长（秒）
-     */
-    private Integer durationSeconds;
-
     // ================== 构造函数 ==================
 
     public AiChatConversationData() {
-        this.startTime = LocalDateTime.now();
+        this.timestamp = LocalDateTime.now();
+    }
+
+    public AiChatConversationData(String conversationId, String query, String answer, 
+                                  List<CaseReferVo> caseRefers, List<String> suggestions, 
+                                  String userId) {
+        this.conversationId = conversationId;
+        this.query = query;
+        this.answer = new StringBuilder(answer != null ? answer : "");
+        this.caseRefers = caseRefers != null ? caseRefers : new ArrayList<>();
+        this.suggestions = suggestions != null ? suggestions : new ArrayList<>();
+        this.userId = userId;
+        this.timestamp = LocalDateTime.now();
     }
 
     // ================== 便捷方法 ==================

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

@@ -93,12 +93,4 @@ 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

@@ -1,27 +0,0 @@
-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/properties/CaseAiProperties.java

@@ -48,11 +48,6 @@ public class CaseAiProperties {
      */
     private String defaultUploadUser;
 
-    /**
-     * 案例详情页面地址
-     */
-    private String caseDetailUrlBase;
-
     /**
      * 文件上传是否使用回调接口
      */
@@ -77,14 +72,4 @@ public class CaseAiProperties {
      * AI处理失败告警邮件收件人列表
      */
     private List<String> alertEmailRecipients;
-
-    /**
-     * 是否发送AI对话记录到邮箱
-     */
-    private boolean aiChatDataSendEmail;
-
-    /**
-     * AI对话记录保存根路径
-     */
-    private String aiChatRootPath;
 }

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

@@ -2,14 +2,10 @@ 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;
 
 /**
@@ -19,7 +15,6 @@ public interface ICaseAiChatService {
 
     /**
      * 聊天
-     *
      * @param caseAiChatDto
      * @param currentUser
      * @return
@@ -28,8 +23,7 @@ public interface ICaseAiChatService {
 
     /**
      * 创建新的AI对话会话
-     *
-     * @param userId           用户ID
+     * @param userId 用户ID
      * @param conversationName 对话名称
      * @return 创建的会话信息
      */
@@ -37,56 +31,8 @@ public interface ICaseAiChatService {
 
     /**
      * 根据conversationId查看会话内消息记录
-     *
      * @param conversationId 会话ID
      * @return 消息记录列表
      */
     List<CaseAiMessageVo> getConversationMessages(String conversationId);
-
-    /**
-     * 导出会话记录为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,7 +4,6 @@ import com.xboe.module.boecase.entity.AiChatConversationData;
 import com.xboe.module.boecase.vo.CaseAiMessageVo;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * es索引
@@ -13,29 +12,24 @@ public interface IElasticSearchIndexService {
 
     /**
      * 查看索引是否存在
+     * @param indexName
      * @return
      */
     boolean checkIndexExists();
 
     /**
      * 创建索引
+     * @param indexName
      */
     boolean createIndex();
 
     /**
      * 删除索引
+     * @param indexName
      * @return
      */
     boolean deleteIndex();
 
-    /**
-     * 更新索引：添加索引字段
-     * @param fieldName
-     * @param fieldProperties
-     * @return
-     */
-    boolean updateIndex(String fieldName, Map<String, Object> fieldProperties);
-
     /**
      * 新增数据
      * @param data
@@ -49,20 +43,4 @@ 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(topic = "caseAiChatLogger")
+@Slf4j
 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,18 +2,12 @@ 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;
@@ -23,7 +17,7 @@ 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.vo.ConversationExcelVo;
+import com.xboe.module.boecase.entity.AiChatConversationData;
 import com.xboe.system.organization.vo.OrgSimpleVo;
 import com.xboe.system.user.service.IUserService;
 import lombok.extern.slf4j.Slf4j;
@@ -31,57 +25,49 @@ import okhttp3.*;
 import okhttp3.sse.EventSource;
 import okhttp3.sse.EventSourceListener;
 import okhttp3.sse.EventSources;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.http.HttpEntity;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
-import org.apache.poi.ss.usermodel.Row;
-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;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-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(topic = "caseAiChatLogger")
+@Slf4j
 public class CaseAiChatServiceImpl implements ICaseAiChatService {
 
     @Autowired
     private CaseAiProperties caseAiProperties;
 
-    @Autowired
-    @Qualifier("esChatExecutor")
-    private ThreadPoolTaskExecutor esChatExecutor;
-
     @Autowired
     @Qualifier("customDispatcher")
     private Dispatcher dispatcher;
@@ -104,44 +90,14 @@ 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) {
-        // 创建SSE响应器
-        SseEmitter sseEmitter = new SseEmitter();
         // 1. 获取conversationId
-        String conversationId;
-        try {
-            conversationId = getOrCreateConversationId(caseAiChatDto, currentUser);
-        } catch (Exception e) {
-            log.error("获取会话ID失败", e);
-            errMessage(sseEmitter, null, CaseAiConstants.CHAT_SYS_ERR_MSG);
-            sseEmitter.complete();
-            return sseEmitter;
-        }
-
-        // 2. 查询历史
-        List<CaseAiMessageVo> historyMessages = elasticSearchIndexService.queryData(conversationId);
-
+        String conversationId = getOrCreateConversationId(caseAiChatDto, currentUser);
+        
         // 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);
@@ -151,48 +107,11 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
         chatParam.put("query", caseAiChatDto.getQuery());
         chatParam.put("conversationId", conversationId);
         chatParam.put("enableThinking", Objects.equals(caseAiChatDto.getEnableThinking(), 1));
-        if (historyMessages != null && !historyMessages.isEmpty()) {
-            // 最多10条历史，从后往前
-            JSONArray historyList = new JSONArray();
-            int size = historyMessages.size();
-            int startIndex = Math.max(0, size - 10);
-            for (int i = startIndex; i < size; i++) {
-                JSONObject conversationDetail = new JSONObject();
-                CaseAiMessageVo message = historyMessages.get(i);
-                conversationDetail.put("query", message.getQuery());
-                conversationDetail.put("content", message.getAnswer());
-                historyList.add(conversationDetail);
-            }
-            chatParam.put("historyList", historyList);
-        }
         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, 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 accessToken = aiAccessTokenService.getAccessToken();
         String apiCode = caseAiProperties.getChatApiCode();
         Request.Builder builder = new Request.Builder();
         builder.url(caseAiProperties.getBaseUrl() + "/apigateway/chat/knowledge/v1/chat/completions");
@@ -201,104 +120,68 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
         RequestBody bodyRequestBody = RequestBody.create(chatParamStr, MediaType.parse("application/json"));
         builder.post(bodyRequestBody);
         Request request = builder.build();
-
+        
+        // 5. 创建SSE响应器
+        SseEmitter sseEmitter = new SseEmitter();
+        
+        // 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
-                saveConversationData(conversationData);
-                // 从Map中移除已完成的会话
-                conversationEventSourceMap.remove(conversationId);
+                elasticSearchIndexService.createData(conversationData);
                 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) { // 返回引用文件
-                                // 处理文件引用并构建返给前端的数据
-                                JSONObject modifiedData = handleFileReferAndBuildResponse(responseData, conversationData);
-                                if (modifiedData != null) {
-                                    // 发送修改后的数据给前端
-                                    sseEmitter.send(modifiedData.toJSONString());
-                                    return; // 早期返回，不发送原始数据
-                                }
-                            } else if (statusEnum == CaseAiChatStatusEnum.CHAT) { // 流式对话中
-                                String content = responseData.getString("content");
-                                if (content != null) {
-                                    conversationData.appendAnswer(content);
-                                }
-                            } else if (statusEnum == CaseAiChatStatusEnum.SUGGESTIONS) { // 返回建议
-                                handleSuggestions(responseData, conversationData);
-                            } else if (statusEnum == CaseAiChatStatusEnum.CHAT_COMPLETED || statusEnum == CaseAiChatStatusEnum.API_COMPLETED) { // 接口交互完成
-                                // 不做特殊处理
-                            } else {
-                                // 异常问题，取message内容
-                                String message = jsonData.getString("message");
-                                errMessage(sseEmitter, conversationId, message);
-                                conversationData.setStatus(CaseAiChatErrCodeEnum.AIOT_ERROR.getCode());
-                                conversationData.setErrorMsg(jsonData.toJSONString());
-                                return;
+                            switch (statusEnum) {
+                                case REFERS: // 返回引用文件
+                                    // 处理文件引用并构建返给前端的数据
+                                    JSONObject modifiedData = handleFileReferAndBuildResponse(responseData, conversationData);
+                                    if (modifiedData != null) {
+                                        // 发送修改后的数据给前端
+                                        sseEmitter.send(modifiedData.toJSONString());
+                                        return; // 早期返回，不发送原始数据
+                                    }
+                                    break;
+                                case CHAT: // 流式对话中
+                                    String content = responseData.getString("content");
+                                    if (content != null) {
+                                        conversationData.appendAnswer(content);
+                                    }
+                                    break;
+                                case SUGGESTIONS: // 返回建议
+                                    handleSuggestions(responseData, conversationData);
+                                    break;
+                                case CHAT_COMPLETED:
+                                case API_COMPLETED: // 接口交互完成
+                                default:
+                                    // 不做特殊处理
+                                    break;
                             }
                         }
                         sseEmitter.send(responseData.toJSONString());
@@ -319,53 +202,26 @@ 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 请求处理");
+                    CaseAiChatServiceImpl.this.handleAsRegularHttpRequest(request, sseEmitter, conversationData);
+                    return;
+                }
+                
                 if (e != null) {
-                    log.error("调用接口 [{}] 时发生错误，捕获到异常", request.url(), e);
+                    sseEmitter.completeWithError(e);
                 } else {
-                    log.error("调用接口 [{}] 时发生错误，未捕获到异常", request.url());
+                    sseEmitter.completeWithError(new RuntimeException("调用接口异常, 异常未捕获"));
                 }
-                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(100, TimeUnit.SECONDS)
+                .connectTimeout(60, TimeUnit.SECONDS)
                 .writeTimeout(600, TimeUnit.SECONDS)
                 .readTimeout(600, TimeUnit.SECONDS)
                 .callTimeout(600, TimeUnit.SECONDS)
@@ -373,16 +229,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();
@@ -400,39 +256,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 {
@@ -458,101 +314,55 @@ 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) {
-        Workbook workbook = getChatMessageExcel(startTime, endTime);
-        // 创建Excel文件并保存
-        if (caseAiProperties.isAiChatDataSendEmail()) {
-            // TODO 发送邮件附件
-        } else {
-            // 保存文件
-            String dirPath = caseAiProperties.getAiChatRootPath() + File.separator + startTime.format(DateTimeFormatter.ofPattern("yyyyMM"));
-            Path dir = Paths.get(dirPath);
-            if (!Files.exists(dir)) {
-                try {
-                    Files.createDirectories(dir);
-                } catch (IOException e) {
-                    throw new RuntimeException(e);
-                }
-            }
-            String fileName = "AI会话数据-" + startTime.format(DateTimeFormatter.ofPattern("yyyyMMdd")) + "-" + System.currentTimeMillis() + ".xlsx";
-            Path filePath = dir.resolve(fileName);
-            try (OutputStream out = Files.newOutputStream(filePath)) {
-                workbook.write(out);
-                out.flush();
-            } catch (IOException e) {
-                log.error("保存文件错误", e);
-            }
-        }
-    }
-
+    
     /**
      * 从 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;
         }
     }
-
+    
     /**
      * 处理文件引用并构建返给前端的响应数据
      */
@@ -561,7 +371,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");
@@ -579,13 +389,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) {
@@ -601,11 +411,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")) {
@@ -615,23 +425,22 @@ 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");
@@ -653,7 +462,7 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
             log.error("处理文件引用异常", e);
         }
     }
-
+    
     /**
      * 处理建议
      */
@@ -672,7 +481,7 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
             log.error("处理建议异常", e);
         }
     }
-
+    
     /**
      * 根据docId查询案例引用信息
      */
@@ -683,7 +492,7 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
             if (docLog == null) {
                 return null;
             }
-
+            
             // 根据 case_id 查询案例详情
             Cases caseEntity = casesDao.get(docLog.getCaseId());
             if (caseEntity == null) {
@@ -700,7 +509,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());
@@ -709,19 +518,17 @@ 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()
@@ -729,19 +536,13 @@ 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, conversationData.getConversationId(), responseData.getString("message"));
-                    sseEmitter.complete();
-                    return;
-                }
                 sseEmitter.send(responseBody);
                 sseEmitter.complete();
             } else {
@@ -753,259 +554,9 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
             sseEmitter.completeWithError(e);
         }
     }
-
+    
     /**
-     * 发送错误信息
+     * 对话数据容器
      */
-    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));
-    }
+    // ConversationData 已移动到独立的Entity类：AiChatConversationData
 }

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

@@ -17,15 +17,11 @@ import com.xboe.enums.CaseDocumentLogRunStatusEnum;
 import com.xboe.module.assistance.service.ISmtpEmailService;
 import com.xboe.module.boecase.dao.CaseDocumentLogDao;
 import com.xboe.module.boecase.dao.CasesDao;
-import com.xboe.module.boecase.dao.CasesMajorTypeDao;
 import com.xboe.module.boecase.entity.CaseDocumentLog;
 import com.xboe.module.boecase.entity.Cases;
-import com.xboe.module.boecase.entity.CasesMajorType;
 import com.xboe.module.boecase.properties.CaseAiProperties;
 import com.xboe.module.boecase.service.IAiAccessTokenService;
 import com.xboe.module.boecase.service.ICaseKnowledgeService;
-import com.xboe.module.dict.entity.DictItem;
-import com.xboe.module.dict.service.ISysDictionaryService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpEntity;
@@ -48,8 +44,6 @@ import java.io.File;
 import java.nio.charset.StandardCharsets;
 import java.time.LocalDateTime;
 import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
 
 /**
  * 案例-知识库Service实现类
@@ -69,15 +63,9 @@ public class CaseKnowledgeServiceImpl implements ICaseKnowledgeService {
     @Resource
     private CaseDocumentLogDao caseDocumentLogDao;
 
-    @Resource
-    private CasesMajorTypeDao casesMajorTypeDao;
-
     @Resource
     private XFileUploader fileUploader;
 
-    @Autowired
-    private ISysDictionaryService sysDictionaryService;
-
     @Autowired
     private IAiAccessTokenService aiAccessTokenService;
 
@@ -137,7 +125,10 @@ public class CaseKnowledgeServiceImpl implements ICaseKnowledgeService {
         }
 
         // 4. 构建上传参数
-        String fileName = file.getName();
+        String fileName = cases.getFileName();
+        if (StringUtil.isBlank(fileName)) {
+            fileName = file.getName();
+        }
 
         String fileType = getFileType(fileName);
 
@@ -154,60 +145,6 @@ public class CaseKnowledgeServiceImpl implements ICaseKnowledgeService {
         builder.addTextBody("fileType", fileType, ContentType.TEXT_PLAIN);
         requestBody.put("fileType", fileType);
         builder.addTextBody("parseType", "AUTO", ContentType.TEXT_PLAIN);
-
-        String url = caseAiProperties.getCaseDetailUrlBase() + caseId;
-        requestBody.put("url", url);
-        String downloadUrl = fileUploader.getHttpPath() + cases.getFilePath();
-        requestBody.put("downloadUrl", downloadUrl);
-        builder.addTextBody("url", url, ContentType.TEXT_PLAIN);
-        builder.addTextBody("downloadUrl", downloadUrl, ContentType.TEXT_PLAIN);
-        // metadata
-        JSONObject fileMetaData = new JSONObject();
-        fileMetaData.put("标题", cases.getTitle());
-        fileMetaData.put("作者", cases.getAuthorName());
-        fileMetaData.put("年份", String.valueOf(cases.getSysCreateTime().getYear()));
-        fileMetaData.put("摘要", cases.getSummary());
-        // 组织领域：orgDomainParent
-        String orgDomainParent = cases.getOrgDomainParent();
-        List<DictItem> orgDomainParentItems = sysDictionaryService.findByKey("org_domain");
-        Optional<DictItem> orgDomainParentItem = orgDomainParentItems.stream()
-                .filter(item -> StringUtils.equals(orgDomainParent, item.getCode()))
-                .findFirst();
-        if (orgDomainParentItem.isPresent()) {
-            StringBuilder sb = new StringBuilder();
-            sb.append(orgDomainParentItem.get().getName());
-            if (StringUtils.isNotBlank(cases.getOrgDomainParent2())) {
-                Optional<DictItem> orgDomainParent2Item = orgDomainParentItems.stream()
-                        .filter(item -> StringUtils.equals(cases.getOrgDomainParent2(), item.getCode()))
-                        .findFirst();
-                orgDomainParent2Item.ifPresent(dictItem -> sb.append(" - ").append(dictItem.getName()));
-                if (StringUtils.isNotBlank(cases.getOrgDomainParent3())) {
-                    Optional<DictItem> orgDomainParent3Item = orgDomainParentItems.stream()
-                            .filter(item -> StringUtils.equals(cases.getOrgDomainParent3(), item.getCode()))
-                            .findFirst();
-                    orgDomainParent3Item.ifPresent(dictItem -> sb.append(" - ").append(dictItem.getName()));
-                }
-            }
-            fileMetaData.put("组织领域", sb.toString());
-        }
-        // 分类：majorIds
-        List<CasesMajorType> cmtList = casesMajorTypeDao.findList(FieldFilters.eq("caseId", cases.getId()));
-        if (cmtList != null && !cmtList.isEmpty()) {
-            List<String> majorIds = cmtList.stream().map(CasesMajorType::getMajorId).collect(Collectors.toList());
-
-            List<DictItem> majorItems = sysDictionaryService.findByKey("major_type");
-            if (majorItems != null && !majorItems.isEmpty()) {
-                List<String> majorNames = majorItems.stream()
-                        .filter(item -> majorIds.contains(item.getCode()))
-                        .map(DictItem::getName)
-                        .collect(Collectors.toList());
-                fileMetaData.put("组织领域", String.join(", ", majorNames));
-            }
-        }
-
-        ContentType contentType = ContentType.create("text/plain", StandardCharsets.UTF_8);
-        builder.addTextBody("fileMetaData", fileMetaData.toJSONString(), contentType);
-        requestBody.put("fileMetaData", fileMetaData);
         // 由于接口权限，目前采用不回调，而是通过批处理的方式，处理文件状态
         if (caseAiProperties.isFileUploadUseCallback()) {
             builder.addTextBody("callbackUrl", caseAiProperties.getFileUploadCallbackUrl(), ContentType.TEXT_PLAIN);
@@ -246,9 +183,12 @@ public class CaseKnowledgeServiceImpl implements ICaseKnowledgeService {
                             String taskId = data.getString("taskId");
 
                             // 保存成功的CaseDocumentLog记录
+//                            saveCaseDocumentLog(caseId, cases.getTitle(), CaseDocumentLogOptTypeEnum.CREATE.getCode(), CaseAiConstants.CASE_DOC_UPLOAD_INTERFACE_NAME,
+//                                    requestBody.toJSONString(), responseBody,
+//                                    CaseDocumentLogRunStatusEnum.RUNNING.getCode(), null, null, taskId);
                             saveCaseDocumentLog(caseId, cases.getTitle(), CaseDocumentLogOptTypeEnum.CREATE.getCode(), CaseAiConstants.CASE_DOC_UPLOAD_INTERFACE_NAME,
                                     requestBody.toJSONString(), responseBody,
-                                    CaseDocumentLogRunStatusEnum.RUNNING.getCode(), null, null, taskId);
+                                    CaseDocumentLogRunStatusEnum.COMPLETED.getCode(), CaseDocumentLogOptStatusEnum.SUCCESS.getCode(), CaseDocumentLogCaseStatusEnum.FAILED.getCode(), taskId);
 
                             log.info("上传案例文档成功，等待文档状态变更. caseId: {}, taskId: {}, 尝试次数: {}", caseId, taskId, attempt);
                             return true;
@@ -381,8 +321,9 @@ public class CaseKnowledgeServiceImpl implements ICaseKnowledgeService {
                             // 接口调用成功，检查业务处理结果
                             JSONObject data = result.getJSONObject("data");
                             Boolean deleteSuccess = data.getBoolean(taskId);
-                            int caseStatus = (deleteSuccess != null && deleteSuccess) ?
-                                    CaseDocumentLogCaseStatusEnum.SUCCESS.getCode() : CaseDocumentLogCaseStatusEnum.FAILED.getCode();
+//                            int caseStatus = (deleteSuccess != null && deleteSuccess) ?
+//                                    CaseDocumentLogCaseStatusEnum.SUCCESS.getCode() : CaseDocumentLogCaseStatusEnum.FAILED.getCode();
+                            int caseStatus = CaseDocumentLogCaseStatusEnum.FAILED.getCode();
 
                             saveCaseDocumentLog(caseId, cases.getTitle(), CaseDocumentLogOptTypeEnum.DELETE.getCode(), CaseAiConstants.CASE_DOC_DELETE_INTERFACE_NAME,
                                     params, responseBody,
@@ -475,7 +416,10 @@ public class CaseKnowledgeServiceImpl implements ICaseKnowledgeService {
         }
 
         // 4. 构建上传参数
-        String fileName = file.getName();
+        String fileName = cases.getFileName();
+        if (StringUtil.isBlank(fileName)) {
+            fileName = file.getName();
+        }
 
         String fileType = getFileType(fileName);
 
@@ -492,60 +436,6 @@ public class CaseKnowledgeServiceImpl implements ICaseKnowledgeService {
         builder.addTextBody("fileType", fileType, ContentType.TEXT_PLAIN);
         requestBody.put("fileType", fileType);
         builder.addTextBody("parseType", "AUTO", ContentType.TEXT_PLAIN);
-
-        String url = caseAiProperties.getCaseDetailUrlBase() + caseId;
-        requestBody.put("url", url);
-        String downloadUrl = fileUploader.getHttpPath() + cases.getFilePath();
-        requestBody.put("downloadUrl", downloadUrl);
-        builder.addTextBody("url", url, ContentType.TEXT_PLAIN);
-        builder.addTextBody("downloadUrl", downloadUrl, ContentType.TEXT_PLAIN);
-        // metadata
-        JSONObject fileMetaData = new JSONObject();
-        fileMetaData.put("标题", cases.getTitle());
-        fileMetaData.put("作者", cases.getAuthorName());
-        fileMetaData.put("年份", String.valueOf(cases.getSysCreateTime().getYear()));
-        fileMetaData.put("摘要", cases.getSummary());
-        // 组织领域：orgDomainParent
-        String orgDomainParent = cases.getOrgDomainParent();
-        List<DictItem> orgDomainParentItems = sysDictionaryService.findByKey("org_domain");
-        Optional<DictItem> orgDomainParentItem = orgDomainParentItems.stream()
-                .filter(item -> StringUtils.equals(orgDomainParent, item.getCode()))
-                .findFirst();
-        if (orgDomainParentItem.isPresent()) {
-            StringBuilder sb = new StringBuilder();
-            sb.append(orgDomainParentItem.get().getName());
-            if (StringUtils.isNotBlank(cases.getOrgDomainParent2())) {
-                Optional<DictItem> orgDomainParent2Item = orgDomainParentItems.stream()
-                        .filter(item -> StringUtils.equals(cases.getOrgDomainParent2(), item.getCode()))
-                        .findFirst();
-                orgDomainParent2Item.ifPresent(dictItem -> sb.append(" - ").append(dictItem.getName()));
-                if (StringUtils.isNotBlank(cases.getOrgDomainParent3())) {
-                    Optional<DictItem> orgDomainParent3Item = orgDomainParentItems.stream()
-                            .filter(item -> StringUtils.equals(cases.getOrgDomainParent3(), item.getCode()))
-                            .findFirst();
-                    orgDomainParent3Item.ifPresent(dictItem -> sb.append(" - ").append(dictItem.getName()));
-                }
-            }
-            fileMetaData.put("组织领域", sb.toString());
-        }
-        // 分类：majorIds
-        List<CasesMajorType> cmtList = casesMajorTypeDao.findList(FieldFilters.eq("caseId", cases.getId()));
-        if (cmtList != null && !cmtList.isEmpty()) {
-            List<String> majorIds = cmtList.stream().map(CasesMajorType::getMajorId).collect(Collectors.toList());
-
-            List<DictItem> majorItems = sysDictionaryService.findByKey("major_type");
-            if (majorItems != null && !majorItems.isEmpty()) {
-                List<String> majorNames = majorItems.stream()
-                        .filter(item -> majorIds.contains(item.getCode()))
-                        .map(DictItem::getName)
-                        .collect(Collectors.toList());
-                fileMetaData.put("组织领域", String.join(", ", majorNames));
-            }
-        }
-
-        ContentType contentType = ContentType.create("text/plain", StandardCharsets.UTF_8);
-        builder.addTextBody("fileMetaData", fileMetaData.toJSONString(), contentType);
-        requestBody.put("fileMetaData", fileMetaData);
         // 由于接口权限，目前采用不回调，而是通过批处理的方式，处理文件状态
         if (caseAiProperties.isFileUploadUseCallback()) {
             builder.addTextBody("callbackUrl", caseAiProperties.getFileUploadCallbackUrl(), ContentType.TEXT_PLAIN);
@@ -652,8 +542,7 @@ 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("caseStatus", CaseDocumentLogCaseStatusEnum.SUCCESS.getCode()));
+                        FieldFilters.eq("requestUrl", CaseAiConstants.CASE_DOC_UPLOAD_INTERFACE_NAME));
 
         if (logList.isEmpty()) {
             log.info("删除案例文档失败，未找到相关的日志记录，caseId: {}", caseId);
@@ -713,21 +602,22 @@ public class CaseKnowledgeServiceImpl implements ICaseKnowledgeService {
                                 // 接口调用成功，检查业务处理结果
                                 JSONObject data = result.getJSONObject("data");
                                 Boolean deleteSuccess = data.getBoolean(deleteTaskId);
-                                int caseStatus = (deleteSuccess != null && deleteSuccess) ?
-                                        CaseDocumentLogCaseStatusEnum.SUCCESS.getCode() : CaseDocumentLogCaseStatusEnum.FAILED.getCode();
+//                            int caseStatus = (deleteSuccess != null && deleteSuccess) ?
+//                                    CaseDocumentLogCaseStatusEnum.SUCCESS.getCode() : CaseDocumentLogCaseStatusEnum.FAILED.getCode();
+                                int caseStatus = CaseDocumentLogCaseStatusEnum.FAILED.getCode();
 
                                 saveCaseDocumentLog(caseId, cases.getTitle(), CaseDocumentLogOptTypeEnum.UPDATE.getCode(), CaseAiConstants.CASE_DOC_DELETE_INTERFACE_NAME,
                                         params, responseBody,
                                         CaseDocumentLogRunStatusEnum.COMPLETED.getCode(), CaseDocumentLogOptStatusEnum.SUCCESS.getCode(), caseStatus, null);
 
-                                if (deleteSuccess != null && deleteSuccess) {
-                                    log.info("删除案例文档成功，caseId: {}, taskId: {}, 尝试次数: {}", caseId, deleteTaskId, attempt);
-                                    break; // 删除成功，跳出重试循环
-                                } else {
-                                    // 业务处理失败，不重试
-                                    log.error("删除案例文档业务处理失败，不重试，caseId: {}, taskId: {}", caseId, deleteTaskId);
+//                                if (deleteSuccess != null && deleteSuccess) {
+//                                    log.info("删除案例文档成功，caseId: {}, taskId: {}, 尝试次数: {}", caseId, deleteTaskId, attempt);
+//                                    break; // 删除成功，跳出重试循环
+//                                } else {
+//                                    // 业务处理失败，不重试
+//                                    log.error("删除案例文档业务处理失败，不重试，caseId: {}, taskId: {}", caseId, deleteTaskId);
                                     return false;
-                                }
+//                                }
                             } else {
                                 // 业务处理失败，不重试
                                 log.error("删除案例文档业务处理失败，不重试，response: {}", responseBody);
@@ -791,7 +681,10 @@ public class CaseKnowledgeServiceImpl implements ICaseKnowledgeService {
         }
 
         // 4. 构建上传参数
-        String fileName = file.getName();
+        String fileName = cases.getFileName();
+        if (StringUtil.isBlank(fileName)) {
+            fileName = file.getName();
+        }
 
         String fileType = getFileType(fileName);
 
@@ -808,60 +701,6 @@ public class CaseKnowledgeServiceImpl implements ICaseKnowledgeService {
         builder.addTextBody("fileType", fileType, ContentType.TEXT_PLAIN);
         requestBody.put("fileType", fileType);
         builder.addTextBody("parseType", "AUTO", ContentType.TEXT_PLAIN);
-
-        String url = caseAiProperties.getCaseDetailUrlBase() + caseId;
-        requestBody.put("url", url);
-        String downloadUrl = fileUploader.getHttpPath() + cases.getFilePath();
-        requestBody.put("downloadUrl", downloadUrl);
-        builder.addTextBody("url", url, ContentType.TEXT_PLAIN);
-        builder.addTextBody("downloadUrl", downloadUrl, ContentType.TEXT_PLAIN);
-        // metadata
-        JSONObject fileMetaData = new JSONObject();
-        fileMetaData.put("标题", cases.getTitle());
-        fileMetaData.put("作者", cases.getAuthorName());
-        fileMetaData.put("年份", String.valueOf(cases.getSysCreateTime().getYear()));
-        fileMetaData.put("摘要", cases.getSummary());
-        // 组织领域：orgDomainParent
-        String orgDomainParent = cases.getOrgDomainParent();
-        List<DictItem> orgDomainParentItems = sysDictionaryService.findByKey("org_domain");
-        Optional<DictItem> orgDomainParentItem = orgDomainParentItems.stream()
-                .filter(item -> StringUtils.equals(orgDomainParent, item.getCode()))
-                .findFirst();
-        if (orgDomainParentItem.isPresent()) {
-            StringBuilder sb = new StringBuilder();
-            sb.append(orgDomainParentItem.get().getName());
-            if (StringUtils.isNotBlank(cases.getOrgDomainParent2())) {
-                Optional<DictItem> orgDomainParent2Item = orgDomainParentItems.stream()
-                        .filter(item -> StringUtils.equals(cases.getOrgDomainParent2(), item.getCode()))
-                        .findFirst();
-                orgDomainParent2Item.ifPresent(dictItem -> sb.append(" - ").append(dictItem.getName()));
-                if (StringUtils.isNotBlank(cases.getOrgDomainParent3())) {
-                    Optional<DictItem> orgDomainParent3Item = orgDomainParentItems.stream()
-                            .filter(item -> StringUtils.equals(cases.getOrgDomainParent3(), item.getCode()))
-                            .findFirst();
-                    orgDomainParent3Item.ifPresent(dictItem -> sb.append(" - ").append(dictItem.getName()));
-                }
-            }
-            fileMetaData.put("组织领域", sb.toString());
-        }
-        // 分类：majorIds
-        List<CasesMajorType> cmtList = casesMajorTypeDao.findList(FieldFilters.eq("caseId", cases.getId()));
-        if (cmtList != null && !cmtList.isEmpty()) {
-            List<String> majorIds = cmtList.stream().map(CasesMajorType::getMajorId).collect(Collectors.toList());
-
-            List<DictItem> majorItems = sysDictionaryService.findByKey("major_type");
-            if (majorItems != null && !majorItems.isEmpty()) {
-                List<String> majorNames = majorItems.stream()
-                        .filter(item -> majorIds.contains(item.getCode()))
-                        .map(DictItem::getName)
-                        .collect(Collectors.toList());
-                fileMetaData.put("组织领域", String.join(", ", majorNames));
-            }
-        }
-
-        ContentType contentType = ContentType.create("text/plain", StandardCharsets.UTF_8);
-        builder.addTextBody("fileMetaData", fileMetaData.toJSONString(), contentType);
-        requestBody.put("fileMetaData", fileMetaData);
         // 由于接口权限，目前采用不回调，而是通过批处理的方式，处理文件状态
         if (caseAiProperties.isFileUploadUseCallback()) {
             builder.addTextBody("callbackUrl", caseAiProperties.getFileUploadCallbackUrl(), ContentType.TEXT_PLAIN);
@@ -1028,7 +867,7 @@ public class CaseKnowledgeServiceImpl implements ICaseKnowledgeService {
 
     @Override
     public void batchCheckFileStatus() {
-//        log.info("开始批量检查文件状态");
+        log.info("开始批量检查文件状态");
         
         // 1. 查询CaseDocumentLog表中前10条run_status等于0的数据，并按创建时间升序排序
         PageList<CaseDocumentLog> runningLogPage = caseDocumentLogDao.getGenericDao()
@@ -1038,11 +877,11 @@ public class CaseKnowledgeServiceImpl implements ICaseKnowledgeService {
         
         // 2. 如果没有符合条件的数据，完成
         if (runningLogs == null || runningLogs.isEmpty()) {
-//            log.info("没有需要检查状态的文档，批量检查完成");
+            log.info("没有需要检查状态的文档，批量检查完成");
             return;
         }
         
-//        log.info("找到{}条需要检查状态的文档记录", runningLogs.size());
+        log.info("找到{}条需要检查状态的文档记录", runningLogs.size());
         
         // 3. 把这些数据的taskId聚合成一个List<String>
         List<String> taskIds = runningLogs.stream()
@@ -1052,11 +891,11 @@ public class CaseKnowledgeServiceImpl implements ICaseKnowledgeService {
                 .collect(java.util.stream.Collectors.toList());
         
         if (taskIds.isEmpty()) {
-//            log.error("所有运行中的记录都没有有效的taskId");
+            log.error("所有运行中的记录都没有有效的taskId");
             return;
         }
         
-//        log.info("需要检查状态的taskId数量: {}", taskIds.size());
+        log.info("需要检查状态的taskId数量: {}", taskIds.size());
         
         // 4. 获取access_token
         String accessToken = aiAccessTokenService.getAccessToken();
@@ -1096,7 +935,7 @@ public class CaseKnowledgeServiceImpl implements ICaseKnowledgeService {
             log.error("批量检查文件状态异常", e);
         }
         
-//        log.info("批量检查文件状态完成");
+        log.info("批量检查文件状态完成");
     }
 
     /**
@@ -1362,9 +1201,8 @@ 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());
+                log.info("文档向量化成功，更新状态，taskId: {}, caseId: {}", caseLog.getTaskId(), caseLog.getCaseId());
             } else if ("failed".equals(fileStatus)) {
                 // 状态为failed，run_status、opt_status变更为1，case_status变更为2
                 caseLog.setRunStatus(CaseDocumentLogRunStatusEnum.COMPLETED.getCode());
@@ -1372,20 +1210,20 @@ public class CaseKnowledgeServiceImpl implements ICaseKnowledgeService {
                 caseLog.setCaseStatus(CaseDocumentLogCaseStatusEnum.FAILED.getCode());
                 needUpdate = true;
                 needToSendEmail = true;
-//                log.error("文档处理失败，需要发送邮件，更新状态，taskId: {}, caseId: {}", caseLog.getTaskId(), caseLog.getCaseId());
+                log.error("文档处理失败，需要发送邮件，更新状态，taskId: {}, caseId: {}", caseLog.getTaskId(), caseLog.getCaseId());
             } else {
                 // 其他状态（uploaded、texted、vectoring），不做数据变更
-//                log.info("文档状态为{}，暂不更新数据库，taskId: {}", fileStatus, caseLog.getTaskId());
+                log.info("文档状态为{}，暂不更新数据库，taskId: {}", fileStatus, caseLog.getTaskId());
             }
             
             // 如果需要更新，执行update操作
             if (needUpdate) {
                 caseLog.setSysUpdateTime(LocalDateTime.now());
                 caseDocumentLogDao.save(caseLog);
-//                log.info("更新CaseDocumentLog成功，logId: {}, taskId: {}, fileStatus: {}",
-//                        caseLog.getId(), caseLog.getTaskId(), fileStatus);
-//            } else {
-//                log.info("无需更新CaseDocumentLog，taskId: {}, fileStatus: {}", caseLog.getTaskId(), fileStatus);
+                log.info("更新CaseDocumentLog成功，logId: {}, taskId: {}, fileStatus: {}", 
+                        caseLog.getId(), caseLog.getTaskId(), fileStatus);
+            } else {
+                log.info("无需更新CaseDocumentLog，taskId: {}, fileStatus: {}", caseLog.getTaskId(), fileStatus);
             }
         } catch (Exception e) {
             log.error("更新日志状态异常，taskId: {}, fileStatus: {}", caseLog.getTaskId(), fileStatus, e);
@@ -1402,7 +1240,7 @@ public class CaseKnowledgeServiceImpl implements ICaseKnowledgeService {
 
             // 使用配置的收件人列表
             List<String> recipients = caseAiProperties.getAlertEmailRecipients();
-//            log.info("使用配置的收件人列表：{}", recipients);
+            log.info("使用配置的收件人列表：{}", recipients);
             if (recipients != null && !recipients.isEmpty()) {
                 try {
                     String to = String.join(",", recipients);

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

@@ -8,43 +8,31 @@ 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
@@ -132,36 +120,6 @@ 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) {
@@ -176,14 +134,7 @@ public class ElasticSearchIndexServiceImpl implements IElasticSearchIndexService
             esData.put("answer", conversationData.getAnswerAsString());
             esData.put("conversationId", conversationData.getConversationId());
             esData.put("userId", conversationData.getUserId());
-            // 持续时间
-            LocalDateTime now = LocalDateTime.now();
-            esData.put("startTime", conversationData.getStartTime().toString());
-            esData.put("timestamp", now.toString());
-            esData.put("durationSeconds", Duration.between(conversationData.getStartTime(), now).getSeconds());
-
-            esData.put("status", conversationData.getStatus());
-            esData.put("errorMsg", conversationData.getErrorMsg());
+            esData.put("timestamp", LocalDateTime.now().toString());
 
             // 构建 caseRefer 数据
             JSONArray caseReferArray = new JSONArray();
@@ -255,69 +206,35 @@ public class ElasticSearchIndexServiceImpl implements IElasticSearchIndexService
             CaseAiMessageVo messageVo = new CaseAiMessageVo();
             messageVo.setQuery((String) sourceMap.get("query"));
             messageVo.setAnswer((String) sourceMap.get("answer"));
-            if (sourceMap.containsKey("startTime")) {
-                String startTimeStr = (String) sourceMap.get("startTime");
-                messageVo.setStartTime(LocalDateTime.parse(startTimeStr));
-            }
-            if (sourceMap.containsKey("durationSeconds")) {
-                messageVo.setDurationSeconds((Integer) sourceMap.get("durationSeconds"));
-            }
 
             // 解析 suggestions
-            if (sourceMap.containsKey("suggestions")) {
-                Object suggestionsObj = sourceMap.get("suggestions");
-                if (suggestionsObj instanceof List) {
-                    messageVo.setSuggestions((List<String>) suggestionsObj);
-                }
-            }
-
-            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());
-                }
+            Object suggestionsObj = sourceMap.get("suggestions");
+            if (suggestionsObj instanceof List) {
+                messageVo.setSuggestions((List<String>) suggestionsObj);
             }
 
             // 解析 caseRefer
-            if (sourceMap.containsKey("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;
+            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"));
+                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);
+                    // 解析 keywords
+                    Object keywordsObj = caseReferMap.get("keywords");
+                    if (keywordsObj instanceof List) {
+                        caseRefer.setKeywords((List<String>) keywordsObj);
                     }
-                    messageVo.setCaseRefer(caseReferList);
-                }
-            }
 
-            // 解析点赞状态
-            if (sourceMap.containsKey("likeStatus")) {
-                messageVo.setLikeStatus((String) sourceMap.get("likeStatus"));
-            }
-            // 解析反馈信息
-            if (sourceMap.containsKey("feedback")) {
-                messageVo.setFeedback((String) sourceMap.get("feedback"));
+                    caseReferList.add(caseRefer);
+                }
+                messageVo.setCaseRefer(caseReferList);
             }
 
             return messageVo;
@@ -327,78 +244,6 @@ 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索引的字段映射配置
      * 根据项目中的会话消息数据结构规范定义映射
@@ -406,15 +251,70 @@ public class ElasticSearchIndexServiceImpl implements IElasticSearchIndexService
      * @return JSON格式的映射配置
      */
     private String getAiChatMessagesMapping() {
-        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");
+        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" +
+                "}";
     }
 }

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

@@ -1,77 +0,0 @@
-package com.xboe.module.boecase.task;
-
-import com.xboe.module.boecase.service.ICaseAiChatService;
-import com.xxl.job.core.handler.annotation.XxlJob;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.time.LocalDateTime;
-import java.time.YearMonth;
-import java.time.format.DateTimeFormatter;
-
-@Component
-@Slf4j
-public class CaseAiChatDataTask {
-
-    @Autowired
-    private ICaseAiChatService caseAiChatService;
-
-
-    /**
-     * 查询上月聊天数据并下载
-     * cron: 0/10 * * * * ?
-     */
-    @XxlJob("chatDataExcelDownloadJob")
-    public void chatDataExcelDownload(String param) {
-        LocalDateTime startTime;
-        LocalDateTime endTime;
-        
-        if (param != null && !param.isEmpty()) {
-            // 解析参数，格式应为 "startTime,endTime"，例如 "2023-01-01T00:00:00,2023-01-31T23:59:59"
-            String[] times = param.split(",");
-            if (times.length == 2) {
-                DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss");
-                try {
-                    startTime = LocalDateTime.parse(times[0], formatter);
-                    endTime = LocalDateTime.parse(times[1], formatter);
-                    log.info("使用参数指定的时间范围: {} 到 {}", startTime, endTime);
-                } catch (Exception e) {
-                    log.error("解析时间参数失败，使用默认时间范围", e);
-                    // 使用默认逻辑
-                    LocalDateTime now = LocalDateTime.now();
-                    YearMonth lastMonth = YearMonth.from(now).minusMonths(1);
-                    startTime = now.minusMonths(1)
-                            .withDayOfMonth(1)
-                            .withHour(0)
-                            .withMinute(0)
-                            .withSecond(0);
-                    endTime = lastMonth.atEndOfMonth().atTime(23, 59, 59);
-                }
-            } else {
-                // 使用默认逻辑
-                LocalDateTime now = LocalDateTime.now();
-                YearMonth lastMonth = YearMonth.from(now).minusMonths(1);
-                startTime = now.minusMonths(1)
-                        .withDayOfMonth(1)
-                        .withHour(0)
-                        .withMinute(0)
-                        .withSecond(0);
-                endTime = lastMonth.atEndOfMonth().atTime(23, 59, 59);
-            }
-        } else {
-            // 使用默认逻辑
-            LocalDateTime now = LocalDateTime.now();
-            YearMonth lastMonth = YearMonth.from(now).minusMonths(1);
-            startTime = now.minusMonths(1)
-                    .withDayOfMonth(1)
-                    .withHour(0)
-                    .withMinute(0)
-                    .withSecond(0);
-            endTime = lastMonth.atEndOfMonth().atTime(23, 59, 59);
-        }
-        
-        // 执行
-        caseAiChatService.downloadConversationExcel(startTime, endTime);
-    }
-}

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

@@ -20,8 +20,8 @@ public class CaseDocumentLogTask {
      */
     @XxlJob("batchCheckFileStatusJob")
     public void batchCheckFileStatusJob() {
-//        log.info("开始批量查询文件状态");
+        log.info("开始批量查询文件状态");
         caseKnowledgeService.batchCheckFileStatus();
-//        log.info("结束批量查询文件状态");
+        log.info("结束批量查询文件状态");
     }
 }

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

@@ -1,13 +1,6 @@
 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;
-import com.xboe.enums.CaseDocumentLogRunStatusEnum;
 import com.xboe.module.boecase.async.CaseAiDocumentAsyncHandler;
 import com.xboe.module.boecase.dao.CaseDocumentLogDao;
 import com.xboe.module.boecase.dao.CasesDao;
@@ -15,7 +8,6 @@ import com.xboe.module.boecase.entity.CaseDocumentLog;
 import com.xboe.module.boecase.entity.Cases;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Component;
@@ -24,8 +16,6 @@ import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
 
 /**
  * 旧案例上传
@@ -46,59 +36,25 @@ public class CaseUploadTask {
     @Autowired
     private StringRedisTemplate stringRedisTemplate;
 
-    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);
-            }
-        }
-    }
+    private static final String CASE_UPLOAD_LAST_ID_KEY = "case:upload:last:id";
 
     @XxlJob("oldDataUploadJob")
     public void oldDataUploadJob() {
-        String currentLastId = null;
         try {
-//            log.info("开始执行旧案例上传任务");
+            log.info("开始执行旧案例上传任务");
 
             // 从Redis获取上次处理的最后一条记录ID
             String lastProcessedId = stringRedisTemplate.opsForValue().get(CASE_UPLOAD_LAST_ID_KEY);
-//            log.info("上次处理的最后一条记录ID: {}", lastProcessedId);
+            log.info("上次处理的最后一条记录ID: {}", lastProcessedId);
 
             // 查询符合条件的案例数据
             List<Cases> casesToProcess = findCasesToProcess(lastProcessedId);
-//            log.info("查询到待处理案例数量: {}", casesToProcess.size());
+            log.info("查询到待处理案例数量: {}", casesToProcess.size());
 
             if (casesToProcess.isEmpty()) {
-//                log.info("没有需要处理的案例数据");
+                log.info("没有需要处理的案例数据");
                 return;
             }
-            currentLastId = casesToProcess.get(casesToProcess.size() - 1).getId();
 
             // 批量检查这些案例是否已在CaseDocumentLog中存在记录，提升性能
             List<String> caseIds = new ArrayList<>();
@@ -114,59 +70,35 @@ 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) {
-//                    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;
-                            })) {
+                boolean exists = false;
+                for (CaseDocumentLog log : existingLogs) {
+                    if (cases.getId().equals(log.getCaseId())) {
+                        exists = true;
+                        break;
+                    }
+                }
+                if (!exists) {
                     casesList.add(cases);
                 }
             }
 
-//            log.info("过滤后需要处理的案例数量: {}", casesList.size());
+            log.info("过滤后需要处理的案例数量: {}", casesList.size());
 
             if (!casesList.isEmpty()) {
                 // 调用异步处理方法
                 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("旧案例上传任务执行完成");
+            log.info("旧案例上传任务执行完成");
         } catch (Exception e) {
             log.error("执行旧案例上传任务时发生异常", e);
-        } finally {
-            if (currentLastId != null) {
-                fixOnLastCase(currentLastId);
-            }
         }
     }
 
@@ -177,46 +109,22 @@ public class CaseUploadTask {
      * @return 案例列表
      */
     private List<Cases> findCasesToProcess(String lastProcessedId) {
-        QueryBuilder queryBuilder = QueryBuilder.from(Cases.class);
-        queryBuilder.addFilter(FieldFilters.eq("deleted", false));
+        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.addFilter(FieldFilters.isNotNull("filePath"));
-        queryBuilder.addFilter(FieldFilters.ne("filePath", ""));
+        queryBuilder.addFilter(com.xboe.core.orm.FieldFilters.isNotNull("filePath"));
+        queryBuilder.addFilter(com.xboe.core.orm.FieldFilters.ne("filePath", ""));
         
         // 如果有上次处理的ID，则从该ID之后开始查询
         if (lastProcessedId != null && !lastProcessedId.isEmpty()) {
-            queryBuilder.addFilter(FieldFilters.gt("id", lastProcessedId));
+            queryBuilder.addFilter(com.xboe.core.orm.FieldFilters.gt("id", lastProcessedId));
         }
         
         // 按创建时间升序排序
-        queryBuilder.addOrder(OrderCondition.asc("id"));
+        queryBuilder.addOrder(com.xboe.common.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

@@ -2,7 +2,6 @@ package com.xboe.module.boecase.vo;
 
 import lombok.Data;
 
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -21,16 +20,6 @@ public class CaseAiMessageVo {
      */
     private String answer;
 
-    /**
-     * 会话开始时间
-     */
-    private LocalDateTime startTime;
-
-    /**
-     * 会话时长(秒)
-     */
-    private Integer durationSeconds;
-
     /**
      * 案例引用列表
      */
@@ -40,31 +29,4 @@ 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/boecase/vo/ConversationExcelVo.java

@@ -1,31 +0,0 @@
-package com.xboe.module.boecase.vo;
-
-import lombok.Data;
-import java.time.LocalDateTime;
-import java.util.List;
-
-/**
- * 会话Excel导出VO
- */
-@Data
-public class ConversationExcelVo {
-    /**
-     * 会话ID
-     */
-    private String conversationId;
-    
-    /**
-     * 会话名称
-     */
-    private String conversationName;
-    
-    /**
-     * 用户
-     */
-    private String user;
-    
-    /**
-     * 问答记录
-     */
-    private List<CaseAiMessageVo> messages;
-}

servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseAuditApi.java

@@ -424,21 +424,10 @@ public class CourseAuditApi  extends ApiBaseController{
 		dto.getCourse().setEnabled(true);//设置启用状态问题
 		dto.getCourse().setPublished(false);//重新提交审核设置为未发布状态
 		try {
-			log.info("------课程提审-- 标签相关开始 ------- 课程ID = {} " , dto.getCourse().getId());
-			Course oldCourse = StringUtils.isBlank(dto.getCourse().getId()) ? null : courseService.get(dto.getCourse().getId());
-			if(oldCourse!=null && StringUtils.isNotEmpty(oldCourse.getTags())){
-				String[] tagArray = oldCourse.getTags().split(",");
-				// 检查每个元素是否为纯数字
-				for (String tag : tagArray) {
-					if (!tag.matches("\\d+")) { // 使用正则表达式检查是否为纯数字
-						log.info("-------- 不是纯数字 ------- tag = {} " , tag);
-						oldCourse.setTags(null); // 兼容
-						break;
-					}
-				}
-			}
-			tagService.updateTags(oldCourse,dto.getCourse(),cuser);
-			log.info("-----课程提审--- 标签相关结束 -------");
+//			log.info("-------- 标签相关开始 ------- 课程ID = {} " , dto.getCourse().getId());
+//			Course oldCourse = StringUtils.isBlank(dto.getCourse().getId()) ? null : courseService.get(dto.getCourse().getId());
+//			tagService.updateTags(oldCourse,dto.getCourse(),cuser);
+//			log.info("-------- 标签相关结束 -------");
 
 			courseService.submitAndPublish(dto,cuser.getAccountId(),cuser.getName());
 			log.info("---------------在线课开始同步到讲师管理 ------- token = " + token);

servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFileApi.java

@@ -15,8 +15,6 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import it.sauronsoftware.jave.Encoder;
-import it.sauronsoftware.jave.MultimediaInfo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.orm.ObjectOptimisticLockingFailureException;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -48,6 +46,8 @@ import com.xboe.module.scorm.SCORMParser;
 import com.xboe.standard.BaseConstant;
 import com.xboe.standard.enums.BoedxCourseFileType;
 
+import it.sauronsoftware.jave.Encoder;
+import it.sauronsoftware.jave.MultimediaInfo;
 import lombok.extern.slf4j.Slf4j;
 
 /**
@@ -256,7 +256,7 @@ public class CourseFileApi extends ApiBaseController {
         }
         String fileFullPath = SysConstant.getConfigValue(BaseConstant.CONFIG_UPLOAD_FILES_SAVEPATH) + file.getFilePath();
         if ("mp3,mp4".indexOf(file.getFileType()) > -1){
-            log.info("上传 "+file.getFileType()+"文件:"+file.getFilePath());
+        	log.info("上传 "+file.getFileType()+"文件:"+file.getFilePath());
             Encoder encoder = new Encoder();
             try {
                 //System.out.println(fileFullPath);
@@ -278,8 +278,8 @@ public class CourseFileApi extends ApiBaseController {
                     }
                 }
             } catch (Exception e) {
-                log.error("读取视频时长错误", e);
-                return error("视频解析失败，尝试重新上传或联系管理员", "视频解析失败，尝试重新上传或联系管理员");
+                log.error("读取视频时长错误");
+//                e.printStackTrace();
             }
         }
 

servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFullTextApi.java

@@ -11,9 +11,6 @@ import com.boe.feign.api.serverall.entity.UserData;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.xboe.api.ThirdApi;
-import com.xboe.core.orm.FieldFilters;
-import com.xboe.core.orm.IFieldFilter;
-import com.xboe.core.orm.QueryBuilder;
 import com.xboe.data.outside.IOutSideDataService;
 import com.xboe.module.course.entity.CourseTag;
 import com.xboe.module.course.service.*;
@@ -314,30 +311,14 @@ public class CourseFullTextApi  extends ApiBaseController{
 
 		paras.setDevice(dto.getDevice());
 		String tagIds = dto.getTags();
-		log.info("课程查询 tagIds = " + tagIds);
 		if (tagIds != null && tagIds != ""){
 			paras.setTags(tagIds);
 		}else {
-			String tagName = dto.getKeyword();
-			log.info("课程查询 关键字 = " + tagName);
-			if (StringUtils.isNotEmpty(tagName)){
-				//精准查询
-//				CourseTag courseTag = courseTagService.getTagByName(tagName);
-//				log.info("课程查询 关键字对应标签 = " + courseTag);
-//				if (courseTag != null){
-//					paras.setTags(courseTag.getId());
-//				}
-				// 获取所有标签并进行模糊匹配
-				List<CourseTag> allTags = courseTagService.getAllTags();
-				List<String> matchedTagIds = new ArrayList<>();
-				for (CourseTag tag : allTags) {
-					// 使用模糊匹配（不区分大小写）
-					if (tag.getTagName() != null && tag.getTagName().toLowerCase().contains(tagName.toLowerCase())) {
-						matchedTagIds.add(tag.getId());
-					}
-				}
-				if (!matchedTagIds.isEmpty()) {
-					paras.setTags(String.join(",", matchedTagIds));
+			String tagName = paras.getKeywords();
+			if (tagName != null && tagName != ""){
+				CourseTag courseTag = courseTagService.getTagByName(tagName);
+				if (courseTag != null){
+					paras.setTags(courseTag.getId().toString()+",");
 				}
 			}
 		}
@@ -432,7 +413,7 @@ public class CourseFullTextApi  extends ApiBaseController{
 						c.setKeywordsList(keywordsList);
 					}
 				}
-				if (StringUtils.isNotBlank(c.getTags()) && c.getTags().matches("[0-9,]+")) {
+				if (StringUtils.isNotBlank(c.getTags()) ){
 					List<CourseTag> tagList = courseTagService.getTagsByIds(c.getTags());
 					List<String> tags = tagList.stream().map(CourseTag::getTagName).collect(Collectors.toList());
 					c.setTagsList(tags);

servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java

@@ -33,6 +33,19 @@ import com.xboe.data.dto.UserOrgIds;
 import com.xboe.data.outside.IOutSideDataService;
 import com.xboe.data.service.IDataUserSyncService;
 import com.xboe.module.assistance.service.IEmailService;
+import com.xboe.module.course.entity.Course;
+import com.xboe.module.course.entity.CourseContent;
+import com.xboe.module.course.entity.CourseCrowd;
+import com.xboe.module.course.entity.CourseHRBPAudit;
+import com.xboe.module.course.entity.CourseSection;
+import com.xboe.module.course.entity.CourseTeacher;
+import com.xboe.module.course.entity.CourseUpdateLog;
+import com.xboe.module.course.service.ICourseContentService;
+import com.xboe.module.course.service.ICourseCrowdService;
+import com.xboe.module.course.service.ICourseHRBPAuditService;
+import com.xboe.module.course.service.ICourseSectionService;
+import com.xboe.module.course.service.ICourseService;
+import com.xboe.module.course.service.ICourseTeacherService;
 import com.xboe.module.excel.ExportsExcelSenderUtil;
 import com.xboe.standard.enums.BoedxContentType;
 import com.xboe.standard.enums.BoedxCourseType;
@@ -174,7 +187,7 @@ public class CourseManageApi extends ApiBaseController{
 			rs.put("dicts",dicts);
 		}
 		log.error("-------是否仅内网查看 = " + isPermission);
-		if (StringUtils.isNotBlank(course.getTags()) && course.getTags().matches("[0-9,]+")){
+		if (StringUtils.isNotBlank(course.getTags())){
 			List<CourseTag> tagList = tagService.getTagsByIds(course.getTags());
 			rs.put("tagList", tagList);
 		}
@@ -298,7 +311,6 @@ public class CourseManageApi extends ApiBaseController{
 	@PostMapping("/save")
 	@AutoLog(module = "课程",action = "保存课程基本信息",info = "")
 	public JsonResponse<CourseFullDto> saveCourseFull(@RequestBody CourseFullDto dto, HttpServletRequest request){
-		log.info("-------- 保存课程的全部信息 ------- 课程信息 = {} " , dto.getCourse());
 		if(dto.getCourse()==null){
 			return badRequest("无课程信息");
 		}
@@ -319,26 +331,11 @@ public class CourseManageApi extends ApiBaseController{
 		
 		//填充必要的信息
 		try {
-			log.info("-------- 标签相关开始 ------- 课程ID = {} " , dto.getCourse().getId());
-			log.info("-------- 标签相关开始 ------- 课程TAG = {} " , dto.getCourse().getTags());
-			CurrentUser userInfo = getCurrent();
-			Course oldCourse = StringUtils.isBlank(dto.getCourse().getId()) ? null : courseService.get(dto.getCourse().getId());
-			log.info("-------- 标签相关 ------- oldtags = {} " , oldCourse.getTags());
-			if(oldCourse!=null && StringUtils.isNotEmpty(oldCourse.getTags())){
-				String[] tagArray = oldCourse.getTags().split(",");
-				// 检查每个元素是否为纯数字
-				for (String tag : tagArray) {
-					if (!tag.matches("\\d+")) { // 使用正则表达式检查是否为纯数字
-						log.info("-------- 不是纯数字 -------oldtags tag = {} " , tag);
-						oldCourse.setTags(null); // 兼容
-						break;
-					}
-				}
-			}
-			log.info("-------- 标签相关 updateTags ------- oldtags = {} " , oldCourse.getTags());
-			log.info("-------- 标签相关 updateTags ------- newtags = {} " , dto.getCourse().getTags());
-			tagService.updateTags(oldCourse,dto.getCourse(),userInfo);
-			log.info("-------- 标签相关结束 ------newtags = {} " , dto.getCourse().getTags());
+//			log.info("-------- 标签相关开始 ------- 课程ID = {} " , dto.getCourse().getId());
+//			CurrentUser userInfo = getCurrent();
+//			Course oldCourse = StringUtils.isBlank(dto.getCourse().getId()) ? null : courseService.get(dto.getCourse().getId());
+//			tagService.updateTags(oldCourse,dto.getCourse(),userInfo);
+//			log.info("-------- 标签相关结束 -------");
 
 			if(StringUtils.isBlank(dto.getCourse().getId())) {
 				//只有在第一次添加保存时才会这样
@@ -367,6 +364,8 @@ public class CourseManageApi extends ApiBaseController{
 	
 	/***
 	 * 仅仅是保存
+	 * @param dto
+	 * @return
 	 */
 	@PostMapping("/save-only-course")
 	@AutoLog(module = "课程",action = "保存课程基本信息",info = "")
@@ -393,10 +392,6 @@ public class CourseManageApi extends ApiBaseController{
 				//修改后重置，重新提交审核，重新发布
 				courseService.update(course,true);
 			}
-			//查询是否需要标签提示
-			String aid=getCurrent().getAccountId();
-			Boolean isTip = courseService.getCourseTip(aid);
-			course.setIsTip(isTip);
 			return success(course);
 		} catch (Exception e) {
 			log.error("整体保存课程信息错误",e);
@@ -747,6 +742,7 @@ public class CourseManageApi extends ApiBaseController{
 	
 	/**
 	 * 审核课程，这个是管理人员的审核。老师审核不在这里处理.
+	 * @param id
 	 * @param title
 	 * @param pass
 	 * @param remark
@@ -780,6 +776,7 @@ public class CourseManageApi extends ApiBaseController{
 	
 	/**
 	 * 审核并发布,未完成的处理，
+	 * @param id
 	 * @param title
 	 * @param pass
 	 * @param remark
@@ -823,6 +820,10 @@ public class CourseManageApi extends ApiBaseController{
 	
 	/**
 	 * 发布课程信息,已经没有单独的发布了
+	 * @param id
+	 * @param title
+	 * @param pass
+	 * @param remark
 	 * @return
 	 */
 	@Deprecated
@@ -1220,10 +1221,5 @@ public class CourseManageApi extends ApiBaseController{
 		return success(courses);
 	}
 
-	@PostMapping("/saveTip")
-	public JsonResponse<Boolean> saveTip(){
-		String aid=getCurrent().getAccountId();
-		courseService.saveTip(aid);
-		return success(true);
-	}
+
 }

servers/boe-server-all/src/main/java/com/xboe/module/course/api/CoursePortalApi.java

@@ -13,7 +13,10 @@ import com.xboe.module.course.dto.CourseTeacherDto;
 import com.xboe.module.course.dto.RankingDto;
 import com.xboe.module.course.dto.TeacherCourseDto;
 import com.xboe.module.course.entity.*;
-import com.xboe.module.course.service.*;
+import com.xboe.module.course.service.ICourseContentService;
+import com.xboe.module.course.service.ICourseSectionService;
+import com.xboe.module.course.service.ICourseService;
+import com.xboe.module.course.service.ICourseTeacherService;
 import com.xboe.module.course.vo.CourseStudyVo;
 import com.xboe.module.course.vo.TeacherVo;
 import com.xboe.module.teacher.entity.Teacher;
@@ -30,7 +33,6 @@ import com.xboe.system.user.entity.User;
 import com.xboe.system.user.service.IUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.web.bind.annotation.*;
@@ -95,8 +97,6 @@ public class CoursePortalApi extends ApiBaseController{
 
 	@Autowired
 	StringRedisTemplate redisTemplate;
-	@Resource
-	private ICourseTagService courseTagService;
 
 	/**
 	 * 根据多个课程id返回对应的课程的图片.返回结果如下，
@@ -261,14 +261,7 @@ public class CoursePortalApi extends ApiBaseController{
 		if(course==null || course.getDeleted()){
 			return badRequest("课程不存在或已被删除");
 		}
-		Course course1 = new Course();
-		BeanUtils.copyProperties(course,course1);
-		if (StringUtils.isNotBlank(course.getTags()) && course.getTags().matches("[0-9,]+")) {
-			List<CourseTag> tagList = courseTagService.getTagsByIds(course.getTags());
-			String tags = tagList.stream().map(CourseTag::getTagName).collect(Collectors.joining(","));
-			course1.setTags(tags);
-		}
-		rs.put("course",course1);
+		rs.put("course",course);
 
 		List<CourseCrowd> courseCrowdList = courseService.findCrowdByCourseId(id);
 		if(crowd!=null && crowd) {

servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseTagApi.java

@@ -26,7 +26,6 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.regex.Pattern;
 
 /**
  * @ClassName:CourseTagApi
@@ -154,6 +153,9 @@ public class CourseTagApi extends ApiBaseController {
 
         CurrentUser cuser = getCurrent();
         String aid = cuser.getAccountId();
+        log.info(" searchTags cuser  name = " + cuser.getName() + " , NickName = " + cuser.getNickName() + " , LoginName = " + cuser.getLoginName());
+        log.info(" 参数  tagName = " + tagName + " , typeId = " + typeId + " , aid = " + aid);
+        log.info(" searchTags aid = " + aid);
         List<CourseTag> courseTagList = courseTagService.searchTags(tagName,aid,typeId);
         return success(courseTagList);
     }
@@ -165,14 +167,8 @@ public class CourseTagApi extends ApiBaseController {
      */
     @RequestMapping(value="/createTag",method= RequestMethod.POST)
     public JsonResponse<CourseTag> createTag(CourseTagRelationDto courseTagRelationDto){
-        if (StringUtils.isNotBlank(courseTagRelationDto.getTagName()) && !Pattern.matches("^[\\u4e00-\\u9fa5a-zA-Z0-9_-]+$", courseTagRelationDto.getTagName())) {
-            return error("标签名称只能包含中文、英文、数字、下划线和中横线");
-        }
         if (courseTagRelationDto!=null){
             CourseTag courseTag = courseTagService.createTag(courseTagRelationDto);
-            if (courseTag == null ){
-                return error("创建标签失败！");
-            }
             return success(courseTag);
         }
         return error("创建标签失败！");

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

@@ -42,10 +42,10 @@ public class CourseTagDao extends BaseDao<CourseTag> {
             String sql = "select t.*,COUNT(r.tag_id) AS relation_count\n" +
                     "from boe_course_tag t\n" +
                     "left join boe_course_tag_relation r\n" +
-                    "on t.id = r.tag_id AND r.deleted =0 \n" +
+                    "on t.id = r.tag_id\n" +
                     "where t.deleted =0 and t.is_hot = true and t.status =0  \n" +
                     "GROUP BY t.id\n" +
-                    "order by t.last_set_hot_time desc";  // 数据库字段为last_set_hot_time
+                    "order by t.last_set_hot_time desc,relation_count desc";  // 数据库字段为last_set_hot_time
 
             // 创建原生查询并指定结果映射到CourseTag实体
             javax.persistence.Query query = entityManager.createNativeQuery(sql, CourseTag.class);
@@ -105,7 +105,7 @@ public class CourseTagDao extends BaseDao<CourseTag> {
     }
 
     public CourseTag getTagByName(String tagName) {
-        CourseTag courseTag = this.findOne(FieldFilters.eq("tag_name", tagName),FieldFilters.eq("deleted", false),FieldFilters.eq("status", 0));
+        CourseTag courseTag = this.findOne((FieldFilters.eq("tag_name", tagName)));
         return courseTag;
     }
 
@@ -129,31 +129,36 @@ public class CourseTagDao extends BaseDao<CourseTag> {
         // 只查询实际存在的字段
         sql.append("SELECT id, tag_name, is_public, is_hot, use_count, last_set_public_time, last_set_hot_time, deleted, sys_create_time ");
         sql.append("FROM ( ");
-        sql.append("    SELECT t.id, t.tag_name, t.is_public, t.is_hot, t.use_count, t.last_set_public_time, t.last_set_hot_time, t.deleted, t.sys_create_time ");
-        sql.append("    FROM boe_course_tag_relation r  ");
-        sql.append("    INNER JOIN boe_course_tag t ON r.tag_id = t.id  ");
-        sql.append("    WHERE r.deleted = 0 AND t.deleted = 0 AND t.is_public = 0  AND t.status = 0 ");
-        if (StringUtils.isNotBlank(userId)) {
-            sql.append("        AND r.sys_create_aid = ? ");
-            parameters.add(Long.valueOf(userId));
-        }
-        if (StringUtils.isNotBlank(tagName)) {
-            sql.append("    AND t.tag_name LIKE ? ");
-            parameters.add("%" + tagName + "%");
-        }
-        sql.append("    GROUP BY t.id, t.tag_name, t.is_public, t.is_hot, t.use_count, t.last_set_public_time, t.last_set_hot_time, t.deleted, t.sys_create_time ");
-        sql.append("    UNION ALL ");
         sql.append("    SELECT id, tag_name, is_public, is_hot, use_count, last_set_public_time, last_set_hot_time, deleted, sys_create_time ");
         sql.append("    FROM boe_course_tag  ");
-        sql.append("    WHERE deleted = 0 AND is_public = 1 AND status = 0 ");
+        sql.append("    WHERE deleted = 0 AND is_public = 0 AND status = 0 ");
+
         if (StringUtils.isNotBlank(tagName)) {
             sql.append("    AND tag_name LIKE ? ");
             parameters.add("%" + tagName + "%");
         }
+
+        sql.append("    UNION ALL ");
+        sql.append("    SELECT t.id, t.tag_name, t.is_public, t.is_hot, t.use_count, t.last_set_public_time, t.last_set_hot_time, t.deleted, t.sys_create_time ");
+        sql.append("    FROM boe_course_tag_relation r  ");
+        sql.append("    INNER JOIN boe_course_tag t ON r.tag_id = t.id  ");
+        sql.append("    WHERE r.deleted = 0 AND t.deleted = 0 AND t.is_public = 1  AND t.status = 0 ");
+
+        if (StringUtils.isNotBlank(userId)) {
+            sql.append("        AND r.sys_create_aid = ? ");
+            parameters.add(Long.valueOf(userId));
+        }
+
+        if (StringUtils.isNotBlank(tagName)) {
+            sql.append("    AND t.tag_name LIKE ? ");
+            parameters.add("%" + tagName + "%");
+        }
+
+        sql.append("    GROUP BY t.id, t.tag_name, t.is_public, t.is_hot, t.use_count, t.last_set_public_time, t.last_set_hot_time, t.deleted, t.sys_create_time ");
         sql.append(") AS all_tags ");
+        sql.append("ORDER BY  ");
 
         if (StringUtils.isNotBlank(typeId)) {
-            sql.append("ORDER BY  ");
             sql.append("    CASE WHEN id IN ( ");
             sql.append("        SELECT tag_id  ");
             sql.append("        FROM boe_course_type_tag_relation  ");
@@ -162,13 +167,13 @@ public class CourseTagDao extends BaseDao<CourseTag> {
             sql.append("                 OR sys_type2 = ? ");
             sql.append("                 OR sys_type3 = ?) ");
             sql.append("        GROUP BY tag_id ");
-            sql.append("    ) THEN 0 ELSE 1 END ");
+            sql.append("    ) THEN 0 ELSE 1 END, ");
             parameters.add(Long.valueOf(typeId));
             parameters.add(Long.valueOf(typeId));
             parameters.add(Long.valueOf(typeId));
         }
 
-//        sql.append("    sys_update_time DESC");
+        sql.append("    sys_create_time DESC");
         log.info("查询标签 searchTags sql = {} ", sql);
         // 不使用实体类映射，手动处理结果集
         Query query = entityManager.createNativeQuery(sql.toString());

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

@@ -113,18 +113,4 @@ public class CourseTagRelationDao extends BaseDao<CourseTagRelation> {
                 .collect(Collectors.toList());
         return new PageList<CourseTagRelationDto>(list,totalresults!=null?totalresults.size():0);
     }
-
-    public void reTagRelDelStatus(String id,String name) {
-        String sql = "UPDATE boe_course_tag_relation SET deleted = FALSE, sys_update_by = '" + name +
-                "', sys_update_time = NOW() WHERE id = " + id;
-        Query query = entityManager.createNativeQuery(sql);
-        query.executeUpdate();
-    }
-
-    public void reTypeTagRelDelStatus(String id,String name) {
-        String sql = "UPDATE boe_course_type_tag_relation SET deleted = FALSE, sys_update_by = '" + name +
-                "', sys_update_time = NOW() WHERE id = " + id;
-        Query query = entityManager.createNativeQuery(sql);
-        query.executeUpdate();
-    }
 }

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

@@ -1,20 +0,0 @@
-package com.xboe.module.course.dao;
-
-import com.xboe.core.orm.BaseDao;
-import com.xboe.module.course.entity.ModifyLog;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public class ModifyLogDao extends BaseDao<ModifyLog> {
-
-    public void insert(String requestId, String location, String body, String remark) {
-        ModifyLog entity = new ModifyLog();
-        entity.setRequestId(requestId);
-        entity.setLocation(location);
-        entity.setBody(body);
-        entity.setRemark(remark);
-
-        save(entity);
-    }
-
-}

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

@@ -1,9 +0,0 @@
-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/dao/TipDao.java

@@ -1,12 +0,0 @@
-package com.xboe.module.course.dao;
-
-import com.xboe.core.orm.BaseDao;
-import com.xboe.module.course.entity.Tip;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Repository;
-
-
-@Slf4j
-@Repository
-public class TipDao extends BaseDao<Tip> {
-}

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

@@ -399,13 +399,7 @@ public class Course extends BaseEntity {
 
     @Transient
     private String teacher;
-
-    /**
-     * 新增在线课时是否需要标签提示
-     */
-    @Transient
-    private Boolean isTip;
-
+    
     public Course(String id,String name,String summary,String coverImg,String sysCreateAid,String sysCreateBy,Integer type,LocalDateTime publishTime){
         super.setId(id);
         this.name=name;

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

@@ -1,45 +0,0 @@
-package com.xboe.module.course.entity;
-
-import com.xboe.core.SysConstant;
-import com.xboe.core.orm.IdBaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
-/**
- * 讲师删除记录表
- * 为了监控PngCode-SZX-1227问题临时创建的表
- *
- * @author guo jia
- */
-@Data
-@Entity
-@ToString(callSuper = true)
-@EqualsAndHashCode(callSuper = true)
-@Table(name = SysConstant.TABLE_PRE + "modify_log")
-public class ModifyLog extends IdBaseEntity {
-
-    /**
-     * 请求ID
-     */
-    private String requestId;
-
-    /**
-     * 位置
-     */
-    private String location;
-
-    /**
-     * 请求body
-     */
-    private String body;
-
-    /**
-     * 备注信息
-     */
-    private String remark;
-
-}

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

@@ -1,120 +0,0 @@
-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/module/course/entity/Tip.java

@@ -1,36 +0,0 @@
-package com.xboe.module.course.entity;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.xboe.core.SysConstant;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import javax.persistence.*;
-import java.time.LocalDateTime;
-
-/**
- * @author by lyc
- * @date 2025/11/10
- */
-@Data
-@Entity
-@EqualsAndHashCode(callSuper = false)
-@Table(name = "tip")
-public class Tip {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id", length = 20)
-    private Long id;
-
-    @Column(name = "aid", length = 30)
-    private String aid;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Column(name = "create_time", length = 30)
-    private LocalDateTime create_time;
-
-    // 0 标签提示
-    @Column(name = "type", length = 3)
-    private Integer type;
-
-}

servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseService.java

@@ -344,11 +344,5 @@ public interface ICourseService {
     List<Course> findByIds(List<String> courseIds);
     void deletedStudyResourceBatchByCourseIdAndType(String courseId,Integer courseType);
 
-    void saveTip(String aid);
-
-    Boolean getCourseTip(String aid);
-
-    void rePublish(String courseId);
-
-//    void getPhpCourseData();
+    void getPhpCourseData();
 }

servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseTagService.java

@@ -92,6 +92,4 @@ public interface ICourseTagService {
     CourseTag getTagByName(String tagName);
 
     void updateTags(Course oldCourse,Course newCourse,CurrentUser userInfo);
-
-    List<CourseTag> getAllTags();
 }

servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java

@@ -17,7 +17,6 @@ import javax.management.Query;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.json.JSONUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
@@ -28,7 +27,6 @@ import com.xboe.api.ThirdApi;
 import com.xboe.core.orm.*;
 import com.xboe.module.course.dao.*;
 import com.xboe.module.course.entity.*;
-import com.xboe.module.course.dao.*;
 import com.xboe.module.course.dto.CourseTagRelationDto;
 import com.xboe.module.course.entity.*;
 import com.xboe.module.course.service.ICourseTagService;
@@ -125,15 +123,10 @@ public class CourseServiceImpl implements ICourseService {
 
     @Resource
     RestHighLevelClient restHighLevelClient;
-    @Resource
-    private TipDao tipDao;
 
     @Resource
     private CourseTeacherDeletedRecordDao courseTeacherDeletedRecordDao;
 
-    @Resource
-    private ModifyLogDao modifyLogDao;
-
     /**
      * 生成过滤条件
      *
@@ -447,15 +440,15 @@ public class CourseServiceImpl implements ICourseService {
                     });
                     //将需要隐藏的做标记
                     listByFilters2.forEach(e -> {
-                        if ((seache.contains(e.getId()) || dto.getReadIds().contains(e.getOrgId())) && !finalStrings.contains(e.getOrgId()) && !dto.getOrgAid().equals(e.getSysCreateAid())) {
+                        if ((seache.contains(e.getId())||dto.getReadIds().contains(e.getOrgId())) && !finalStrings.contains(e.getOrgId()) && !dto.getOrgAid().equals(e.getSysCreateAid())) {
                             e.setIsPermission(false);
                         } else {
                             e.setIsPermission(true);
                         }
                     });
                     listByFilters2.sort(Comparator.comparing(Course::getIsPermission).reversed());
-                } else {
-                    List<Course> collect = listByFilters2.stream().filter(e -> dto.getReadIds().contains(e.getOrgId()) || dto.getOrgAid().equals(e.getSysCreateAid()) || finalStrings.contains(e.getOrgId())).collect(Collectors.toList());
+                }else{
+                    List<Course> collect = listByFilters2.stream().filter(e ->dto.getReadIds().contains(e.getOrgId())||dto.getOrgAid().equals(e.getSysCreateAid())||finalStrings.contains(e.getOrgId())).collect(Collectors.toList());
                     List<Course> paginate = paginate(collect, pageIndex, pageSize);
                     PageList<Course> rs = new PageList<>();
                     rs.setCount(collect.size());
@@ -927,7 +920,6 @@ public class CourseServiceImpl implements ICourseService {
             for (CourseTeacher ct : full.getTeachers()) {
                 ct.setCourseId(c.getId());
                 courseTeacherDao.save(ct);
-                addBoeCourseTeacherModifyLog(ct, "M1位置讲师名修改", JSONUtil.toJsonStr(ct), null);
             }
         }
         if (full.getCrowds() != null && !full.getCrowds().isEmpty()) {
@@ -1006,7 +998,7 @@ public class CourseServiceImpl implements ICourseService {
         if (c.getVisible() == null) {
             c.setVisible(true);
         }
-        /*if (c.getTags() != null && !c.getTags().isEmpty()){
+        if (c.getTags() != null && !c.getTags().isEmpty()){
             CourseTagRelationDto courseTagRelationDto = new CourseTagRelationDto();
             courseTagRelationDto.setCourseId(c.getId());
             courseTagRelationDto.setSysType1(c.getSysType1());
@@ -1020,15 +1012,7 @@ public class CourseServiceImpl implements ICourseService {
                     courseTagService.createTag(courseTagRelationDto);
                 }
             }
-        }*/
-
-        if (!nowCourse.getSysVersion().equals(c.getSysVersion())) {
-            log.warn(" - 课程ID: {}, 期望版本: {}, 实际版本: {}",
-                    c.getId(), c.getSysVersion(), nowCourse.getSysVersion());
-            // 基本无概率同时修改同一课程 如有 以最后提交为准
-            c.setSysVersion(courseDao.getVersion(c.getId()));
         }
-        log.info("-------- 课程保存 update ------- tag = {} " , c.getTags());
         courseDao.update(c);
         c.setSysVersion(courseDao.getVersion(c.getId()));
         full.getCourse().setSysVersion(c.getSysVersion());
@@ -1041,7 +1025,6 @@ public class CourseServiceImpl implements ICourseService {
             for (CourseTeacher ct : full.getTeachers()) {
                 ct.setCourseId(c.getId());
                 courseTeacherDao.saveOrUpdate(ct);
-                addBoeCourseTeacherModifyLog(ct, "M2位置讲师名修改", JSONUtil.toJsonStr(ct), null);
             }
         }
         //先清空受众信息,受众信息如果不一样了，也要加入到日志中
@@ -1098,7 +1081,6 @@ public class CourseServiceImpl implements ICourseService {
             for (CourseTeacher ct : full.getTeachers()) {
                 ct.setCourseId(c.getId());
                 courseTeacherDao.saveOrUpdate(ct);
-                addBoeCourseTeacherModifyLog(ct, "M3位置讲师名修改", JSONUtil.toJsonStr(ct), null);
             }
         }
         //先清空受众信息,受众信息如果不一样了，也要加入到日志中
@@ -1124,16 +1106,12 @@ public class CourseServiceImpl implements ICourseService {
     public void submitAndPublish(CourseFullDto full, String aid, String aname) throws Exception {
 
         Course c = full.getCourse();//当前的课程信息
+        log.info(" 课程 c = " + c.getId());
+        log.info(" 课程 c = " + c);
         c.setPublished(true);
         c.setPublishTime(LocalDateTime.now());
-        Course nowCourse = courseDao.get(c.getId());
-        if (!nowCourse.getSysVersion().equals(c.getSysVersion())) {
-            log.warn(" - 课程ID: {}, 期望版本: {}, 实际版本: {}",
-                    c.getId(), c.getSysVersion(), nowCourse.getSysVersion());
-            // 基本无概率同时修改同一课程 如有 以最后提交为准
-            c.setSysVersion(courseDao.getVersion(c.getId()));
-        }
         courseDao.update(c);
+        log.info(" 课程 c = " + c.getId());
 
         // 兼容处理，记录下删除的关联数据
         createCourseTeacherDeletedRecord(c.getId());
@@ -1143,7 +1121,6 @@ public class CourseServiceImpl implements ICourseService {
             for (CourseTeacher ct : full.getTeachers()) {
                 ct.setCourseId(c.getId());
                 courseTeacherDao.saveOrUpdate(ct);
-                addBoeCourseTeacherModifyLog(ct, "M4位置讲师名修改", JSONUtil.toJsonStr(ct), null);
             }
         }
         //先清空受众信息,受众信息如果不一样了，也要加入到日志中
@@ -1203,7 +1180,7 @@ public class CourseServiceImpl implements ICourseService {
 
     /***
      * 发布全文索引
-     * @param
+     * @param c
      */
 //	private void fullTextPublish(Course c) {
 //		if(fullTextSearch==null) {
@@ -2046,7 +2023,108 @@ public class CourseServiceImpl implements ICourseService {
 
         return courseDao.findListByHql("Select new Course(id,studys,score) from Course where id in(?1)", ids);
     }
+    private class Result{
+        private Boolean success;
+        private Data data;
+        private class Data{
+            private List<Map<String,Object>> result;
 
+            public List<Map<String, Object>> getResult() {
+                return result;
+            }
+
+            public void setResult(List<Map<String, Object>> result) {
+                this.result = result;
+            }
+        }
+
+        public void setData(Data data) {
+            this.data = data;
+        }
+
+        public Boolean getSuccess() {
+            return success;
+        }
+
+        public void setSuccess(Boolean success) {
+            this.success = success;
+        }
+
+        public Data getData() {
+            return data;
+        }
+    }
+
+    @Override
+    public void getPhpCourseData() {
+        HttpRequest request = HttpUtil.createGet("https://u.boe.com/api/b1/new-employee/course-list");
+        HttpResponse response = request.execute();
+        String body = response.body();
+        Result result = JSON.parseObject(body,Result.class);
+        log.info("php课程数据获取成功");
+        List<Map<String,Object>> phpCourseDataList = result.getData().getResult();
+        for (Map<String, Object> phpCourseData : phpCourseDataList){
+            log.info("开始同步数据:"+phpCourseData.get("course_name"));
+        }
+        List<Map<String,Object>> phpStudyCourseList = null;
+        // 查询数据库中是否存在php课程数据
+        for (int i = 0; i < phpCourseDataList.size(); i++) {
+            // 查询php的课程数据在数据库中是否已经存在
+            String phpCourseName = (String) phpCourseDataList.get(i).get("course_name");
+            Boolean exist = isCourseName(phpCourseName,"");
+            if (!exist){
+                log.info(phpCourseName+"不存在,开始同步");
+                Course newCourse = new Course();
+                // 设置学习人数
+                int studys = Integer.parseInt(phpCourseDataList.get(i).get("learned_number").toString());
+                newCourse.setStudys(studys);
+                // 设置系统版本
+                int version = Integer.parseInt(phpCourseDataList.get(i).get("version").toString());
+                newCourse.setSysVersion(version);
+                // 设置电脑端还是手机端可见
+                int pcDevice = Integer.parseInt(phpCourseDataList.get(i).get("is_display_pc").toString());
+                int mobileDevice = Integer.parseInt(phpCourseDataList.get(i).get("is_display_mobile").toString());
+                if (pcDevice == 1 &&  mobileDevice == 1){
+                    newCourse.setDevice(3);
+                } else if (pcDevice == 0 && mobileDevice == 1) {
+                    newCourse.setDevice(2);
+                }else if(pcDevice == 1 && mobileDevice == 0){
+                    newCourse.setDevice(1);
+                }
+                // 判断是否按照顺序学习
+                int orderStudy = Integer.parseInt(phpCourseDataList.get(i).get("mod_type").toString());
+                newCourse.setOrderStudy(orderStudy == 1 ? true : false);
+                // 设置课程简介
+                String summary = (String) phpCourseDataList.get(i).get("course_desc_nohtml");
+                newCourse.setSummary(summary);
+                // 设置课程类型
+                int courseType = Integer.parseInt(phpCourseDataList.get(i).get("course_type").toString());
+                newCourse.setType(courseType == 0 ? 20 : 30);
+                // 设置学习时长
+                int courseTime = Integer.parseInt(phpCourseDataList.get(i).get("course_period").toString());
+                newCourse.setStudyTime(courseTime);
+                // 设置课程封面
+                newCourse.setCoverImg("https://u.boe.com/pc/images/bgimg/course.png");
+                newCourse.setName(phpCourseName);
+                newCourse.setStatus(5);
+                newCourse.setComments(0);
+                newCourse.setDeleted(false);
+                newCourse.setEnabled(true);
+                newCourse.setFavorites(0);
+                newCourse.setIsTop(false);
+                newCourse.setViews(0);
+                newCourse.setPraises(0);
+                newCourse.setTrampleCount(0);
+                newCourse.setShares(0);
+                newCourse.setScore(0f);
+
+                courseDao.save(newCourse);
+            }else {
+                log.info(phpCourseName+"存在");
+            }
+        }
+
+    }
     @Override
     public void deletedStudyResourceBatchByCourseIdAndType(String courseId, Integer courseType) {
         DeleteByQueryRequest request = new DeleteByQueryRequest("new_study_resource");
@@ -2081,46 +2159,4 @@ public class CourseServiceImpl implements ICourseService {
         }
     }
 
-    /**
-     * 增加boe_course_teacher的teacher_name字段被改为"BOE教师"的监控
-     */
-    private void addBoeCourseTeacherModifyLog(CourseTeacher ct, String location, String body, String remark) {
-        try {
-            if (ct == null) {
-                return;
-            }
-            if (Objects.equals(ct.getTeacherName(), "BOE教师")) {
-                modifyLogDao.insert(null, location, body, remark);
-            }
-        } catch (Exception e) {
-            log.error("创建boe_course_teacher记录失败", e);
-        }
-    }
-
-
-    @Override
-    public void saveTip(String aid) {
-        Tip item = new Tip();
-        item.setAid(aid);
-        item.setType(0);
-        item.setCreate_time(LocalDateTime.now());
-        tipDao.save(item);
-    }
-
-    @Override
-    public Boolean getCourseTip(String aid) {
-        log.info("getCourseTip aid = {} ",aid);
-        List<Tip> list = tipDao.findList(FieldFilters.eq("aid", aid));
-        log.info("getCourseTip list = {} ",list);
-        if (list != null && !list.isEmpty()){
-            return false;//已提示
-        }
-        return true; //用户需要提示
-    }
-
-    @Override
-    public void rePublish(String courseId) {
-        Course c = courseDao.get(courseId);
-        publishUtil.fullTextPublish(c);
-    }
 }

servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseTagServiceImpl.java

@@ -388,15 +388,13 @@ public class CourseTagServiceImpl implements ICourseTagService {
         filters.add(FieldFilters.eq("deleted",false));//未删除的
         query.addFilters(filters);
         List<CourseTag> courseTagList = courseTagDao.findList(query.builder());
-        if (courseTagList==null || courseTagList.isEmpty() || !courseTagList.get(0).getIsPublic()){//1.1 如果该标签不存在 或私有标签，则新建标签
+        if (courseTagList==null || courseTagList.isEmpty()){//1.1 如果该标签不存在，则新建标签
             courseTag = new CourseTag();
             courseTag.setTagName(tagName);
             courseTag.setIsPublic(false);
             courseTag.setIsHot(false);
             courseTag.setStatus(1);
             courseTag.setUseCount(1);
-            //初始给个时间， 变更公共会更新时间 关闭公共会设置null 后续不在自动变更为公共
-            courseTag.setLastSetPublicTime(LocalDateTime.now());
             courseTagDao.save(courseTag);
         }
         return courseTag;
@@ -410,13 +408,11 @@ public class CourseTagServiceImpl implements ICourseTagService {
         log.info(" --- 标签修改 --- 用户信息 userInfo = {} " , userInfo);
 
         // 获取新旧课程的标签ID列表
-        log.info(" --- 旧标签1 oldTagIds = {} " , oldCourse.getTags());
-        log.info(" --- 新修改1  newTagIds = {} " , newCourse.getTags());
         List<String> oldTagIds = getTagIdsFromCourse(oldCourse);
         List<String> newTagIds = getTagIdsFromCourse(newCourse);
-        log.info(" --- 旧标签2 oldTagIds = {} " , oldTagIds);
-        log.info(" --- 新修改2  newTagIds = {} " , newTagIds);
-        if (oldCourse == null || oldTagIds.isEmpty()) {
+        log.info(" --- 旧标签 oldTagIds = {} " , oldTagIds);
+        log.info(" --- 新修改  newTagIds = {} " , newTagIds);
+        if (oldCourse == null) {
             // 新增课程 - 处理所有新标签
             handleNewCourseTags(newCourse, newTagIds, userInfo);
         } else {
@@ -426,17 +422,6 @@ public class CourseTagServiceImpl implements ICourseTagService {
         log.info("完成课程标签更新: courseId={}", newCourse != null ? newCourse.getId() : "null");
     }
 
-    @Override
-    public List<CourseTag> getAllTags() {
-        QueryBuilder query=QueryBuilder.from(CourseTag.class);
-        List<IFieldFilter> filters = new ArrayList<>();
-        filters.add(FieldFilters.eq("deleted",false));//未删除
-        filters.add(FieldFilters.eq("status",0));//正式标签
-        query.addFilters(filters);
-        List<CourseTag> courseTagList = courseTagDao.findList(query.builder());
-        return courseTagList;
-    }
-
     /**
      * 从课程对象中提取标签ID列表
      */
@@ -589,7 +574,6 @@ public class CourseTagServiceImpl implements ICourseTagService {
         List<IFieldFilter> filters = new ArrayList<>();
         filters.add(FieldFilters.eq("courseId", Long.valueOf(courseId)));
         filters.add(FieldFilters.eq("tagId", Long.valueOf(tag.getId())));
-//        filters.add(FieldFilters.eq("deleted", false));
         query.addFilters(filters);
 
         List<CourseTagRelation> existingRelations = courseTagRelationDao.findList(query.builder());
@@ -616,12 +600,13 @@ public class CourseTagServiceImpl implements ICourseTagService {
             // 恢复已删除的关联关系
             CourseTagRelation relation = existingRelations.get(0);
             if (relation.getDeleted()) {
-                courseTagRelationDao.reTagRelDelStatus(relation.getId(),userInfo.getName());
-//                relation.setDeleted(false);
+                relation.setDeleted(false);
+
                 // 设置更新信息
-//                relation.setSysUpdateBy(userInfo.getName());
-//                relation.setSysUpdateTime(now);
-//                courseTagRelationDao.saveOrUpdate(relation);
+                relation.setSysUpdateBy(userInfo.getName());
+                relation.setSysUpdateTime(now);
+
+                courseTagRelationDao.saveOrUpdate(relation);
             }
         }
         log.debug("完成课程-标签关联关系创建: courseId={}, tagId={}", courseId, tag != null ? tag.getId() : "null");
@@ -665,7 +650,6 @@ public class CourseTagServiceImpl implements ICourseTagService {
         filters.add(FieldFilters.eq("sysType2", sysType2));
         filters.add(FieldFilters.eq("sysType3", sysType3));
         filters.add(FieldFilters.eq("tagId", tagId));
-//        filters.add(FieldFilters.eq("deleted", false));
         query.addFilters(filters);
 
         List<CourseTypeTagRelation> existingRelations = courseTypeTagRelationDao.findList(query.builder());
@@ -694,12 +678,13 @@ public class CourseTagServiceImpl implements ICourseTagService {
             // 恢复已删除的关联关系
             CourseTypeTagRelation relation = existingRelations.get(0);
             if (relation.getDeleted()) {
-                courseTagRelationDao.reTypeTagRelDelStatus(relation.getId(),userInfo.getName());
-//                relation.setDeleted(false);
-//                // 设置更新信息
-//                relation.setSysUpdateBy(userInfo.getName());
-//                relation.setSysUpdateTime(now);
-//                courseTypeTagRelationDao.saveOrUpdate(relation);
+                relation.setDeleted(false);
+
+                // 设置更新信息
+                relation.setSysUpdateBy(userInfo.getName());
+                relation.setSysUpdateTime(now);
+
+                courseTypeTagRelationDao.saveOrUpdate(relation);
             }
         }
     }
@@ -808,7 +793,7 @@ public class CourseTagServiceImpl implements ICourseTagService {
         LocalDateTime now = LocalDateTime.now();
 
         // 检查是否满足设置为公共标签的条件
-        if (activeCount >= 3 && tag.getLastSetPublicTime() != null) {
+        if (activeCount >= 3 && tag.getLastSetPublicTime() == null) {
             // 只有从未手动关闭过公共标签的才自动开启
             tag.setIsPublic(true);
             tag.setLastSetPublicTime(now);

servers/boe-server-all/src/main/java/com/xboe/module/course/vo/RePublishVo.java

@@ -1,14 +0,0 @@
-package com.xboe.module.course.vo;
-
-import lombok.Data;
-
-/**
- * @date 2025/11/17
- */
-@Data
-public class RePublishVo {
-    /**
-     * 课程id
-     * */
-    private String courseId;
-}

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

@@ -14,15 +14,12 @@ import com.boe.feign.api.infrastructure.entity.CommonSearchVo;
 import com.boe.feign.api.infrastructure.entity.Dict;
 import com.xboe.api.ThirdApi;
 import com.xboe.constants.CacheName;
-import com.xboe.module.course.entity.*;
-import com.xboe.module.course.service.ICourseTagService;
 import com.xboe.module.course.vo.TeacherVo;
 import com.xboe.module.usergroup.service.IUserGroupService;
 import com.xboe.school.study.dao.StudyCourseDao;
 import com.xboe.school.vo.StudyTimeVo;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -39,6 +36,11 @@ import com.xboe.common.utils.StringUtil;
 import com.xboe.core.CurrentUser;
 import com.xboe.core.JsonResponse;
 import com.xboe.core.api.ApiBaseController;
+import com.xboe.module.course.entity.Course;
+import com.xboe.module.course.entity.CourseContent;
+import com.xboe.module.course.entity.CourseCrowd;
+import com.xboe.module.course.entity.CourseSection;
+import com.xboe.module.course.entity.CourseTeacher;
 import com.xboe.module.course.service.ICourseContentService;
 import com.xboe.module.course.service.ICourseSectionService;
 import com.xboe.module.course.service.ICourseService;
@@ -100,8 +102,6 @@ public class StudyCourseApi extends ApiBaseController{
 
 	@Autowired
 	StringRedisTemplate redisTemplate;
-	@Resource
-	private ICourseTagService courseTagService;
 
 	/**
 	 * 用于查询课程的学习记录
@@ -169,14 +169,7 @@ public class StudyCourseApi extends ApiBaseController{
 		if(course==null || course.getDeleted()){
 			return badRequest("课程不存在或已被删除");
 		}
-		Course course1 = new Course();
-		BeanUtils.copyProperties(course,course1);
-		if (StringUtils.isNotBlank(course.getTags()) && course.getTags().matches("[0-9,]+")) {
-			List<CourseTag> tagList = courseTagService.getTagsByIds(course.getTags());
-			String tags = tagList.stream().map(CourseTag::getTagName).collect(Collectors.joining(","));
-			course1.setTags(tags);
-		}
-		rs.put("course",course1);
+		rs.put("course",course);
 		
 		List<CourseCrowd> courseCrowdList = courseService.findCrowdByCourseId(cid);
 		if(crowd!=null && crowd) {
@@ -363,8 +356,7 @@ 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/api/StudySignupRpcController.java

@@ -4,8 +4,6 @@ import com.xboe.common.beans.IdName;
 import com.xboe.common.beans.KeyValue;
 import com.xboe.core.JsonResponse;
 import com.xboe.core.api.ApiBaseController;
-import com.xboe.module.course.service.ICourseService;
-import com.xboe.module.course.vo.RePublishVo;
 import com.xboe.school.study.dto.BatchSignup;
 import com.xboe.school.study.entity.StudySignup;
 import com.xboe.school.study.service.IStudySignupService;
@@ -34,8 +32,7 @@ public class StudySignupRpcController extends ApiBaseController {
 
     @Resource
     IStudySignupService signupService;
-    @Resource
-    ICourseService courseService;
+
     /**
      * 批量添加学员
      *
@@ -109,18 +106,4 @@ public class StudySignupRpcController extends ApiBaseController {
         return StringUtils.isBlank(string);
     }
 
-    @PostMapping("/rePublish")
-    public JsonResponse<Boolean> rePublish(@RequestBody RePublishVo vo) {
-        if(vo==null || StringUtils.isBlank(vo.getCourseId())) {
-            return error("未指定id");
-        }
-        try {
-            courseService.rePublish(vo.getCourseId());
-        } catch (Exception e) {
-            log.error("解绑重新发布", e);
-            return error("解绑重新发布失败，请与管理员联系", e.getMessage());
-        }
-        return success(true);
-    }
-
 }

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

@@ -4,11 +4,8 @@ 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;
@@ -35,8 +32,7 @@ public class StudyCourseDao extends BaseDao<StudyCourse> {
 	StudyCourseItemDao scItemDao;
 	@Autowired
 	StringRedisTemplate redisTemplate;
-	@Autowired
-	private ThreadLogDao threadLogDao;
+
 
 	@Resource
 	private ThirdApi thirdApi;
@@ -49,8 +45,6 @@ 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 ;
 		}
 
@@ -79,8 +73,6 @@ 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),
@@ -93,41 +85,6 @@ 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,13 +10,11 @@ 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;
@@ -54,8 +52,6 @@ public class StudyServiceImpl implements IStudyService{
 	@Autowired
 	StringRedisTemplate redisTemplate;
 
-	@Autowired
-	private ThreadLogDao threadLogDao;
 
 	@Override
 	public StudyCourseItem checkHas(String studyId,String contentId) {
@@ -86,8 +82,6 @@ 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) {
@@ -500,52 +494,4 @@ 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.10.74:8848
+        server-addr: 192.168.0.253:8848
       config:
-        server-addr: 192.168.10.74:8848
+        server-addr: 192.168.0.253:8848
   redis:
-    database: 2
-    host: 39.104.123.58
-    password: Ebiz2020
-    port: 6378
+    database: 1
+    host: 192.168.0.253
+    password: boe@123
+    port: 6379
   jpa:
     hibernate:
       ddl-auto: none
   datasource:
     driverClassName: com.mysql.jdbc.Driver
-    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
+    url: jdbc:mysql://192.168.0.253:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+    username: root
+    password: boe#1234A
     type: com.zaxxer.hikari.HikariDataSource
     hikari:
       auto-commit: true
@@ -35,12 +35,6 @@ 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:
@@ -113,7 +107,7 @@ aop-log-record:
   #不进行拦截的包或者类
   excludeClassNames:
   activemq:
-    broker-url: tcp://192.168.10.74:61616
+    broker-url: tcp://192.168.0.253:61616
     user: admin
     password: admin
   elasticsearch:

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

@@ -40,12 +40,6 @@ 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.232.28.76:8848,10.232.28.83:8848,10.232.28.77:8848
+        server-addr: 10.251.113.100:8848
       config:
-        server-addr: 10.232.28.76:8848,10.232.28.83:8848,10.232.28.77:8848
+        server-addr: 10.251.113.100:8848
   redis:
     database: 1
-    host: 10.232.27.44
-    password: j2ZsxUyl
+    host: 10.251.88.213
+    password: qwert!W588
     port: 6379
   jpa:
     hibernate:
       ddl-auto: none
   datasource:
     driverClassName: com.mysql.jdbc.Driver
-    url: jdbc:mysql://10.232.27.47:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+    url: jdbc:mysql://10.251.88.216:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
     username: admin
     password: boeRds01
     type: com.zaxxer.hikari.HikariDataSource
@@ -33,12 +33,6 @@ 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:
@@ -67,7 +61,7 @@ xboe:
       url: https://u.boe.com/userbasic
   elasticsearch:
     server:
-      ip: 10.232.27.40
+      ip: 10.251.88.218
       port: 9200
       user:
       password:
@@ -85,15 +79,13 @@ xboe:
       default: https://u.boe.com/pc/images/bgimg/course.png
   case:
     ai:
-      base-url: https://gateway-internal.boe.com
-#      base-url: https://gateway-pro.boe.com
-      app-key: 3edef300b25642da949ccddf58441a0f
-      secret-key: 43bc8003a811a7f9c89cbecbfe4bbb22
+      base-url: http://10.10.181.114:30003
+      app-key: 6e9be45319184ac793aa127c362b0f0b
+      secret-key: db4d24279e3d6dbf1524af42cd0bedd2
       ai-api-code: 30800
       chat-api-code: 32065
-      case-knowledge-id: f062c9e4-c6ad-437b-b5ca-bbb9fed9b442
-      caseDetailUrlBase: https://u.boe.com/pc/case/detail?id=
-      file-upload-callback-url: https://u.boe.com/systemapi/xboe/m/boe/caseDocumentLog/uploadCallback
+      case-knowledge-id: de2e006e-82fb-4ace-8813-f25c316be4ff
+      file-upload-callback-url: http://10.251.113.95:9090/xboe/m/boe/caseDocumentLog/uploadCallback
       use-white-list: true
       white-user-code-list:
         - "00004409"
@@ -116,210 +108,10 @@ xboe:
         - "00005011"
         - "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
         - lijian-hq@boe.com.cn
-      ai-chat-root-path: /home/www/elearning/upload/ai/chat
 xxl:
   job:
     accessToken: 65ddc683-22f5-83b4-de3a-3c97a0a29af0
@@ -338,9 +130,9 @@ aop-log-record:
   #不进行拦截的包或者类
   excludeClassNames:
   activemq:
-    broker-url: tcp://10.232.28.73:61616
+    broker-url: tcp://10.251.113.100:61616
     user: admin
     password: admin
   elasticsearch:
-    host: 10.232.27.40
+    host: 10.251.88.218
     port: 9200

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

@@ -40,12 +40,6 @@ 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:
@@ -125,7 +119,6 @@ xboe:
       ai-api-code: 30800
       chat-api-code: 32065
       case-knowledge-id: de2e006e-82fb-4ace-8813-f25c316be4ff
-      caseDetailUrlBase: https://u-pre.boe.com/pc/case/detail?id=
       file-upload-callback-url: http://10.251.186.27:9090/xboe/m/boe/caseDocumentLog/uploadCallback
       use-white-list: true
       white-user-code-list:
@@ -151,7 +144,6 @@ xboe:
         - "11339772"
       alert-email-recipients:
         - chengmeng@boe.com.cn
-      ai-chat-root-path: /home/www/elearning/upload/ai/chat
 jasypt:
   encryptor:
     algorithm: PBEWithMD5AndDES

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

@@ -50,9 +50,6 @@ 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

@@ -1,82 +0,0 @@
-{
-  "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,42 +31,26 @@
         </encoder>
     </appender>
 
-    <appender name="caseAiChat"
-              class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <!-- 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>
         <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>
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>ERROR</level>
+        </filter>
     </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,26 +47,10 @@
         </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>

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

@@ -2,8 +2,8 @@
 spring:
   redis:
     database: 1
-    host: 10.232.27.44
-    password: j2ZsxUyl
+    host: 10.251.88.213
+    password: qwert!W588
     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.232.27.47:3306/boe_basic?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+      jdbc-url: jdbc:mysql://10.251.88.216: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.232.27.47:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+      jdbc-url: jdbc:mysql://10.251.88.216:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
       username: admin
       password: boeRds01