Revert "标签关联课程下面展示标签"

This reverts commit fa9d80d4a5.

servers/boe-server-all/pom.xml

@@ -171,11 +171,6 @@
             <artifactId>javax.mail-api</artifactId>
             <version>1.5.6</version>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>com.sun.mail</groupId>-->
-<!--            <artifactId>javax.mail</artifactId>-->
-<!--            <version>1.5.6</version>-->
-<!--        </dependency>-->
 
         <dependency>
             <groupId>org.apache.commons</groupId>

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

@@ -45,7 +45,10 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
 import java.util.concurrent.ForkJoinPool;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
@@ -404,20 +407,4 @@ public class ThirdApi {
                         .body()).orElseThrow(() -> new RuntimeException("token校验失败"));
         log.info("-------delOnLineById = " + resp);
     }
-
-    //获取字典信息
-    public List<Dict> getDictItems(CommonSearchVo searcher) {
-        try {
-            List<Dict> dictList = dictRemoteClient.getList(searcher);
-            if(!Objects.isNull(dictList) && dictList.size() > 0){
-//               List<String> dicts =  dictList.stream().map(Dict::getValue).collect(Collectors.toList());
-               return dictList;
-            }else {
-               return null;
-            }
-        } catch (Exception e) {
-            log.error("-------获取字典信息 = " + e.getMessage());
-        }
-        return null;
-    }
 }

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

@@ -1,36 +0,0 @@
-package com.xboe.config;
-
-import com.xboe.module.boecase.service.IElasticSearchIndexService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.context.event.ApplicationReadyEvent;
-import org.springframework.context.event.EventListener;
-import org.springframework.stereotype.Component;
-
-/**
- * ElasticSearch索引初始化器
- * 在Spring Boot启动完成并监听到配置文件加载完毕后，检查并创建所需的ES索引
- * 
- * @author AI Assistant
- */
-@Slf4j
-@Component
-public class ElasticSearchIndexInitializer {
-    
-    @Autowired
-    private IElasticSearchIndexService elasticSearchIndexService;
-    
-    /**
-     * 监听Spring Boot应用启动完成事件
-     * ApplicationReadyEvent在应用启动完成、所有配置加载完毕后触发
-     */
-    @EventListener(ApplicationReadyEvent.class)
-    public void initializeElasticSearchIndices() {
-        if (elasticSearchIndexService.checkIndexExists()) {
-            log.info("ElasticSearch索引 ai_chat_messages 已存在");
-        } else {
-            log.info("ElasticSearch索引 ai_chat_messages 不存在，开始创建...");
-            elasticSearchIndexService.createIndex();
-        }
-    }
-}

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

@@ -1,72 +0,0 @@
-package com.xboe.config;
-
-import lombok.extern.slf4j.Slf4j;
-import okhttp3.Dispatcher;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
-
-import java.util.concurrent.ThreadPoolExecutor;
-
-/**
- * 线程池配置类
- */
-@Configuration
-@Slf4j
-public class ThreadPoolConfig {
-
-    /**
-     * 执行AI文档接口的的线程池
-     * 策略：单线程等待队列
-     */
-    @Bean(name = "aiDocExecutor")
-    public ThreadPoolTaskExecutor aiDocExecutor() {
-        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
-        // 设置核心线程数
-        int corePoolSize = Runtime.getRuntime().availableProcessors();
-        executor.setCorePoolSize(Math.max(4, corePoolSize));
-        // 设置最大线程数
-        executor.setMaxPoolSize(Math.max(16, corePoolSize * 2));
-        // 设置队列容量（确保任务排队）
-        executor.setQueueCapacity(100);
-        // keepalive
-        executor.setKeepAliveSeconds(30);
-        executor.setWaitForTasksToCompleteOnShutdown(true);
-        executor.setAwaitTerminationSeconds(30);
-        // 设置线程名称前缀
-        executor.setThreadNamePrefix("ai_doc_task-");
-        // 设置拒绝策略（当队列满时，由调用线程处理该任务）
-        executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
-        // 初始化线程池
-        executor.initialize();
-        log.info("AI文档线程池初始化完成 - 核心线程: {}, 最大线程: {}, 队列容量: {}",
-                executor.getCorePoolSize(),
-                executor.getMaxPoolSize(),
-                executor.getQueueCapacity());
-        return executor;
-    }
-
-    /**
-     * event-stream线程池
-     * @return
-     */
-    @Bean(name = "eventStreamExecutor")
-    public ThreadPoolTaskExecutor eventStreamExecutor() {
-        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
-        executor.setCorePoolSize(10);
-        executor.setMaxPoolSize(500);
-        executor.setQueueCapacity(10);
-        executor.setThreadNamePrefix("event-stream-");
-        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

@@ -1,10 +0,0 @@
-package com.xboe.constants;
-
-public class CaseAiConstants {
-
-    public static final String CASE_AI_INDEX_NAME = "ai_chat_messages";
-
-    public static final String CASE_DOC_UPLOAD_INTERFACE_NAME = "文档上传";
-
-    public static final String CASE_DOC_DELETE_INTERFACE_NAME = "文档删除";
-}

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

@@ -1,41 +0,0 @@
-package com.xboe.enums;
-
-public enum CaseAiChatStatusEnum {
-
-    REFERS(0, "引用文档"),
-
-    CHAT(1, "聊天中"),
-
-    CHAT_COMPLETED(2, "聊天完成"),
-
-    SUGGESTIONS(3, "建议"),
-
-    API_COMPLETED(4, "接口完成"),
-    ;
-
-    private final int code;
-
-    private final String label;
-
-    CaseAiChatStatusEnum(int code, String label) {
-        this.code = code;
-        this.label = label;
-    }
-
-    public static CaseAiChatStatusEnum getByCode(int code) {
-        for (CaseAiChatStatusEnum value : values()) {
-            if (value.code == code) {
-                return value;
-            }
-        }
-        return API_COMPLETED;
-    }
-
-    public int getCode() {
-        return code;
-    }
-
-    public String getLabel() {
-        return label;
-    }
-}

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

@@ -1,50 +0,0 @@
-package com.xboe.enums;
-
-/**
- * AI调用日志接口运行状态枚举
- */
-public enum CaseDocumentLogRunStatusEnum {
-
-    RUNNING(0, "运行中"),
-    COMPLETED(1, "运行完成");
-
-    private final Integer code;
-    private final String desc;
-
-    CaseDocumentLogRunStatusEnum(Integer code, String desc) {
-        this.code = code;
-        this.desc = desc;
-    }
-
-    public Integer getCode() {
-        return code;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-
-    /**
-     * 根据code获取描述
-     */
-    public static String getDescByCode(Integer code) {
-        for (CaseDocumentLogRunStatusEnum statusEnum : values()) {
-            if (statusEnum.getCode().equals(code)) {
-                return statusEnum.getDesc();
-            }
-        }
-        return "";
-    }
-
-    /**
-     * 根据code获取枚举
-     */
-    public static CaseDocumentLogRunStatusEnum getByCode(Integer code) {
-        for (CaseDocumentLogRunStatusEnum statusEnum : values()) {
-            if (statusEnum.getCode().equals(code)) {
-                return statusEnum;
-            }
-        }
-        return null;
-    }
-}

servers/boe-server-all/src/main/java/com/xboe/module/assistance/service/ISmtpEmailService.java

@@ -1,17 +0,0 @@
-package com.xboe.module.assistance.service;
-
-/**
- * SMTP邮件服务接口
- */
-public interface ISmtpEmailService {
-    
-    /**
-     * 使用SMTP直接发送邮件
-     * @param to 收件人邮箱
-     * @param subject 邮件主题
-     * @param htmlMsg 邮件内容（HTML格式）
-     * @param from 发件人邮箱
-     * @throws Exception 发送异常
-     */
-    void sendMailBySmtp(String to, String subject, String htmlMsg, String from) throws Exception;
-}

servers/boe-server-all/src/main/java/com/xboe/module/assistance/service/impl/SmtpEmailServiceImpl.java

@@ -1,101 +0,0 @@
-package com.xboe.module.assistance.service.impl;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Properties;
-
-import javax.mail.Authenticator;
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.PasswordAuthentication;
-import javax.mail.Session;
-import javax.mail.Transport;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeMessage;
-
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-
-import com.xboe.module.assistance.service.ISmtpEmailService;
-
-@Service
-@Slf4j
-public class SmtpEmailServiceImpl implements ISmtpEmailService {
-
-    //region 默认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_PORT = "465";
-    private static final String SMTP_ENCRYPTION = "ssl";
-    //endregion
-
-    @Override
-    public void sendMailBySmtp(String to, String subject, String htmlMsg, String from) throws Exception {
-        // 检查参数
-        if (StringUtils.isBlank(to)) {
-            throw new Exception("发送邮件失败，未指定收件人");
-        }
-        
-        if (StringUtils.isBlank(subject)) {
-            throw new Exception("发送邮件失败，未指定邮件主题");
-        }
-        
-        if (StringUtils.isBlank(htmlMsg)) {
-            throw new Exception("发送邮件失败，未指定邮件内容");
-        }
-        // 初始化配置项
-
-        // 设置SMTP属性
-        Properties props = new Properties();
-        props.put("mail.smtp.host", SMTP_HOST);
-        props.put("mail.smtp.port", SMTP_PORT);
-        props.put("mail.smtp.auth", "true");
-
-        if ("ssl".equalsIgnoreCase(SMTP_ENCRYPTION)) {
-            props.put("mail.smtp.ssl.enable", "true");
-            props.put("mail.smtp.ssl.trust", SMTP_HOST);
-//            props.put("mail.smtp.ssl.protocols", "TLSv1.2");
-        } else if ("tls".equalsIgnoreCase(SMTP_ENCRYPTION)) {
-            props.put("mail.smtp.starttls.enable", "true");
-        }
-
-        Authenticator authenticator = new Authenticator() {
-            @Override
-            protected PasswordAuthentication getPasswordAuthentication() {
-                return new PasswordAuthentication(SMTP_USERNAME, SMTP_PASSWORD);
-            }
-        };
-        // 创建会话
-        Session session = Session.getInstance(props, authenticator);
-        session.setDebug(true); // 查看调试信息
-
-        try {
-            // 创建邮件消息
-            Message message = new MimeMessage(session);
-            
-            // 设置发件人
-            message.setFrom(new InternetAddress(SMTP_USERNAME));
-            
-            // 设置收件人
-            message.setRecipients(Message.RecipientType.TO, InternetAddress.parse(to));
-            
-            // 设置邮件主题
-            message.setSubject(subject);
-            
-            // 设置邮件内容
-            message.setContent(htmlMsg, "text/html;charset=UTF-8");
-
-            // 发送日期
-            message.setSentDate(new Date());
-            
-            // 发送邮件
-            log.info("发送邮件. 发件人: {}, 收件人: {}, 标题: {}", SMTP_USERNAME, to, subject);
-            Transport.send(message);
-            
-        } catch (MessagingException e) {
-            throw new Exception("发送邮件失败", e);
-        }
-    }
-}

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

@@ -3,10 +3,7 @@ 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.entity.AiChatConversationData;
 import com.xboe.module.boecase.service.ICaseAiChatService;
-import com.xboe.module.boecase.service.ICaseAiPermissionService;
-import com.xboe.module.boecase.service.IElasticSearchIndexService;
 import com.xboe.module.boecase.vo.CaseAiMessageVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,14 +13,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.LocalDateTime;
 import java.util.List;
 
 /**
  * AI对话管理API
  */
-@Slf4j(topic = "caseAiChatLogger")
+@Slf4j
 @RestController
 @RequestMapping(value = "/xboe/m/boe/case/ai")
 public class CaseAiChatApi extends ApiBaseController {
@@ -36,12 +31,6 @@ public class CaseAiChatApi extends ApiBaseController {
      */
     @Autowired
     private ICaseAiChatService caseAiChatService;
-    
-    @Autowired
-    private ICaseAiPermissionService caseAiPermissionService;
-
-    @Autowired
-    private IElasticSearchIndexService elasticSearchIndexService;
 
     /**
      * 聊天
@@ -59,26 +48,6 @@ public class CaseAiChatApi extends ApiBaseController {
         return caseAiChatService.chat(caseAiChatDto, getCurrent());
     }
     
-    /**
-     * 停止当前聊天输出
-     * @param conversationId 会话ID
-     * @return 是否成功停止
-     */
-    @PostMapping("/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());
-        }
-    }
-    
     /**
      * 根据conversationId查看会话内消息记录
      * @param conversationId 会话ID
@@ -94,73 +63,4 @@ public class CaseAiChatApi extends ApiBaseController {
             return error("查询失败", e.getMessage());
         }
     }
-    
-    /**
-     * 导出会话记录为Excel
-     * @param startTime 开始时间
-     * @param endTime 结束时间
-     * @param response HTTP响应
-     */
-    @GetMapping("/export-conversations")
-    public void downloadConversationExcel(@RequestParam String startTime, 
-                                          @RequestParam String endTime, 
-                                          HttpServletResponse response) {
-        LocalDate startDate = LocalDate.parse(startTime);
-        LocalDate endDate = LocalDate.parse(endTime);
-        caseAiChatService.getConversationExcel(startDate.atStartOfDay(), endDate.atTime(23, 59, 59), response);
-    }
-    
-    /**
-     * 判断当前登录用户是否显示"案例专家"功能入口
-     * @return 是否显示功能入口
-     */
-    @GetMapping("/show-entrance")
-    public JsonResponse<Boolean> showCaseAiEntrance() {
-        try {
-            String currentUserCode = getCurrent().getCode();
-            boolean shouldShow = caseAiPermissionService.shouldShowCaseAiEntrance(currentUserCode);
-//            return success(shouldShow);
-            JsonResponse<Boolean> result = success(shouldShow);
-            result.setMessage(currentUserCode);
-            return result;
-        } catch (Exception e) {
-            log.error("判断案例专家功能入口显示权限异常", e);
-            return error("判断失败", e.getMessage());
-        }
-    }
-
-    /**
-     * 手动刷新索引
-     * @return
-     */
-    @PostMapping("/index/refresh")
-    public JsonResponse<String> deleteAndCreateEsIndex() {
-        if (elasticSearchIndexService.checkIndexExists()) {
-            boolean deleteResult = elasticSearchIndexService.deleteIndex();
-            if (deleteResult) {
-                elasticSearchIndexService.createIndex();
-                return success("刷新成功");
-            }
-        } else {
-            elasticSearchIndexService.createIndex();
-        }
-        return error("刷新失败");
-    }
-
-    @PostMapping("/es/create")
-    public JsonResponse<String> createNewConversation(@RequestBody CaseAiMessageVo caseAiMessageVo,
-                                                      @RequestParam String conversationId,
-                                                      @RequestParam String userId) {
-        AiChatConversationData aiChatConversationData = new AiChatConversationData();
-        aiChatConversationData.setConversationId(conversationId);
-        aiChatConversationData.setQuery(caseAiMessageVo.getQuery());
-        aiChatConversationData.appendAnswer(caseAiMessageVo.getAnswer());
-        aiChatConversationData.setCaseRefers(caseAiMessageVo.getCaseRefer());
-        aiChatConversationData.setSuggestions(caseAiMessageVo.getSuggestions());
-        aiChatConversationData.setUserId(userId);
-        if (elasticSearchIndexService.createData(aiChatConversationData)) {
-            return success("创建成功");
-        }
-        return error("创建失败");
-    }
-}
+}

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

@@ -7,12 +7,6 @@ import com.xboe.core.log.AutoLog;
 import com.xboe.module.boecase.dto.CaseDocumentLogQueryDto;
 import com.xboe.module.boecase.service.ICaseDocumentLogService;
 import com.xboe.module.boecase.service.ICaseKnowledgeService;
-import com.xboe.module.boecase.service.ICasesService;
-import com.xboe.module.boecase.entity.Cases;
-import com.xboe.module.boecase.entity.CaseDocumentLog;
-import com.xboe.common.utils.IDGenerator;
-import com.xboe.common.utils.StringUtil;
-import java.time.LocalDateTime;
 import com.xboe.module.boecase.vo.CaseDocumentLogVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
@@ -33,9 +27,6 @@ public class CaseDocumentLogApi extends ApiBaseController {
     @Resource
     private ICaseKnowledgeService caseKnowledgeService;
 
-    @Resource
-    private ICasesService casesService;
-
     /**
      * AI调用日志分页查询
      *
@@ -92,106 +83,20 @@ public class CaseDocumentLogApi extends ApiBaseController {
             log.error("AI调用重试失败", e);
             return error("重试失败", e.getMessage());
         }
-        // 先走挡板
-//        return success(true);
     }
 
     /**
-     * 根据案例ID上传案例文档到知识库
-     *
-     * @param request 上传请求参数
-     * @return 上传结果
+     * 重试请求参数
      */
-    @PostMapping("/uploadCaseByID")
-    @AutoLog(module = "案例文档管理", action = "根据案例ID上传文档", info = "根据案例ID查询案例信息并上传文档到知识库")
-    public JsonResponse<Boolean> uploadCaseById(@RequestBody UploadCaseRequest request) {
-        try {
-            String caseId = request.getCaseId();
-            if (StringUtil.isBlank(caseId)) {
-                return badRequest("案例ID不能为空");
-            }
-            
-            // 查询案例信息
-            Cases caseInfo = casesService.selectById(caseId, false);
-            if (caseInfo == null || caseInfo.getDeleted()) {
-                return badRequest("案例不存在或已删除");
-            }
-            
-            log.info("开始上传案例文档到知识库，案例ID: {}, 案例标题: {}", caseId, caseInfo.getTitle());
-            
-            // 调用ICaseKnowledgeService的uploadCaseDocument方法
-            boolean result = caseKnowledgeService.uploadCaseDocument(caseId);
-            
-            if (result) {
-                log.info("案例文档上传成功，案例ID: {}", caseId);
-                return success(result, "案例文档上传成功");
-            } else {
-                log.warn("案例文档上传失败，案例ID: {}", caseId);
-                return success(result, "案例文档上传失败");
-            }
-            
-        } catch (Exception e) {
-            log.error("根据案例ID上传文档失败", e);
-            return error("上传失败", e.getMessage());
+    public static class RetryRequest {
+        private String logId;
+
+        public String getLogId() {
+            return logId;
         }
-    }
 
-    /**
-     * 直接创建CaseDocumentLog数据
-     *
-     * @param logData 日志数据
-     * @return 创建结果
-     */
-    @PostMapping("/createLog")
-    @AutoLog(module = "案例文档日志", action = "创建日志记录", info = "直接创建一条CaseDocumentLog数据")
-    public JsonResponse<String> createLog(@RequestBody CaseDocumentLog logData) {
-        try {
-            // 参数校验
-            if (StringUtil.isBlank(logData.getCaseId())) {
-                return badRequest("案例ID不能为空");
-            }
-            if (StringUtil.isBlank(logData.getOptType())) {
-                return badRequest("操作类型不能为空");
-            }
-            
-            // 设置必要的默认值
-            if (StringUtil.isBlank(logData.getId())) {
-                logData.setId(IDGenerator.generate());
-            }
-            if (logData.getOptTime() == null) {
-                logData.setOptTime(LocalDateTime.now());
-            }
-            if (logData.getOptStatus() == null) {
-                logData.setOptStatus(0); // 默认为调用中
-            }
-            if (logData.getDeleted() == null) {
-                logData.setDeleted(false);
-            }
-            
-            // 如果提供了案例ID但没有案例标题，尝试查询案例信息补充标题
-            if (StringUtil.isBlank(logData.getCaseTitle()) && StringUtil.isNotBlank(logData.getCaseId())) {
-                try {
-                    Cases caseInfo = casesService.selectById(logData.getCaseId(), false);
-                    if (caseInfo != null) {
-                        logData.setCaseTitle(caseInfo.getTitle());
-                    }
-                } catch (Exception e) {
-                    log.warn("查询案例标题失败，案例ID: {}", logData.getCaseId(), e);
-                }
-            }
-            
-            log.info("创建CaseDocumentLog记录，案例ID: {}, 操作类型: {}", 
-                    logData.getCaseId(), logData.getOptType());
-            
-            // 保存日志记录
-            caseDocumentLogService.save(logData);
-            
-            log.info("CaseDocumentLog记录创建成功，日志ID: {}", logData.getId());
-            return success(logData.getId(), "日志记录创建成功");
-            
-        } catch (Exception e) {
-            log.error("创建CaseDocumentLog记录失败", e);
-            return error("创建失败", e.getMessage());
+        public void setLogId(String logId) {
+            this.logId = logId;
         }
     }
 
@@ -298,34 +203,4 @@ public class CaseDocumentLogApi extends ApiBaseController {
         }
     }
 
-    /**
-     * 上传案例请求参数
-     */
-    public static class UploadCaseRequest {
-        private String caseId;
-
-        public String getCaseId() {
-            return caseId;
-        }
-
-        public void setCaseId(String caseId) {
-            this.caseId = caseId;
-        }
-    }
-
-    /**
-     * 重试请求参数
-     */
-    public static class RetryRequest {
-        private String logId;
-
-        public String getLogId() {
-            return logId;
-        }
-
-        public void setLogId(String logId) {
-            this.logId = logId;
-        }
-    }
-
 }

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

@@ -1,33 +0,0 @@
-package com.xboe.module.boecase.api;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-/**
- * 案例上传任务API
- */
-@Slf4j
-@RestController
-@RequestMapping("/xboe/m/boe/caseUpload")
-public class CaseUploadTaskApi {
-
-    @Autowired
-    private StringRedisTemplate stringRedisTemplate;
-
-    private static final String CASE_UPLOAD_LAST_ID_KEY = "case:upload:last:id";
-
-    /**
-     * 清除处理位置标记，使下次任务从头开始执行
-     */
-    @PostMapping("/reset")
-    public void resetLastProcessedId() {
-        stringRedisTemplate.delete(CASE_UPLOAD_LAST_ID_KEY);
-        log.info("已清除上次处理位置标记");
-    }
-}

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

@@ -1,77 +0,0 @@
-package com.xboe.module.boecase.async;
-
-import com.xboe.enums.CaseDocumentLogOptTypeEnum;
-import com.xboe.module.boecase.entity.Cases;
-import com.xboe.module.boecase.service.ICaseKnowledgeService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
-import org.springframework.stereotype.Component;
-
-import java.util.concurrent.atomic.AtomicInteger;
-
-@Component
-@Slf4j
-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;
-
-    @Autowired
-    private ICaseKnowledgeService caseKnowledgeService;
-
-    public void process(CaseDocumentLogOptTypeEnum optTypeEnum, Cases... caseList) {
-        for (Cases cases : caseList) {
-            // 控制并发数量
-            while (currentTaskCount.get() >= 5) {
-                try {
-                    Thread.sleep(100);
-                } catch (InterruptedException e) {
-                    Thread.currentThread().interrupt();
-                    break;
-                }
-            }
-
-            currentTaskCount.incrementAndGet();
-
-            aiDocExecutor.submit(() -> {
-                try {
-                    // 限流
-                    rateLimiter.acquire();
-                    processCases(cases, optTypeEnum);
-                } finally {
-                    currentTaskCount.decrementAndGet();
-                }
-            });
-        }
-    }
-
-    private void processCases(Cases cases, CaseDocumentLogOptTypeEnum optTypeEnum) {
-        try {
-            switch (optTypeEnum) {
-                case UPDATE:
-                    caseKnowledgeService.updateCaseDocument(cases);
-                    break;
-                case DELETE:
-                    caseKnowledgeService.deleteCaseDocument(cases);
-                    break;
-                case CREATE:
-                default:
-                    caseKnowledgeService.uploadCaseDocument(cases);
-                    break;
-            }
-            log.info("处理案例成功，caseId: {}, 操作类型: {}", cases.getId(), optTypeEnum.getDesc());
-        } catch (Exception e) {
-            log.error("处理案例失败，caseId: {}, 操作类型: {}", cases.getId(), optTypeEnum.getDesc(), e);
-        }
-    }
-}

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/dao/CaseAiConversationsDao.java

@@ -18,7 +18,7 @@ public class CaseAiConversationsDao extends BaseDao<CaseAiConversations> {
      */
     public String findAiConversationIdById(String conversationId) {
         CaseAiConversations conversation = this.getGenericDao().findOne(CaseAiConversations.class, 
-            FieldFilters.eq("ai_conversation_id", conversationId));
-        return conversation != null ? conversation.getAiConversationId() : conversationId;
+            FieldFilters.eq("id", conversationId));
+        return conversation != null ? conversation.getAiConversationId() : null;
     }
 }

servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CaseDocumentLogDao.java

@@ -1,7 +1,6 @@
 package com.xboe.module.boecase.dao;
 
 import com.xboe.core.orm.BaseDao;
-import com.xboe.core.orm.FieldFilters;
 import com.xboe.module.boecase.entity.CaseDocumentLog;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Repository;

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

@@ -18,10 +18,4 @@ public class CaseAiChatDto {
      * 提问内容
      */
     private String query;
-
-    /**
-     * 是否开启思考
-     * 0-否 1-是
-     */
-    private Integer enableThinking;
 }

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

@@ -1,115 +0,0 @@
-package com.xboe.module.boecase.entity;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.xboe.module.boecase.vo.CaseReferVo;
-import lombok.Data;
-import lombok.extern.slf4j.Slf4j;
-
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * AI聊天会话数据实体
- * 纯数据容器，不与数据库交互
- * 
- * @author AI Assistant
- */
-@Data
-@Slf4j
-public class AiChatConversationData {
-
-    /**
-     * 会话ID
-     */
-    private String conversationId;
-
-    /**
-     * 用户提问内容
-     */
-    private String query;
-
-    /**
-     * AI回答内容（使用StringBuilder收集流式数据）
-     */
-    private StringBuilder answer = new StringBuilder();
-
-    /**
-     * 案例引用列表
-     */
-    private List<CaseReferVo> caseRefers = new ArrayList<>();
-
-    /**
-     * 建议列表
-     */
-    private List<String> suggestions = new ArrayList<>();
-
-    /**
-     * 用户ID
-     */
-    private String userId;
-
-    /**
-     * 用户名称
-     */
-    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();
-    }
-
-    // ================== 便捷方法 ==================
-
-    /**
-     * 获取回答内容的字符串形式
-     */
-    public String getAnswerAsString() {
-        return this.answer.toString();
-    }
-
-    /**
-     * 追加回答内容
-     */
-    public void appendAnswer(String content) {
-        if (content != null) {
-            this.answer.append(content);
-        }
-    }
-
-    /**
-     * 添加案例引用
-     */
-    public void addCaseRefer(CaseReferVo caseRefer) {
-        if (caseRefer != null) {
-            this.caseRefers.add(caseRefer);
-        }
-    }
-
-    /**
-     * 添加建议
-     */
-    public void addSuggestion(String suggestion) {
-        if (suggestion != null && !suggestion.trim().isEmpty()) {
-            this.suggestions.add(suggestion);
-        }
-    }
-}

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

@@ -67,13 +67,6 @@ public class CaseDocumentLog extends BaseEntity {
     @Column(name = "opt_time")
     private LocalDateTime optTime;
 
-    /**
-     * 接口运行状态
-     * 0-运行中, 1-运行完毕
-     */
-    @Column(name = "run_status")
-    private Integer runStatus;
-
     /**
      * 接口调用状态
      * 0-调用中, 1-调用成功, 2-调用失败

servers/boe-server-all/src/main/java/com/xboe/module/boecase/properties/CaseAiProperties.java

@@ -3,8 +3,6 @@ package com.xboe.module.boecase.properties;
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
-import java.util.List;
-
 /**
  * 案例专家AI相关配置项
  */
@@ -32,59 +30,13 @@ public class CaseAiProperties {
      */
     private String aiApiCode;
 
-    /**
-     * 对话接口的apiCode
-     */
-    private String chatApiCode;
-
     /**
      * 案例知识库id
      */
     private String caseKnowledgeId;
 
-    /**
-     * 默认上传用户
-     * 当获取不到当前登录用户信息时会取这个
-     */
-    private String defaultUploadUser;
-
-    /**
-     * 案例详情页面地址
-     */
-    private String caseDetailUrlBase;
-
-    /**
-     * 文件上传是否使用回调接口
-     */
-    private boolean fileUploadUseCallback;
-
     /**
      * 文档上传回调接口地址
      */
     private String fileUploadCallbackUrl;
-
-    /**
-     * 是否启用白名单
-     */
-    private boolean useWhiteList;
-
-    /**
-     * 白名单用户列表
-     */
-    private List<String> whiteUserCodeList;
-    
-    /**
-     * 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

@@ -6,8 +6,6 @@ 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;
 
 /**
@@ -17,7 +15,6 @@ public interface ICaseAiChatService {
 
     /**
      * 聊天
-     *
      * @param caseAiChatDto
      * @param currentUser
      * @return
@@ -26,8 +23,7 @@ public interface ICaseAiChatService {
 
     /**
      * 创建新的AI对话会话
-     *
-     * @param userId           用户ID
+     * @param userId 用户ID
      * @param conversationName 对话名称
      * @return 创建的会话信息
      */
@@ -35,33 +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);
 }

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

@@ -1,14 +0,0 @@
-package com.xboe.module.boecase.service;
-
-/**
- * 案例AI权限服务接口
- */
-public interface ICaseAiPermissionService {
-
-    /**
-     * 判断指定用户是否显示"案例专家"功能入口
-     * @param userCode 用户编码
-     * @return 是否显示功能入口
-     */
-    boolean shouldShowCaseAiEntrance(String userCode);
-}

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

@@ -2,7 +2,6 @@ package com.xboe.module.boecase.service;
 
 import com.xboe.common.PageList;
 import com.xboe.module.boecase.dto.CaseDocumentLogQueryDto;
-import com.xboe.module.boecase.entity.CaseDocumentLog;
 import com.xboe.module.boecase.vo.CaseDocumentLogVo;
 
 /**
@@ -38,12 +37,4 @@ public interface ICaseDocumentLogService {
      */
     boolean retryByLogId(String logId);
 
-    /**
-     * 保存日志记录
-     *
-     * @param log 日志对象
-     * @return 是否成功
-     */
-    boolean save(CaseDocumentLog log);
-
 }

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

@@ -1,9 +1,5 @@
 package com.xboe.module.boecase.service;
 
-import com.xboe.module.boecase.entity.CaseDocumentLog;
-import com.xboe.module.boecase.entity.Cases;
-import org.springframework.transaction.annotation.Transactional;
-
 /**
  * 案例-知识库
  */
@@ -17,14 +13,6 @@ public interface ICaseKnowledgeService {
      */
     boolean uploadCaseDocument(String caseId);
 
-    /**
-     * 上传案例文档
-     *
-     * @param cases 案例
-     * @return 是否成功
-     */
-    boolean uploadCaseDocument(Cases cases);
-
     /**
      * 删除案例文档
      *
@@ -33,29 +21,13 @@ public interface ICaseKnowledgeService {
      */
     boolean deleteCaseDocument(String caseId);
 
-    /**
-     * 删除案例文档
-     *
-     * @param cases 案例
-     * @return 是否成功
-     */
-    boolean deleteCaseDocument(Cases cases);
-
     /**
      * 更新案例文档
      *
      * @param caseId 案例ID
      * @return 是否成功
      */
-    boolean retryCaseDocument(String caseId, CaseDocumentLog originalLog);
-
-    /**
-     * 更新案例文档
-     *
-     * @param cases 案例
-     * @return 是否成功
-     */
-    boolean updateCaseDocument(Cases cases);
+    boolean updateCaseDocument(String caseId);
 
     /**
      * 处理文档上传回调
@@ -66,10 +38,4 @@ public interface ICaseKnowledgeService {
      * @return 是否处理成功
      */
     boolean handleUploadCallback(String taskId, String message, String fileStatus);
-
-    /**
-     * 批量检查文件状态
-     */
-    @Transactional(rollbackFor = Throwable.class)
-    void batchCheckFileStatus();
 }

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

@@ -1,43 +0,0 @@
-package com.xboe.module.boecase.service;
-
-import com.xboe.module.boecase.entity.AiChatConversationData;
-import com.xboe.module.boecase.vo.CaseAiMessageVo;
-
-import java.util.List;
-
-/**
- * es索引
- */
-public interface IElasticSearchIndexService {
-
-    /**
-     * 查看索引是否存在
-     * @return
-     */
-    boolean checkIndexExists();
-
-    /**
-     * 创建索引
-     */
-    boolean createIndex();
-
-    /**
-     * 删除索引
-     * @return
-     */
-    boolean deleteIndex();
-
-    /**
-     * 新增数据
-     * @param data
-     * @return
-     */
-    boolean createData(AiChatConversationData data);
-
-    /**
-     * 查询数据
-     * @param conversationId
-     * @return
-     */
-    List<CaseAiMessageVo> queryData(String conversationId);
-}

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

@@ -3,8 +3,6 @@ package com.xboe.module.boecase.service.impl;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.xboe.core.CurrentUser;
-import com.xboe.core.orm.FieldFilters;
-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;
@@ -15,14 +13,8 @@ import com.xboe.module.boecase.entity.Cases;
 import com.xboe.module.boecase.properties.CaseAiProperties;
 import com.xboe.module.boecase.service.IAiAccessTokenService;
 import com.xboe.module.boecase.service.ICaseAiChatService;
-import com.xboe.module.boecase.service.IElasticSearchIndexService;
 import com.xboe.module.boecase.vo.CaseAiMessageVo;
 import com.xboe.module.boecase.vo.CaseReferVo;
-import com.xboe.module.boecase.entity.AiChatConversationData;
-import com.xboe.module.boecase.vo.ConversationExcelVo;
-import com.xboe.system.organization.vo.OrgSimpleVo;
-import com.xboe.system.user.service.IUserService;
-import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.*;
 import okhttp3.sse.EventSource;
@@ -35,11 +27,6 @@ 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;
@@ -54,84 +41,62 @@ 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.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 
-import javax.servlet.http.HttpServletResponse;
-import java.io.File;
 import java.io.IOException;
-import java.io.OutputStream;
-import java.net.SocketTimeoutException;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-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.ArrayList;
+import java.util.List;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 @EnableConfigurationProperties({CaseAiProperties.class})
 @Service
-@Slf4j(topic = "caseAiChatLogger")
+@Slf4j
 public class CaseAiChatServiceImpl implements ICaseAiChatService {
 
-    private static final String SYS_ERR_MSG = "服务繁忙，请稍后再试。";
-
     @Autowired
     private CaseAiProperties caseAiProperties;
 
-    @Autowired
-    @Qualifier("customDispatcher")
-    private Dispatcher dispatcher;
-
     @Autowired
     private IAiAccessTokenService aiAccessTokenService;
 
-    @Autowired
-    private IUserService userService;
-
     @Autowired
     private CaseAiConversationsDao caseAiConversationsDao;
 
-    @Autowired
-    private IElasticSearchIndexService elasticSearchIndexService;
+    @Autowired(required = false)
+    private RestHighLevelClient elasticsearchClient;
 
     @Autowired
     private CaseDocumentLogDao caseDocumentLogDao;
 
     @Autowired
     private CasesDao casesDao;
-    
-    // 用于存储会话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, SYS_ERR_MSG);
-            sseEmitter.complete();
-            return sseEmitter;
+        String conversationId = getOrCreateConversationId(caseAiChatDto, currentUser);
+        
+        // 2. 检查是否为新会话，如果是则保存会话记录
+        boolean isNewConversation = StringUtils.isEmpty(caseAiChatDto.getConversationId());
+        CaseAiConversations conversation = null;
+        if (isNewConversation) {
+            // 新会话，需要保存到数据库
+            conversation = new CaseAiConversations();
+            conversation.setAiConversationId(conversationId);
+            conversation.setConversationName("AI案例咨询-" + LocalDateTime.now());
+            conversation.setConversationUser(currentUser.getAccountId());
+            // 由于编译问题，这里先注释，实际部署时需要取消注释
+            caseAiConversationsDao.save(conversation);
         }
-
-        // 2. 查询历史
-        List<CaseAiMessageVo> historyMessages = elasticSearchIndexService.queryData(conversationId);
         
         // 3. 构建请求参数
-        String userId = currentUser.getCode();
+        String userId = currentUser.getAccountId();
         String kId = caseAiProperties.getCaseKnowledgeId();
         JSONObject chatParam = new JSONObject();
         chatParam.put("userId", userId);
@@ -140,66 +105,39 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
         chatParam.put("kIds", kIds);
         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();
-        } catch (Exception e) {
-            log.error("获取access_token失败", e);
-            errMessage(sseEmitter, SYS_ERR_MSG);
-            sseEmitter.complete();
-            return sseEmitter;
-        }
-        String apiCode = caseAiProperties.getChatApiCode();
+        String accessToken = aiAccessTokenService.getAccessToken();
+        String apiCode = caseAiProperties.getAiApiCode();
         Request.Builder builder = new Request.Builder();
         builder.url(caseAiProperties.getBaseUrl() + "/apigateway/chat/knowledge/v1/chat/completions");
         builder.addHeader("access_token", accessToken);
         builder.addHeader("X-AI-ApiCode", apiCode);
-        RequestBody bodyRequestBody = RequestBody.create(chatParamStr, MediaType.parse("application/json"));
+        RequestBody bodyRequestBody = RequestBody.create(chatParam.toJSONString(), 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);
+        ConversationData conversationData = new ConversationData();
+        conversationData.query = caseAiChatDto.getQuery();
+        conversationData.conversationId = conversationId;
+        conversationData.userId = userId;
         
         // 7. 创建事件监听器
         EventSourceListener listener = new EventSourceListener() {
             @Override
             public void onOpen(@NotNull EventSource eventSource, @NotNull Response response) {
                 log.info("调用接口 [{}] 接口开始监听", request.url());
-                // 将EventSource存储到Map中，以便后续可以中断
-                conversationEventSourceMap.put(conversationId, eventSource);
             }
 
             @Override
             public void onClosed(@NotNull EventSource eventSource) {
                 log.info("调用接口 [{}] 接口关闭", request.url());
                 // 对话完成，保存到ES
-                elasticSearchIndexService.createData(conversationData);
-                // 从Map中移除已完成的会话
-                conversationEventSourceMap.remove(conversationId);
+                saveConversationToES(conversationData);
                 sseEmitter.complete();
             }
 
@@ -215,35 +153,37 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
                         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, message);
-                                return;
+                            switch (status) {
+                                case 0: // 返回引用文件
+                                    // 处理文件引用并构建返给前端的数据
+                                    JSONObject modifiedData = handleFileReferAndBuildResponse(responseData, conversationData);
+                                    if (modifiedData != null) {
+                                        // 发送修改后的数据给前端
+                                        sseEmitter.send(modifiedData.toJSONString());
+                                        return; // 早期返回，不发送原始数据
+                                    }
+                                    break;
+                                case 1: // 流式对话中
+                                    String content = responseData.getString("content");
+                                    if (content != null) {
+                                        conversationData.answer.append(content);
+                                    }
+                                    break;
+                                case 2: // 回答完成
+                                    // 不做特殊处理
+                                    break;
+                                case 3: // 返回建议
+                                    handleSuggestions(responseData, conversationData);
+                                    break;
+                                case 4: // 接口交互完成
+                                    // 不做特殊处理
+                                    break;
                             }
                         }
-                        sseEmitter.send(responseData.toJSONString());
-                    } else {
-                        sseEmitter.send(data);
                     }
+                    
+                    // 发送给前端
+                    sseEmitter.send(data);
                 } catch (IOException e) {
                     log.error("调用接口处理监听数据时发生异常", e);
                 } catch (Exception e) {
@@ -258,50 +198,20 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
 
             @Override
             public void onFailure(@NotNull EventSource eventSource, @Nullable Throwable e, @Nullable Response response) {
-                if (e == null) {
-                    sseEmitter.completeWithError(new RuntimeException("调用接口异常, 异常未捕获"));
-                    return;
-                }
                 log.error("调用接口 [{}] 接口异常", request.url(), e);
-                if (isTimeoutException(e)) {
-                    log.warn("接口调用超时，conversationId: {}", conversationId);
-                    errMessage(sseEmitter, SYS_ERR_MSG);
-                    sseEmitter.complete();
-                    // 从Map中移除失败的会话
-                    conversationEventSourceMap.remove(conversationId);
-
-                    // 即使失败，也要将已有的对话数据保存到ES
-                    elasticSearchIndexService.createData(conversationData);
-                    return;
+                if (e != null) {
+                    sseEmitter.completeWithError(e);
+                } else {
+                    sseEmitter.completeWithError(new RuntimeException("调用接口异常, 异常未捕获"));
                 }
-                
-                // 如果是 content-type 错误，尝试作为普通 HTTP 请求处理
-                if (e instanceof IllegalStateException && e.getMessage() != null && e.getMessage().contains("Invalid content-type")) {
-                    log.warn("服务器返回的 Content-Type 不是 text/event-stream，尝试作为普通 HTTP 请求处理");
-                    handleAsRegularHttpRequest(request, sseEmitter, conversationData);
-                    // 从Map中移除失败的会话
-                    conversationEventSourceMap.remove(conversationId);
-                    // 即使失败，也要将已有的对话数据保存到ES
-                    elasticSearchIndexService.createData(conversationData);
-                    return;
-                }
-
-                sseEmitter.completeWithError(e);
-                // 从Map中移除失败的会话
-                conversationEventSourceMap.remove(conversationId);
-                
-                // 即使失败，也要将已有的对话数据保存到ES
-                elasticSearchIndexService.createData(conversationData);
             }
         };
         
         // 8. 执行HTTP请求
         OkHttpClient client = new OkHttpClient.Builder()
                 .connectTimeout(60, TimeUnit.SECONDS)
-                .writeTimeout(600, TimeUnit.SECONDS)
-                .readTimeout(600, TimeUnit.SECONDS)
-                .callTimeout(600, TimeUnit.SECONDS)
-                .dispatcher(dispatcher)
+                .writeTimeout(60, TimeUnit.SECONDS)
+                .readTimeout(60, TimeUnit.SECONDS)
                 .build();
         EventSource.Factory factory = EventSources.createFactory(client);
         factory.newEventSource(request, listener);
@@ -318,7 +228,7 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
         if (StringUtils.isEmpty(conversationId)) {
             // 新会话，调用创建会话接口
             String conversationName = "AI案例咨询-" + LocalDateTime.now().toString();
-            CaseAiConversations newConversation = createNewConversation(currentUser.getCode(), conversationName);
+            CaseAiConversations newConversation = createNewConversation(currentUser.getAccountId(), conversationName);
             return newConversation.getAiConversationId();
         } else {
             // 已存在会话，从数据库查询
@@ -327,7 +237,6 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
     }
 
     @Override
-    @Transactional
     public CaseAiConversations createNewConversation(String userId, String conversationName) {
         try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
             String url = caseAiProperties.getBaseUrl() + "/apigateway/knowledge/v1/conversation";
@@ -335,7 +244,7 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
             
             // 设置请求头
             String accessToken = aiAccessTokenService.getAccessToken();
-            String apiCode = caseAiProperties.getChatApiCode();
+            String apiCode = caseAiProperties.getAiApiCode();
             httpPost.setHeader("access_token", accessToken);
             httpPost.setHeader("X-AI-ApiCode", apiCode);
             httpPost.setHeader("Content-Type", "application/json");
@@ -384,55 +293,48 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
 
     @Override
     public List<CaseAiMessageVo> getConversationMessages(String conversationId) {
-        if (StringUtils.isEmpty(conversationId)) {
-            log.warn("conversationId 为空, 不查询");
-            return new ArrayList<>();
+        List<CaseAiMessageVo> messages = new ArrayList<>();
+        
+        if (elasticsearchClient == null) {
+            log.warn("未配置Elasticsearch客户端，无法查询消息记录");
+            return messages;
         }
-        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);
+        
+        try {
+            // 根据conversationId从数据库查询AI会话ID
+            String aiConversationId = caseAiConversationsDao.findAiConversationIdById(conversationId);
+            if (StringUtils.isEmpty(aiConversationId)) {
+                log.warn("未找到conversationId: {}对应的AI会话ID", conversationId);
+                return messages;
+            }
+            
+            // 从 ES 中查询消息记录
+            SearchRequest searchRequest = new SearchRequest("ai_chat_messages"); // ES索引名，可以根据实际情况调整
+            SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
+            searchSourceBuilder.query(QueryBuilders.termQuery("conversationId", aiConversationId));
+            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 messageVo = parseMessageFromES(sourceMap);
+                if (messageVo != null) {
+                    messages.add(messageVo);
                 }
             }
-            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);
-            }
+            
+            log.info("从 ES 中查询到 {} 条消息记录", messages.size());
+            
+        } catch (Exception e) {
+            log.error("从 ES 查询会话消息记录异常", e);
         }
+        
+        return messages;
     }
-
+    
     /**
      * 从 ES 数据中解析消息对象
      * @param sourceMap ES数据
@@ -484,11 +386,10 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
     /**
      * 处理文件引用并构建返给前端的响应数据
      */
-    private JSONObject handleFileReferAndBuildResponse(JSONObject responseData, AiChatConversationData conversationData) {
+    private JSONObject handleFileReferAndBuildResponse(JSONObject responseData, ConversationData conversationData) {
         try {
             // 先处理文件引用，收集CaseReferVo数据
             List<CaseReferVo> currentCaseRefers = new ArrayList<>();
-            Set<String> docIds = new HashSet<>();
             
             JSONObject fileRefer = responseData.getJSONObject("fileRefer");
             if (fileRefer != null && fileRefer.containsKey("files")) {
@@ -499,19 +400,22 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
                     if (docId != null) {
                         // 根据docId从 case_document_log 表查询案例数据
                         CaseReferVo caseRefer = getCaseReferByDocId(docId);
-                        if (caseRefer != null && !docIds.contains(docId)) {
-                            docIds.add(docId);
+                        if (caseRefer != null) {
                             currentCaseRefers.add(caseRefer);
-                            conversationData.addCaseRefer(caseRefer); // 也添加到总的收集器中
+                            conversationData.caseRefers.add(caseRefer); // 也添加到总的收集器中
                         }
                     }
                 }
             }
             
             // 构建返给前端的数据结构
+            JSONObject modifiedResponse = new JSONObject();
+            modifiedResponse.put("success", true);
+            modifiedResponse.put("code", 0);
+            modifiedResponse.put("message", "业务处理成功");
+            
             JSONObject data = new JSONObject();
             data.put("status", 0);
-            data.put("conversationId", conversationData.getConversationId());
             data.put("content", responseData.getString("content"));
             
             // 添加处理后的案例引用数据
@@ -523,10 +427,6 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
                 caseReferObj.put("authorName", caseRefer.getAuthorName());
                 caseReferObj.put("keywords", caseRefer.getKeywords());
                 caseReferObj.put("content", caseRefer.getContent());
-                // 使用指定的时间格式
-                DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-                caseReferObj.put("uploadTime", caseRefer.getUploadTime() != null ? caseRefer.getUploadTime().format(formatter) : null);
-
                 caseReferArray.add(caseReferObj);
             }
             
@@ -547,8 +447,10 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
             data.put("fileRefer", newFileRefer);
             data.put("suggestions", responseData.get("suggestions"));
             
+            modifiedResponse.put("data", data);
+            
             log.info("处理文件引用成功，返回 {} 个案例引用", currentCaseRefers.size());
-            return data;
+            return modifiedResponse;
             
         } catch (Exception e) {
             log.error("处理文件引用并构建响应数据异常", e);
@@ -559,7 +461,7 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
     /**
      * 处理文件引用（原方法，保留用于数据收集）
      */
-    private void handleFileRefer(JSONObject responseData, AiChatConversationData conversationData) {
+    private void handleFileRefer(JSONObject responseData, ConversationData conversationData) {
         try {
             JSONObject fileRefer = responseData.getJSONObject("fileRefer");
             if (fileRefer != null && fileRefer.containsKey("files")) {
@@ -571,7 +473,7 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
                         // 根据docId从 case_document_log 表查询案例数据
                         CaseReferVo caseRefer = getCaseReferByDocId(docId);
                         if (caseRefer != null) {
-                            conversationData.addCaseRefer(caseRefer);
+                            conversationData.caseRefers.add(caseRefer);
                         }
                     }
                 }
@@ -584,14 +486,14 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
     /**
      * 处理建议
      */
-    private void handleSuggestions(JSONObject responseData, AiChatConversationData conversationData) {
+    private void handleSuggestions(JSONObject responseData, ConversationData conversationData) {
         try {
             JSONArray suggestions = responseData.getJSONArray("suggestions");
             if (suggestions != null) {
                 for (int i = 0; i < suggestions.size(); i++) {
                     String suggestion = suggestions.getString(i);
                     if (suggestion != null) {
-                        conversationData.addSuggestion(suggestion);
+                        conversationData.suggestions.add(suggestion);
                     }
                 }
             }
@@ -616,17 +518,13 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
             if (caseEntity == null) {
                 return null;
             }
-
-            String authorUserId = caseEntity.getAuthorId();
-            OrgSimpleVo authorOrg = userService.findOrgByUserId(authorUserId);
+            
             // 构建 CaseReferVo
             CaseReferVo caseRefer = new CaseReferVo();
             caseRefer.setCaseId(caseEntity.getId());
             caseRefer.setTitle(caseEntity.getTitle());
             caseRefer.setAuthorName(caseEntity.getAuthorName());
-            caseRefer.setContent(caseEntity.getSummary());
-            caseRefer.setUploadTime(caseEntity.getSysCreateTime());
-            caseRefer.setOrgInfo(authorOrg.getName());
+            caseRefer.setContent(caseEntity.getContent());
             
             // 构建关键词列表
             List<String> keywords = new ArrayList<>();
@@ -645,194 +543,60 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
     }
     
     /**
-     * 当 SSE 失败时，作为普通 HTTP 请求处理
+     * 保存对话记录到ES
      */
-    private void handleAsRegularHttpRequest(Request request, SseEmitter sseEmitter, AiChatConversationData conversationData) {
+    private void saveConversationToES(ConversationData conversationData) {
+        if (elasticsearchClient == null) {
+            log.warn("未配置Elasticsearch客户端，无法保存对话记录");
+            return;
+        }
+        
         try {
-            OkHttpClient client = new OkHttpClient.Builder()
-                    .connectTimeout(60, TimeUnit.SECONDS)
-                    .writeTimeout(60, TimeUnit.SECONDS)
-                    .readTimeout(60, TimeUnit.SECONDS)
-                    .build();
+            // 构建要保存的数据
+            JSONObject esData = new JSONObject();
+            esData.put("query", conversationData.query);
+            esData.put("answer", conversationData.answer.toString());
+            esData.put("conversationId", conversationData.conversationId);
+            esData.put("userId", conversationData.userId);
+            esData.put("timestamp", LocalDateTime.now().toString());
             
-            Response response = client.newCall(request).execute();
-            if (response.isSuccessful()) {
-                String responseBody = response.body().string();
-                log.info("作为普通 HTTP 请求处理成功，将响应原封不动推送给前端");
-                
-                // 将响应内容原封不动地推送到 SseEmitter
-                JSONObject responseData = JSONObject.parseObject(responseBody);
-                if (responseBody.contains("message")) {
-                    errMessage(sseEmitter, responseData.getString("message"));
-                    sseEmitter.complete();
-                    return;
-                }
-                sseEmitter.send(responseBody);
-                sseEmitter.complete();
-            } else {
-                log.error("普通 HTTP 请求失败，状态码: {}", response.code());
-                sseEmitter.completeWithError(new RuntimeException("HTTP 请求失败，状态码: " + response.code()));
+            // 构建 caseRefer 数据
+            JSONArray caseReferArray = new JSONArray();
+            for (CaseReferVo caseRefer : conversationData.caseRefers) {
+                JSONObject caseReferObj = new JSONObject();
+                caseReferObj.put("caseId", caseRefer.getCaseId());
+                caseReferObj.put("title", caseRefer.getTitle());
+                caseReferObj.put("authorName", caseRefer.getAuthorName());
+                caseReferObj.put("keywords", caseRefer.getKeywords());
+                caseReferObj.put("content", caseRefer.getContent());
+                caseReferArray.add(caseReferObj);
             }
+            esData.put("caseRefer", caseReferArray);
+            
+            // 添加建议
+            esData.put("suggestions", conversationData.suggestions);
+            
+            // 保存到ES
+            IndexRequest indexRequest = new IndexRequest("ai_chat_messages");
+            indexRequest.source(esData.toJSONString(), XContentType.JSON);
+            
+            IndexResponse indexResponse = elasticsearchClient.index(indexRequest, RequestOptions.DEFAULT);
+            log.info("保存对话记录到ES成功，文档ID: {}", indexResponse.getId());
+            
         } catch (Exception e) {
-            log.error("处理普通 HTTP 请求异常", e);
-            sseEmitter.completeWithError(e);
+            log.error("保存对话记录到ES异常", e);
         }
     }
-
-    private void errMessage(SseEmitter sseEmitter, String message) {
-        JSONObject jsonData = new JSONObject();
-        jsonData.put("status", 1);
-        jsonData.put("content", message);
-        try {
-            sseEmitter.send(jsonData.toJSONString());
-        } catch (IOException e) {
-            log.error("发送错误信息异常", e);
-            sseEmitter.completeWithError(e);
-        }
-    }
-
-    @Override
-    public boolean stopChatOutput(String conversationId) {
-        EventSource eventSource = conversationEventSourceMap.get(conversationId);
-        if (eventSource != null) {
-            try {
-                // 取消事件源，中断连接
-                eventSource.cancel();
-                // 注意：cancel()会触发onFailure回调，在onFailure中会清理资源
-                log.info("成功发送停止会话 {} 的指令", conversationId);
-                return true;
-            } catch (Exception e) {
-                log.error("停止会话 {} 输出时发生异常", conversationId, e);
-                // 即使出现异常，也从Map中移除，避免内存泄漏
-                conversationEventSourceMap.remove(conversationId);
-                return false;
-            }
-        } else {
-            log.warn("未找到会话 {} 对应的事件源，可能已经完成或不存在", conversationId);
-            return false;
-        }
-    }
-
+    
     /**
-     * 判断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("问答时长(秒)");
-
-        // 内容行
-        if (!excelDataList.isEmpty()) {
-            int rowNum = 1; // 从第二行开始写入数据
-            for (ConversationExcelVo excelData : excelDataList) {
-                List<CaseAiMessageVo> messages = excelData.getMessages();
-
-                if (messages != null && !messages.isEmpty()) {
-                    // 记录起始行号，用于后续合并单元格
-                    int startRow = rowNum;
-
-                    // 遍历每个消息
-                    for (CaseAiMessageVo message : messages) {
-                        Row row = sheet.createRow(rowNum++);
-                        // 填充每行数据
-                        row.createCell(0).setCellValue(excelData.getConversationId());
-                        row.createCell(1).setCellValue(excelData.getConversationName());
-                        row.createCell(2).setCellValue(excelData.getUser());
-                        row.createCell(3).setCellValue(message.getQuery() != null ? message.getQuery() : "");
-                        row.createCell(4).setCellValue(message.getAnswer() != null ? message.getAnswer() : "");
-                        row.createCell(5).setCellValue(""); // 开始时间字段暂留空
-                        row.createCell(6).setCellValue(message.getDurationSeconds() != null ? message.getDurationSeconds() : 0);
-                    }
-
-                    // 合并单元格（会话ID、会话名称、用户三列）
-                    // 参数说明：起始行号，结束行号，起始列号，结束列号
-                    if (rowNum > startRow + 1) { // 只有当有多行时才合并
-                        sheet.addMergedRegion(new CellRangeAddress(startRow, rowNum - 1, 0, 0));
-                        sheet.addMergedRegion(new CellRangeAddress(startRow, rowNum - 1, 1, 1));
-                        sheet.addMergedRegion(new CellRangeAddress(startRow, rowNum - 1, 2, 2));
-                    }
-                } else {
-                    // 如果没有消息，则仍然创建一行显示基本信息
-                    Row row = sheet.createRow(rowNum++);
-                    row.createCell(0).setCellValue(excelData.getConversationId());
-                    row.createCell(1).setCellValue(excelData.getConversationName());
-                    row.createCell(2).setCellValue(excelData.getUser());
-                }
-            }
-        }
-
-        return workbook;
+    private static class ConversationData {
+        public String query;
+        public StringBuilder answer = new StringBuilder();
+        public List<CaseReferVo> caseRefers = new ArrayList<>();
+        public List<String> suggestions = new ArrayList<>();
+        public String conversationId;
+        public String userId;
     }
 }

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

@@ -1,47 +0,0 @@
-package com.xboe.module.boecase.service.impl;
-
-import com.xboe.module.boecase.properties.CaseAiProperties;
-import com.xboe.module.boecase.service.ICaseAiPermissionService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-/**
- * 案例AI权限服务实现类
- */
-@Slf4j
-@Service
-@Transactional
-public class CaseAiPermissionServiceImpl implements ICaseAiPermissionService {
-
-    @Autowired
-    private CaseAiProperties caseAiProperties;
-
-    /**
-     * 判断指定用户是否显示"案例专家"功能入口
-     * @param userCode 用户编码
-     * @return 是否显示功能入口
-     */
-    @Override
-    public boolean shouldShowCaseAiEntrance(String userCode) {
-        log.info("判断用户[{}]是否显示案例专家功能入口", userCode);
-        
-        // 如果不启用白名单，直接返回true
-        if (!caseAiProperties.isUseWhiteList()) {
-            log.info("未启用白名单，所有用户都显示功能入口");
-            return true;
-        }
-        
-        // 启用白名单时，判断当前用户是否在白名单中
-        List<String> whiteUserCodeList = caseAiProperties.getWhiteUserCodeList();
-        log.info("白名单列表：{}", whiteUserCodeList);
-        boolean isInWhiteList = whiteUserCodeList != null
-            && whiteUserCodeList.stream().anyMatch(userCode::equals);
-        
-        log.info("用户[{}]{}在白名单中", userCode, isInWhiteList ? "" : "不");
-        return isInWhiteList;
-    }
-}

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

@@ -1,12 +1,12 @@
 package com.xboe.module.boecase.service.impl;
 
 import com.xboe.common.utils.StringUtil;
+import com.xboe.common.utils.IDGenerator;
 import com.xboe.common.OrderCondition;
 import com.xboe.common.PageList;
 import com.xboe.core.orm.FieldFilters;
 import com.xboe.core.orm.IFieldFilter;
 import com.xboe.core.orm.LikeMatchMode;
-import com.xboe.enums.CaseDocumentLogRunStatusEnum;
 import com.xboe.module.boecase.dao.CaseDocumentLogDao;
 import com.xboe.module.boecase.dto.CaseDocumentLogQueryDto;
 import com.xboe.module.boecase.entity.CaseDocumentLog;
@@ -16,7 +16,6 @@ import com.xboe.module.boecase.vo.CaseDocumentLogVo;
 import com.xboe.enums.CaseDocumentLogOptTypeEnum;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -40,16 +39,20 @@ public class CaseDocumentLogServiceImpl implements ICaseDocumentLogService {
     @Resource
     private ICaseKnowledgeService caseKnowledgeService;
 
-    @Resource(name = "aiDocExecutor")
-    private ThreadPoolTaskExecutor aiDocExecutor;
-
     @Override
     public PageList<CaseDocumentLogVo> pageQuery(int pageIndex, int pageSize, CaseDocumentLogQueryDto queryDto) {
         // 构建查询条件
         List<IFieldFilter> filters = new ArrayList<>();
+        
+        // 删除标识过滤
+        filters.add(FieldFilters.eq("deleted", false));
 
-        // 运行状态过滤
-        filters.add(FieldFilters.eq("runStatus", CaseDocumentLogRunStatusEnum.COMPLETED.getCode()));
+        // 接口调用状态
+        if (queryDto.getOptStatus() != null) {
+            filters.add(FieldFilters.eq("optStatus", queryDto.getOptStatus()));
+        } else {
+            filters.add(FieldFilters.ge("optStatus", 1));
+        }
 
         // 案例标题模糊查询
         if (StringUtil.isNotBlank(queryDto.getCaseTitle())) {
@@ -66,14 +69,7 @@ public class CaseDocumentLogServiceImpl implements ICaseDocumentLogService {
             filters.add(FieldFilters.ge("optTime", queryDto.getOptTimeStart()));
         }
         if (queryDto.getOptTimeEnd() != null) {
-            // 将结束时间调整为当天的23:59:59
-            LocalDateTime optTimeEnd = queryDto.getOptTimeEnd().withHour(23).withMinute(59).withSecond(59);
-            filters.add(FieldFilters.le("optTime", optTimeEnd));
-        }
-
-        // 接口调用状态
-        if (queryDto.getOptStatus() != null) {
-            filters.add(FieldFilters.eq("optStatus", queryDto.getOptStatus()));
+            filters.add(FieldFilters.le("optTime", queryDto.getOptTimeEnd()));
         }
 
         // 业务处理状态
@@ -81,9 +77,6 @@ public class CaseDocumentLogServiceImpl implements ICaseDocumentLogService {
             filters.add(FieldFilters.eq("caseStatus", queryDto.getCaseStatus()));
         }
 
-        // 删除标识过滤
-        filters.add(FieldFilters.eq("deleted", false));
-
         // 按创建时间降序排序
         OrderCondition order = OrderCondition.desc("sysCreateTime");
 
@@ -109,9 +102,16 @@ public class CaseDocumentLogServiceImpl implements ICaseDocumentLogService {
     public int clearLogsByCondition(CaseDocumentLogQueryDto queryDto) {
         // 构建查询条件（与分页查询相同的逻辑）
         List<IFieldFilter> filters = new ArrayList<>();
+        
+        // 删除标识过滤
+        filters.add(FieldFilters.eq("deleted", false));
 
-        // 运行状态过滤
-        filters.add(FieldFilters.eq("runStatus", CaseDocumentLogRunStatusEnum.COMPLETED.getCode()));
+        // 接口调用状态
+        if (queryDto.getOptStatus() != null) {
+            filters.add(FieldFilters.eq("optStatus", queryDto.getOptStatus()));
+        } else {
+            filters.add(FieldFilters.ge("optStatus", 1));
+        }
 
         // 案例标题模糊查询
         if (StringUtil.isNotBlank(queryDto.getCaseTitle())) {
@@ -128,14 +128,7 @@ public class CaseDocumentLogServiceImpl implements ICaseDocumentLogService {
             filters.add(FieldFilters.ge("optTime", queryDto.getOptTimeStart()));
         }
         if (queryDto.getOptTimeEnd() != null) {
-            // 将结束时间调整为当天的23:59:59
-            LocalDateTime optTimeEnd = queryDto.getOptTimeEnd().withHour(23).withMinute(59).withSecond(59);
-            filters.add(FieldFilters.le("optTime", optTimeEnd));
-        }
-
-        // 接口调用状态
-        if (queryDto.getOptStatus() != null) {
-            filters.add(FieldFilters.eq("optStatus", queryDto.getOptStatus()));
+            filters.add(FieldFilters.le("optTime", queryDto.getOptTimeEnd()));
         }
 
         // 业务处理状态
@@ -143,13 +136,9 @@ public class CaseDocumentLogServiceImpl implements ICaseDocumentLogService {
             filters.add(FieldFilters.eq("caseStatus", queryDto.getCaseStatus()));
         }
 
-        // 删除标识过滤
-        filters.add(FieldFilters.eq("deleted", false));
-
         // 查询符合条件的所有记录
-        IFieldFilter[] filtersArray = filters.toArray(new IFieldFilter[0]);
         List<CaseDocumentLog> logsToDelete = caseDocumentLogDao.getGenericDao()
-                .findList(CaseDocumentLog.class, filtersArray);
+                .findList(CaseDocumentLog.class, (IFieldFilter) filters);
         
         if (logsToDelete.isEmpty()) {
             return 0;
@@ -181,75 +170,56 @@ public class CaseDocumentLogServiceImpl implements ICaseDocumentLogService {
             return false;
         }
         
-        log.info("开始异步重试AI调用，原始日志ID: {}, 案例标题: {}, 操作类型: {}", 
+        log.info("开始重试AI调用，原始日志ID: {}, 案例标题: {}, 操作类型: {}", 
                 logId, originalLog.getCaseTitle(), originalLog.getOptType());
         
-        // 2. 使用线程池异步执行AI调用重试逻辑
-        String optType = originalLog.getOptType();
-        String caseId = originalLog.getCaseId();
-        
-        aiDocExecutor.execute(() -> executeRetryLogic(optType, caseId, originalLog));
-        
-        // 立即返回true表示重试请求已接受，具体结果通过日志异步处理
-        return true;
-    }
-    
-    /**
-     * 执行AI调用重试逻辑
-     * @param optType 操作类型
-     * @param caseId 案例ID
-     */
-    private void executeRetryLogic(String optType, String caseId, CaseDocumentLog originalLog) {
+        // 2. 执行AI调用重试逻辑
         boolean retrySuccess = false;
         
         try {
+            // 根据操作类型调用对应的接口方法
+            String optType = originalLog.getOptType();
+            String caseId = originalLog.getCaseId();
+            
             if (StringUtil.isBlank(caseId)) {
                 throw new IllegalArgumentException("案例ID不能为空");
             }
             
-            log.info("[异步任务] 正在执行AI调用重试，操作类型: {}, caseId: {}", optType, caseId);
+            log.info("正在执行AI调用重试，操作类型: {}, caseId: {}", optType, caseId);
             
             // 根据操作类型执行对应的方法（这些方法内部会自动创建日志记录）
             if (CaseDocumentLogOptTypeEnum.CREATE.getCode().equals(optType)) {
                 // 上传案例文档
                 retrySuccess = caseKnowledgeService.uploadCaseDocument(caseId);
-                log.info("[异步任务] 执行上传案例文档重试，caseId: {}, 结果: {}", caseId, retrySuccess);
+                log.info("执行上传案例文档重试，caseId: {}, 结果: {}", caseId, retrySuccess);
                 
             } else if (CaseDocumentLogOptTypeEnum.DELETE.getCode().equals(optType)) {
                 // 删除案例文档
                 retrySuccess = caseKnowledgeService.deleteCaseDocument(caseId);
-                log.info("[异步任务] 执行删除案例文档重试，caseId: {}, 结果: {}", caseId, retrySuccess);
+                log.info("执行删除案例文档重试，caseId: {}, 结果: {}", caseId, retrySuccess);
                 
             } else if (CaseDocumentLogOptTypeEnum.UPDATE.getCode().equals(optType)) {
                 // 更新案例文档
-                retrySuccess = caseKnowledgeService.retryCaseDocument(caseId, originalLog);
-                log.info("[异步任务] 执行更新案例文档重试，caseId: {}, 结果: {}", caseId, retrySuccess);
+                retrySuccess = caseKnowledgeService.updateCaseDocument(caseId);
+                log.info("执行更新案例文档重试，caseId: {}, 结果: {}", caseId, retrySuccess);
                 
             } else {
                 throw new IllegalArgumentException("不支持的操作类型: " + optType);
             }
             
             if (retrySuccess) {
-                log.info("[异步任务] AI调用重试成功，操作类型: {}, caseId: {}", optType, caseId);
+                log.info("AI调用重试成功，操作类型: {}, caseId: {}", optType, caseId);
             } else {
-                log.warn("[异步任务] AI调用重试失败，操作类型: {}, caseId: {}", optType, caseId);
+                log.warn("AI调用重试失败，操作类型: {}, caseId: {}", optType, caseId);
             }
             
         } catch (Exception e) {
-            log.error("[异步任务] AI调用重试异常，操作类型: {}, caseId: {}", 
-                    optType, caseId, e);
-        }
-    }
-
-    @Override
-    public boolean save(CaseDocumentLog caseDocumentLog) {
-        try {
-            caseDocumentLogDao.save(caseDocumentLog);
-            return true;
-        } catch (Exception e) {
-            log.error("保存CaseDocumentLog失败", e);
-            return false;
+            log.error("AI调用重试异常，操作类型: {}, caseId: {}", 
+                    originalLog.getOptType(), originalLog.getCaseId(), e);
+            retrySuccess = false;
         }
+        
+        return retrySuccess;
     }
 
     /**
@@ -279,6 +249,8 @@ public class CaseDocumentLogServiceImpl implements ICaseDocumentLogService {
             return "";
         }
         switch (optStatus) {
+            case 0:
+                return "调用中";
             case 1:
                 return "调用成功";
             case 2:

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

@@ -19,9 +19,7 @@ import com.xboe.common.utils.IDGenerator;
 import com.xboe.common.utils.StringUtil;
 import com.xboe.core.CurrentUser;
 import com.xboe.core.orm.*;
-import com.xboe.enums.CaseDocumentLogOptTypeEnum;
 import com.xboe.enums.CasesRankEnum;
-import com.xboe.module.boecase.async.CaseAiDocumentAsyncHandler;
 import com.xboe.module.boecase.dao.*;
 import com.xboe.module.boecase.dto.*;
 import com.xboe.module.boecase.entity.*;
@@ -92,9 +90,6 @@ public class CasesServiceImpl implements ICasesService {
     @Resource
     private ThirdApi thirdApi;
 
-    @Autowired
-    private CaseAiDocumentAsyncHandler caseAiDocumentAsyncHandler;
-
     /**
      * 案例分页查询，用于门户的查询
      */
@@ -804,11 +799,7 @@ public class CasesServiceImpl implements ICasesService {
      */
     @Override
     public void delete(String id) {
-        Cases cases = casesDao.get(id);
-        // 原删除
         casesDao.setDeleted(id);
-        // 增加逻辑
-        caseAiDocumentAsyncHandler.process(CaseDocumentLogOptTypeEnum.DELETE, cases);
     }
 
     /**
@@ -995,8 +986,6 @@ public class CasesServiceImpl implements ICasesService {
         cases.setMajorIds(majorIds);
         cases.setMajorType(stringBuffer.toString());
         casesDao.save(cases);
-        // 增加逻辑
-        caseAiDocumentAsyncHandler.process(CaseDocumentLogOptTypeEnum.CREATE, cases);
     }
 
     @Override
@@ -1020,8 +1009,6 @@ public class CasesServiceImpl implements ICasesService {
         cases.setMajorIds(majorIds);
         cases.setMajorType(stringBuffer.toString());
         casesDao.update(cases);
-        // 增加逻辑
-        caseAiDocumentAsyncHandler.process(CaseDocumentLogOptTypeEnum.UPDATE, cases);
     }
 
     @Override

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

@@ -1,336 +0,0 @@
-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.module.boecase.entity.AiChatConversationData;
-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.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.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.common.settings.Settings;
-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.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.io.IOException;
-import java.time.Duration;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-@Service
-@Slf4j
-public class ElasticSearchIndexServiceImpl implements IElasticSearchIndexService {
-
-    @Autowired(required = false)
-    private RestHighLevelClient elasticsearchClient;
-
-    @Override
-    public boolean checkIndexExists() {
-        if (elasticsearchClient == null) {
-            log.error("ElasticSearch客户端未配置");
-            return false;
-        }
-        // 检查索引是否存在
-        GetIndexRequest getIndexRequest = new GetIndexRequest(CaseAiConstants.CASE_AI_INDEX_NAME);
-        try {
-            return elasticsearchClient.indices().exists(getIndexRequest, RequestOptions.DEFAULT);
-        } catch (IOException e) {
-            log.error("查询ElasticSearch索引时发生异常", e);
-            return false;
-        }
-    }
-
-    @Override
-    public boolean createIndex() {
-        if (elasticsearchClient == null) {
-            log.error("ElasticSearch客户端未配置");
-            return false;
-        }
-        // 创建索引
-        CreateIndexRequest createIndexRequest = new CreateIndexRequest(CaseAiConstants.CASE_AI_INDEX_NAME);
-
-        // 设置索引配置
-        createIndexRequest.settings(Settings.builder()
-                .put("index.number_of_shards", 1)
-                .put("index.number_of_replicas", 0)
-                .put("index.analysis.analyzer.ik_max_word.tokenizer", "ik_max_word")
-                .put("index.analysis.analyzer.ik_smart.tokenizer", "ik_smart")
-        );
-
-        // 设置字段映射
-        String mapping = getAiChatMessagesMapping();
-        createIndexRequest.mapping(mapping, XContentType.JSON);
-
-        // 执行创建索引请求
-        CreateIndexResponse createIndexResponse = null;
-        try {
-            createIndexResponse = elasticsearchClient.indices()
-                    .create(createIndexRequest, RequestOptions.DEFAULT);
-        } catch (IOException e) {
-            log.error("创建ElasticSearch索引时发生异常", e);
-            return false;
-        }
-
-        if (createIndexResponse.isAcknowledged()) {
-            log.info("ElasticSearch索引 [{}] 创建成功", CaseAiConstants.CASE_AI_INDEX_NAME);
-            return true;
-        } else {
-            log.error("ElasticSearch索引 [{}] 创建可能失败，响应未确认", CaseAiConstants.CASE_AI_INDEX_NAME);
-            return false;
-        }
-    }
-
-    @Override
-    public boolean deleteIndex() {
-        if (elasticsearchClient == null) {
-            log.error("ElasticSearch客户端未配置");
-            return false;
-        }
-        // 执行删除索引请求
-        DeleteIndexRequest deleteRequest = new DeleteIndexRequest(CaseAiConstants.CASE_AI_INDEX_NAME);
-        try {
-            AcknowledgedResponse deleteResponse = elasticsearchClient.indices().delete(deleteRequest, RequestOptions.DEFAULT);
-            if (deleteResponse.isAcknowledged()) {
-                log.info("成功删除Elasticsearch索引: {}", CaseAiConstants.CASE_AI_INDEX_NAME);
-                return true;
-            } else {
-                log.error("删除索引 [{}] 未被确认（可能部分节点未响应）", CaseAiConstants.CASE_AI_INDEX_NAME);
-                return false;
-            }
-        } catch (IOException e) {
-            log.error("删除ElasticSearch索引时发生异常", e);
-            return false;
-        }
-    }
-
-    @Override
-    public boolean createData(AiChatConversationData conversationData) {
-        if (elasticsearchClient == null) {
-            log.error("未配置Elasticsearch客户端，无法保存对话记录");
-            return false;
-        }
-
-        try {
-            // 构建要保存的数据
-            JSONObject esData = new JSONObject();
-            esData.put("query", conversationData.getQuery());
-            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());
-
-            // 构建 caseRefer 数据
-            JSONArray caseReferArray = new JSONArray();
-            for (CaseReferVo caseRefer : conversationData.getCaseRefers()) {
-                JSONObject caseReferObj = new JSONObject();
-                caseReferObj.put("caseId", caseRefer.getCaseId());
-                caseReferObj.put("title", caseRefer.getTitle());
-                caseReferObj.put("authorName", caseRefer.getAuthorName());
-                caseReferObj.put("keywords", caseRefer.getKeywords());
-                caseReferObj.put("content", caseRefer.getContent());
-                caseReferArray.add(caseReferObj);
-            }
-            esData.put("caseRefer", caseReferArray);
-
-            // 添加建议
-            esData.put("suggestions", conversationData.getSuggestions());
-
-            // 保存到ES
-            IndexRequest indexRequest = new IndexRequest("ai_chat_messages");
-            String dataStr = esData.toJSONString();
-            log.info("保存对话记录到ES：{}", dataStr);
-            indexRequest.source(dataStr, XContentType.JSON);
-
-            IndexResponse indexResponse = elasticsearchClient.index(indexRequest, RequestOptions.DEFAULT);
-            log.info("保存对话记录到ES成功，文档ID: {}", indexResponse.getId());
-            return true;
-        } catch (Exception e) {
-            log.error("保存对话记录到ES异常", e);
-            return false;
-        }
-    }
-
-    @Override
-    public List<CaseAiMessageVo> queryData(String conversationId) {
-        List<CaseAiMessageVo> list = new ArrayList<>();
-        if (elasticsearchClient == null) {
-            log.error("未配置Elasticsearch客户端，无法查询对话记录");
-            return list;
-        }
-        try {
-            // 从 ES 中查询消息记录
-            SearchRequest searchRequest = new SearchRequest(CaseAiConstants.CASE_AI_INDEX_NAME); // ES索引名，可以根据实际情况调整
-            SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
-            searchSourceBuilder.query(QueryBuilders.termQuery("conversationId", conversationId));
-            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;
-    }
-
-    private CaseAiMessageVo parseMessageFromES(Map<String, Object> sourceMap) {
-        try {
-            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((Long) sourceMap.get("durationSeconds"));
-            }
-
-            // 解析 suggestions
-            if (sourceMap.containsKey("suggestions")) {
-                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;
-
-                    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;
-        }
-    }
-
-    /**
-     * 获取ai_chat_messages索引的字段映射配置
-     * 根据项目中的会话消息数据结构规范定义映射
-     *
-     * @return JSON格式的映射配置
-     */
-    private String getAiChatMessagesMapping() {
-        return "{\n" +
-                "  \"properties\": {\n" +
-                "    \"conversationId\": {\n" +
-                "      \"type\": \"keyword\",\n" +
-                "      \"index\": true\n" +
-                "    },\n" +
-                "    \"query\": {\n" +
-                "      \"type\": \"text\",\n" +
-                "      \"analyzer\": \"ik_max_word\",\n" +
-                "      \"search_analyzer\": \"ik_smart\",\n" +
-                "      \"fields\": {\n" +
-                "        \"keyword\": {\n" +
-                "          \"type\": \"keyword\",\n" +
-                "          \"ignore_above\": 256\n" +
-                "        }\n" +
-                "      }\n" +
-                "    },\n" +
-                "    \"answer\": {\n" +
-                "      \"type\": \"text\",\n" +
-                "      \"analyzer\": \"ik_max_word\",\n" +
-                "      \"search_analyzer\": \"ik_smart\"\n" +
-                "    },\n" +
-                "    \"caseRefer\": {\n" +
-                "      \"type\": \"nested\",\n" +
-                "      \"properties\": {\n" +
-                "        \"caseId\": {\n" +
-                "          \"type\": \"keyword\",\n" +
-                "          \"index\": true\n" +
-                "        },\n" +
-                "        \"title\": {\n" +
-                "          \"type\": \"text\",\n" +
-                "          \"analyzer\": \"ik_max_word\",\n" +
-                "          \"search_analyzer\": \"ik_smart\"\n" +
-                "        },\n" +
-                "        \"authorName\": {\n" +
-                "          \"type\": \"keyword\",\n" +
-                "          \"index\": true\n" +
-                "        },\n" +
-                "        \"keywords\": {\n" +
-                "          \"type\": \"text\",\n" +
-                "          \"analyzer\": \"ik_max_word\",\n" +
-                "          \"search_analyzer\": \"ik_smart\"\n" +
-                "        },\n" +
-                "        \"content\": {\n" +
-                "          \"type\": \"text\",\n" +
-                "          \"analyzer\": \"ik_max_word\",\n" +
-                "          \"search_analyzer\": \"ik_smart\"\n" +
-                "        }\n" +
-                "      }\n" +
-                "    },\n" +
-                "    \"suggestions\": {\n" +
-                "      \"type\": \"text\",\n" +
-                "      \"analyzer\": \"ik_max_word\",\n" +
-                "      \"search_analyzer\": \"ik_smart\"\n" +
-                "    },\n" +
-                "    \"userId\": {\n" +
-                "      \"type\": \"keyword\",\n" +
-                "      \"index\": true\n" +
-                "    },\n" +
-                "    \"timestamp\": {\n" +
-                "      \"type\": \"date\",\n" +
-                "      \"format\": \"yyyy-MM-dd HH:mm:ss||yyyy-MM-dd'T'HH:mm:ss||yyyy-MM-dd'T'HH:mm:ss.SSS||yyyy-MM-dd'T'HH:mm:ss.SSS'Z'||epoch_millis\"\n" +
-                "    }\n" +
-                "  }\n" +
-                "}";
-    }
-}

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

@@ -1,27 +0,0 @@
-package com.xboe.module.boecase.task;
-
-import com.xboe.module.boecase.service.ICaseKnowledgeService;
-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;
-
-@Component
-@Slf4j
-public class CaseDocumentLogTask {
-
-    @Autowired
-    private ICaseKnowledgeService caseKnowledgeService;
-
-    /**
-     * 批量查询文件状态并修改
-     * 目前每次查看10条数据，批处理拟每10秒一次，每分钟可运行6次，60条数据
-     * cron: 0/10 * * * * ?
-     */
-    @XxlJob("batchCheckFileStatusJob")
-    public void batchCheckFileStatusJob() {
-//        log.info("开始批量查询文件状态");
-        caseKnowledgeService.batchCheckFileStatus();
-//        log.info("结束批量查询文件状态");
-    }
-}

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

@@ -1,168 +0,0 @@
-package com.xboe.module.boecase.task;
-
-import com.xboe.constants.CaseAiConstants;
-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;
-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;
-
-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;
-
-/**
- * 旧案例上传
- */
-@Component
-@Slf4j
-public class CaseUploadTask {
-
-    @Resource
-    private CasesDao casesDao;
-
-    @Resource
-    private CaseDocumentLogDao caseDocumentLogDao;
-
-    @Autowired
-    private CaseAiDocumentAsyncHandler caseAiDocumentAsyncHandler;
-
-    @Autowired
-    private StringRedisTemplate stringRedisTemplate;
-
-    private static final String CASE_UPLOAD_LAST_ID_KEY = "case:upload:last:id";
-
-    @XxlJob("oldDataUploadJob")
-    public void oldDataUploadJob() {
-        String currentLastId = null;
-        try {
-//            log.info("开始执行旧案例上传任务");
-
-            // 从Redis获取上次处理的最后一条记录ID
-            String lastProcessedId = stringRedisTemplate.opsForValue().get(CASE_UPLOAD_LAST_ID_KEY);
-//            log.info("上次处理的最后一条记录ID: {}", lastProcessedId);
-
-            // 查询符合条件的案例数据
-            List<Cases> casesToProcess = findCasesToProcess(lastProcessedId);
-//            log.info("查询到待处理案例数量: {}", casesToProcess.size());
-
-            if (casesToProcess.isEmpty()) {
-//                log.info("没有需要处理的案例数据");
-                return;
-            }
-            currentLastId = casesToProcess.get(casesToProcess.size() - 1).getId();
-
-            // 批量检查这些案例是否已在CaseDocumentLog中存在记录，提升性能
-            List<String> caseIds = new ArrayList<>();
-            for (Cases cases : casesToProcess) {
-                caseIds.add(cases.getId());
-            }
-
-            // 一次性查询所有相关案例的记录
-            List<CaseDocumentLog> existingLogs = caseDocumentLogDao.getGenericDao()
-                    .findList(CaseDocumentLog.class,
-                            com.xboe.core.orm.FieldFilters.in("caseId", caseIds));
-
-            // 过滤出未在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;
-                            })) {
-                    casesList.add(cases);
-                }
-            }
-
-//            log.info("过滤后需要处理的案例数量: {}", casesList.size());
-
-            if (!casesList.isEmpty()) {
-                // 调用异步处理方法
-                caseAiDocumentAsyncHandler.process(CaseDocumentLogOptTypeEnum.CREATE, casesList.toArray(new Cases[0]));
-
-            } else {
-                log.info("没有新的案例需要处理");
-            }
-            // 将当前处理的最后一条数据ID存入Redis
-
-//            log.info("旧案例上传任务执行完成");
-        } catch (Exception e) {
-            log.error("执行旧案例上传任务时发生异常", e);
-        } finally {
-            if (currentLastId != null) {
-                fixOnLastCase(currentLastId);
-            }
-        }
-    }
-
-    /**
-     * 查询需要处理的案例数据
-     *
-     * @param lastProcessedId 上次处理的最后一条记录ID
-     * @return 案例列表
-     */
-    private List<Cases> findCasesToProcess(String lastProcessedId) {
-        com.xboe.core.orm.QueryBuilder queryBuilder = com.xboe.core.orm.QueryBuilder.from(Cases.class);
-        queryBuilder.addFilter(com.xboe.core.orm.FieldFilters.eq("deleted", false));
-        // 只处理有文件路径的案例
-        queryBuilder.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(com.xboe.core.orm.FieldFilters.gt("id", lastProcessedId));
-        }
-        
-        // 按创建时间升序排序
-        queryBuilder.addOrder(com.xboe.common.OrderCondition.asc("id"));
-        // 限制每次处理的数量，避免一次性处理太多数据
-        queryBuilder.setPageSize(100);
-        
-        return casesDao.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 Long durationSeconds;
-
     /**
      * 案例引用列表
      */

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

@@ -1,10 +1,7 @@
 package com.xboe.module.boecase.vo;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
 
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -28,18 +25,6 @@ public class CaseReferVo {
      */
     private String authorName;
 
-    /**
-     * 组织信息
-     */
-    private String orgInfo;
-
-    /**
-     * 上传时间
-     */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private LocalDateTime uploadTime;
-
     /**
      * 关键词列表
      */

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/CourseFullTextApi.java

@@ -12,6 +12,8 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.xboe.api.ThirdApi;
 import com.xboe.data.outside.IOutSideDataService;
+import com.xboe.module.course.entity.CourseTag;
+import com.xboe.module.course.service.*;
 import com.xboe.module.course.vo.TeacherVo;
 import com.xboe.school.study.entity.StudyCourse;
 import com.xboe.school.study.service.IStudyCourseService;
@@ -34,11 +36,6 @@ import com.xboe.module.course.dto.CourseTeacherDto;
 import com.xboe.module.course.entity.Course;
 import com.xboe.module.course.entity.CourseCrowd;
 import com.xboe.module.course.entity.CourseTeacher;
-import com.xboe.module.course.service.CourseToCourseFullText;
-import com.xboe.module.course.service.ICourseContentService;
-import com.xboe.module.course.service.ICourseFullTextSearch;
-import com.xboe.module.course.service.ICourseService;
-import com.xboe.module.course.service.ICourseTeacherService;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -63,7 +60,8 @@ public class CourseFullTextApi  extends ApiBaseController{
 	ICourseFullTextSearch fullTextSearch;
 	@Resource
 	IOrganizationService organizationService;
-
+	@Autowired
+	ICourseTagService courseTagService;
 	@Resource
 	IStudyCourseService IStudyCourseService;
 
@@ -310,7 +308,18 @@ public class CourseFullTextApi  extends ApiBaseController{
 		}
 
 		paras.setDevice(dto.getDevice());
-
+		String tagIds = dto.getTags();
+		if (tagIds != null && tagIds != ""){
+			paras.setTags(tagIds);
+		}else {
+			String tagName = paras.getKeywords();
+			if (tagName != null && tagName != ""){
+				CourseTag courseTag = courseTagService.getTagByName(tagName);
+				if (courseTag != null){
+					paras.setTags(courseTag.getId().toString()+",");
+				}
+			}
+		}
 		try {
 			//后续会根据当前用户的资源归属查询
 			PageList<CourseFullText> coursePageList = fullTextSearch.search(ICourseFullTextSearch.DEFAULT_INDEX_NAME,pager.getStartRow(), pager.getPageSize(),paras);

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

@@ -2,16 +2,15 @@
 
 import java.io.OutputStream;
 import java.util.*;
-import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.boe.feign.api.infrastructure.entity.CommonSearchVo;
-import com.boe.feign.api.infrastructure.entity.Dict;
 import com.xboe.api.ThirdApi;
 import com.xboe.module.course.dto.*;
+import com.xboe.module.course.entity.*;
+import com.xboe.module.course.service.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -31,19 +30,6 @@ 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;
@@ -94,10 +80,10 @@ public class CourseManageApi extends ApiBaseController{
 	
 	@Resource
 	private ICourseHRBPAuditService hrbpAuditService;
-	
+	@Resource
+	private ICourseTagService tagService;
 	@Resource
 	IOutSideDataService outSideDataService;
-	
 	@Autowired
     IDataUserSyncService userSyncService;
 	@Resource
@@ -172,48 +158,23 @@ public class CourseManageApi extends ApiBaseController{
 		List<CourseSection> sectionlist=sectionService.getByCourseId(id);
 		List<CourseTeacher> teachers=courseService.findTeachersByCourseId(id);
 		List<CourseCrowd> crowds=courseService.findCrowdByCourseId(id);
-
-        CommonSearchVo searcher = new CommonSearchVo();
-        searcher.setPid(637L);
-        searcher.setType(1);
-		List<Dict> dictList = thirdApi.getDictItems(searcher);
-		boolean isPermission = false;
-        if(dictList != null && dictList.size() > 0){
-			List<String> dicts =  dictList.stream().map(Dict::getValue).collect(Collectors.toList());
-			isPermission = dicts.contains(course.getOrgId());
-			rs.put("dicts",dicts);
+		if (StringUtils.isNotBlank(course.getTags())){
+			List<CourseTag> tagList = tagService.getTagsByIds(course.getTags());
+			rs.put("tagList", tagList);
 		}
-		log.error("-------是否仅内网查看 = " + isPermission);
+
+
 		rs.put("course",course);
 		rs.put("contents",cclist);
 		rs.put("sections",sectionlist);
 		rs.put("teachers",teachers);
 		rs.put("crowds",crowds);
-		rs.put("isPermission",isPermission);
-
 
 		
 		return success(rs);
 		
 	}
-	@GetMapping("/getDictIds")
-	public JsonResponse<Map<String,Object>> getDictIds(Long pid,Integer type){
-		CommonSearchVo searcher = new CommonSearchVo();
-		if(pid==null || type ==null){
-			return badRequest("参数错误");
-		}
-		Map<String,Object> rs=new HashMap<String,Object>();
-		searcher.setPid(pid);
-		searcher.setType(type);
-		List<Dict> dictList = thirdApi.getDictItems(searcher);
-		rs.put("dicts",null);
-		if(dictList != null && dictList.size() > 0){
-			List<String> dicts =  dictList.stream().map(Dict::getValue).collect(Collectors.toList());
-			rs.put("dicts",dicts);
-		}
-		return success(rs);
-	}
-
+	
 	/**
 	 * 管理员审核列表，教师的审核不在这里，此审核也应该移动CourseAuditApi中去
 	 * @param pager

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

@@ -0,0 +1,173 @@
+package com.xboe.module.course.api;
+
+import com.xboe.common.OrderCondition;
+import com.xboe.common.PageList;
+import com.xboe.common.Pagination;
+import com.xboe.core.CurrentUser;
+import com.xboe.core.JsonResponse;
+import com.xboe.core.api.ApiBaseController;
+import com.xboe.core.orm.FieldFilters;
+import com.xboe.core.orm.IFieldFilter;
+import com.xboe.module.article.entity.Article;
+import com.xboe.module.article.service.IArticleService;
+import com.xboe.module.course.dto.CourseTagQueryDto;
+import com.xboe.module.course.dto.CourseTagRelationDto;
+import com.xboe.module.course.entity.CourseTag;
+import com.xboe.module.course.entity.CourseTagRelation;
+import com.xboe.module.course.service.ICourseTagService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @ClassName:CourseTagApi
+ * @author:zhengge@oracle.com
+ * @since:2025/7/2614:27
+ */
+@Slf4j
+@RestController
+@RequestMapping(value="/xboe/m/coursetag")
+public class CourseTagApi extends ApiBaseController {
+
+    @Resource
+    ICourseTagService courseTagService;
+
+    /**
+     * 标签列表：分页查询
+     * @param pager
+     * @param courseTagQueryDto
+     * @return
+     */
+    @RequestMapping(value="/page",method= {RequestMethod.GET,RequestMethod.POST})
+    public JsonResponse<PageList<CourseTag>> find(Pagination pager, CourseTagQueryDto courseTagQueryDto){
+        List<IFieldFilter> filters=new ArrayList<IFieldFilter>();
+        OrderCondition order = null;
+        if (courseTagQueryDto != null){
+            String tagId = courseTagQueryDto.getId();
+            String tagName = courseTagQueryDto.getTagName();
+            Boolean isHot = courseTagQueryDto.getIsHot();
+            String orderField = courseTagQueryDto.getOrderField();
+            Boolean isAsc = courseTagQueryDto.getOrderAsc();
+            if (StringUtils.isNotBlank(tagId)){
+                filters.add(FieldFilters.eq("id",tagId));
+            }
+            //课程标签名称:模糊查询
+            if (StringUtils.isNotBlank(tagName)){
+                filters.add(FieldFilters.like("tagName",tagName));
+            }
+            // 构建排序条件：支持先按lastSetHotTime降序，再按动态字段升/降序排列‌
+            if (isHot !=null ){
+                filters.add(FieldFilters.eq("isHot",isHot));
+                //order = OrderCondition.desc("lastSetHotTime");//固定降序
+            }
+            // 动态排序处理
+            if (StringUtils.isNotBlank(orderField)) {
+                if (order == null) {
+                    order = isAsc ?  OrderCondition.asc(orderField) : OrderCondition.desc(orderField);
+                } else {
+                    order = isAsc ? order.asc(orderField) : order.desc(orderField); // 链式追加排序条件
+                }
+            }
+        }
+        PageList<CourseTag> list=courseTagService.query(pager.getPageIndex(),pager.getPageSize(),filters,order);
+        return success(list);
+    }
+
+    /**
+     * 修改指定id的课程标签的公共属性
+     * @param id
+     * @param isPublic
+     * @return
+     */
+    @RequestMapping(value="/changePublicStatus",method= RequestMethod.POST)
+    public JsonResponse<Void> changePublicStatus(Long id,Boolean isPublic){
+        courseTagService.changePublicStatus(id,isPublic);
+        return success(null);
+    }
+
+    /**
+     * 修改指定id的课程标签的热点属性
+     * @param id
+     * @param isHot
+     * @return
+     */
+    @RequestMapping(value="/changeHotStatus",method= RequestMethod.POST)
+    public JsonResponse<Boolean> changeHotStatus(Long id,Boolean isHot){
+        return courseTagService.changeHotStatus(id,isHot);
+    }
+
+    /**
+     * 分页查询：指定id的标签关联的所有课程
+     * @param courseTagQueryDto
+     * @return
+     */
+    @RequestMapping(value="/showCourseByTag",method= RequestMethod.POST)
+    public JsonResponse<PageList<CourseTagRelationDto>> showCourseByTag(Pagination pager, CourseTagQueryDto courseTagQueryDto){
+        PageList<CourseTagRelationDto> list=null;
+        if (courseTagQueryDto != null) {
+            Long tagId = Long.valueOf(courseTagQueryDto.getId());
+            Boolean isAsc = courseTagQueryDto.getOrderAsc()!=null?courseTagQueryDto.getOrderAsc():false;
+            list=courseTagService.getCourseByTag(pager.getPageIndex(),pager.getPageSize(),tagId,isAsc);
+        }
+        return success(list);
+    }
+
+    /**
+     * 解除指定id的课程和某个标签之间的关联关系
+     * @return
+     */
+    @RequestMapping(value="/unbind",method= RequestMethod.POST)
+    public JsonResponse<Void> unbindCourseTagRelation(CourseTagRelationDto courseTagRelationDto){
+        if (courseTagRelationDto!=null){
+            courseTagService.unbind(courseTagRelationDto.getId());
+            return success(null);
+        }
+        return error("解绑失败！");
+    }
+
+    /**
+     * 模糊检索标签
+     * @return 符合检索条件的所有公共标签
+     */
+    @RequestMapping(value="/searchTags",method= RequestMethod.POST)
+    public JsonResponse<List<CourseTag>> searchTags(String tagName){
+        if (StringUtils.isNotBlank(tagName)){
+            List<CourseTag> courseTagList = courseTagService.searchTags(tagName);
+            return success(courseTagList);
+        }
+        return error("服务器端异常！");
+    }
+
+    /**
+     * 创建新标签,并与当前课程绑定
+     * @param courseTagRelationDto
+     * @return
+     */
+    @RequestMapping(value="/createTag",method= RequestMethod.POST)
+    public JsonResponse<CourseTag> createTag(CourseTagRelationDto courseTagRelationDto){
+        if (courseTagRelationDto!=null){
+            CourseTag courseTag = courseTagService.createTag(courseTagRelationDto);
+            return success(courseTag);
+        }
+        return error("创建标签失败！");
+    }
+
+    /**
+     * 创建新标签,并与当前课程绑定
+     * @param courseTagRelationDto
+     * @return
+     */
+    @RequestMapping(value="/getHotTagList",method= RequestMethod.POST)
+    public JsonResponse<List<CourseTag>> getHotTagList(CourseTagRelationDto courseTagRelationDto){
+            List<CourseTag> hotTagList = courseTagService.getHotTagList(courseTagRelationDto);
+            return success(hotTagList);
+    }
+
+}

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

@@ -0,0 +1,107 @@
+package com.xboe.module.course.dao;
+
+import com.xboe.common.OrderCondition;
+import com.xboe.common.PageList;
+import com.xboe.core.SysConstant;
+import com.xboe.core.orm.BaseDao;
+import com.xboe.core.orm.FieldFilters;
+import com.xboe.core.orm.IFieldFilter;
+import com.xboe.core.orm.IQuery;
+import com.xboe.module.course.entity.Course;
+import com.xboe.module.course.entity.CourseFile;
+import com.xboe.module.course.entity.CourseTag;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.stereotype.Repository;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.Query;
+import java.util.List;
+
+/**
+ * @ClassName:CourseTagDao
+ * @author:zhengge@oracle.com
+ * @since:2025/7/2516:50
+ */
+@Repository
+public class CourseTagDao extends BaseDao<CourseTag> {
+    @PersistenceContext
+    private EntityManager entityManager;
+
+    /**
+     * 获取热门标签列表(前10条)
+     * @return 热门标签列表
+     */
+    public List<CourseTag> getHotTagList() {
+            // 原生SQL：注意表名和列名需与数据库实际一致
+            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\n" +
+                    "where t.is_hot = true\n" +
+                    "GROUP BY t.id\n" +
+                    "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);
+
+            // 分页：取前10条
+            query.setFirstResult(0);
+            query.setMaxResults(10);
+
+            // 执行查询并返回结果（已映射为CourseTag类型）
+            return query.getResultList();
+    }
+
+    /**
+     * 根据课程类型获取热门标签列表(前10条)
+     * @param sysType1 系统类型1
+     * @param sysType2 系统类型2
+     * @param sysType3 系统类型3
+     * @return 热门标签列表
+     */
+    public List<CourseTag> getHotTagListBySysTypes(String sysType1, String sysType2, String sysType3) {
+        // 原生SQL：注意表名和列名需与数据库实际一致（此处假设表名为course_tag、course_type_tag_relation）
+        String sql = "SELECT DISTINCT c.* FROM boe_course_tag c " +
+                "JOIN boe_course_type_tag_relation r ON c.id = r.tag_id " +
+                "WHERE r.deleted = 0 " +
+                "AND c.is_hot = true ";  // 假设数据库字段为is_hot（与实体属性isHot对应）
+        if (StringUtils.isNotBlank(sysType1)){
+            sql += "AND r.sys_type1 = ?1 ORDER BY c.last_set_hot_time DESC";
+        }else if(StringUtils.isNotBlank(sysType2)){
+            sql += "AND r.sys_type2 = ?1 ORDER BY c.last_set_hot_time DESC";
+        }else {
+            sql += "AND r.sys_type3 = ?1 ORDER BY c.last_set_hot_time DESC";
+        }
+        // 创建原生查询并指定结果映射到CourseTag实体
+        javax.persistence.Query query = entityManager.createNativeQuery(sql, CourseTag.class);
+
+        // 绑定参数（注意参数索引从1开始）
+        if (StringUtils.isNotBlank(sysType1)){
+            query.setParameter(1, sysType1);
+        } else if (StringUtils.isNotBlank(sysType2)) {
+            query.setParameter(1, sysType2);
+        }else {
+            query.setParameter(1, sysType3);
+        }
+        // 分页：取前10条
+        query.setFirstResult(0);
+        query.setMaxResults(10);
+
+        // 执行查询并返回结果（已映射为CourseTag类型）
+        return query.getResultList();
+    }
+
+    public List<CourseTag> getTagsByIds(String id) {
+        String sql = "select * from " + SysConstant.TABLE_PRE + "course_tag where id in (" + id + "0)";
+        // 创建原生查询并指定结果映射到CourseTag实体
+        javax.persistence.Query query = entityManager.createNativeQuery(sql, CourseTag.class);
+        return query.getResultList();
+    }
+
+    public CourseTag getTagByName(String tagName) {
+        CourseTag courseTag = this.findOne((FieldFilters.eq("tag_name", tagName)));
+        return courseTag;
+    }
+}

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

@@ -0,0 +1,124 @@
+package com.xboe.module.course.dao;
+
+import com.xboe.common.PageList;
+import com.xboe.core.orm.BaseDao;
+import com.xboe.module.course.dto.CourseTagRelationDto;
+import com.xboe.module.course.entity.CourseTagRelation;
+import org.springframework.stereotype.Repository;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.Query;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @ClassName:CourseTagRelationDao
+ * @author:zhengge@oracle.com
+ * @since:2025/7/2815:09
+ */
+@Repository
+public class CourseTagRelationDao extends BaseDao<CourseTagRelation> {
+
+    @PersistenceContext
+    private EntityManager entityManager;
+
+    private String sqlStr = "SELECT " +
+            "    r1.id as id, " +
+            "    c.id as courseId, " +
+            "    r1.tag_id as tagId, " +
+            "    c.`name` as courseName, " +
+            "    r1.sys_create_by as sysCreateBy, " +
+            "    r1.sys_create_time as sysCreateTime, " +
+            "    COALESCE(GROUP_CONCAT(DISTINCT t.tag_name ORDER BY t.tag_name), '') AS otherTags " +
+            "FROM " +
+            "    boe_course c " +
+            "JOIN " +
+            "    boe_course_tag_relation r1 ON c.id = r1.course_id " +
+            "LEFT JOIN " +
+            "    ( " +
+            "        boe_course_tag_relation r2 " +
+            "        JOIN boe_course_tag t ON r2.tag_id = t.id AND t.deleted = 0 " +
+            "    ) " +
+            "    ON c.id = r2.course_id AND r2.tag_id != r1.tag_id " +
+            "WHERE " +
+            "    r1.tag_id = :tagId AND r1.deleted = 0 " +
+            "    AND c.id IN ( " +
+            "        SELECT course_id " +
+            "        FROM boe_course_tag_relation " +
+            "        WHERE tag_id = :tagId " +
+            "    ) " +
+            "GROUP BY " +
+            "    c.id, c.`name` ";
+
+    public PageList<CourseTagRelationDto> findCoursesWithRelatedTagsDesc(Integer pageIndex, Integer pageSize, Long tagId){
+        String sql = sqlStr + " ORDER BY r1.sys_create_time DESC";
+        Query query = entityManager.createNativeQuery(sql);
+        query.setParameter("tagId", tagId);
+        query.setFirstResult((pageIndex - 1) * pageSize); // 设置起始位置
+        query.setMaxResults(pageSize); // 设置每页大小
+
+        Query countQuery = entityManager.createNativeQuery(sql);
+        countQuery.setParameter("tagId", tagId);
+        List<Object[]> totalresults = countQuery.getResultList();
+
+        List<Object[]> results = query.getResultList();
+        List<CourseTagRelationDto> list = results.stream()
+                .map(row -> {
+                    String id = String.valueOf(row[0]);
+                    String courseId = String.valueOf(row[1]);
+                    String tagId2 = String.valueOf(row[2]);
+                    return new CourseTagRelationDto(
+                            id,
+                            courseId,
+                            tagId2,
+                            (String) row[3],
+                            (String) row[4],
+                            (Date) row[5],
+                            (String) row[6]
+                    );
+                })
+                .collect(Collectors.toList());
+        return new PageList<CourseTagRelationDto>(list,totalresults!=null?totalresults.size():0);
+    }
+
+    public PageList<CourseTagRelationDto> findCoursesWithRelatedTagsAsc(Integer pageIndex, Integer pageSize, Long tagId) {
+        String sql = sqlStr + " ORDER BY r1.sys_create_time ASC";
+        Query query = entityManager.createNativeQuery(sql);
+        query.setParameter("tagId", tagId);
+        query.setFirstResult((pageIndex - 1) * pageSize); // 设置起始位置
+        query.setMaxResults(pageSize); // 设置每页大小
+
+        Query countQuery = entityManager.createNativeQuery(sql);
+        countQuery.setParameter("tagId", tagId);
+        List<Object[]> totalresults = countQuery.getResultList();
+
+        List<Object[]> results = query.getResultList();
+        List<CourseTagRelationDto> list = results.stream()
+                .map(row ->{
+                    String id = String.valueOf(row[0]);
+                    String courseId = String.valueOf(row[1]);
+                    String tagId2 = String.valueOf(row[2]);
+                    return new CourseTagRelationDto(
+                            id,
+                            courseId,
+                            tagId2,
+                            (String) row[3],
+                            (String) row[4],
+                            (Date) row[5],
+                            (String) row[6]
+                    );
+                        })
+                .collect(Collectors.toList());
+        return new PageList<CourseTagRelationDto>(list,totalresults!=null?totalresults.size():0);
+    }
+
+    public boolean countHotTags() {
+        String sql = "SELECT COUNT(*) FROM boe_course_tag WHERE is_hot = 1";
+        Query query = entityManager.createNativeQuery(sql);
+        Object result = query.getSingleResult();
+        long count = Long.parseLong(result.toString());
+        return   count >= 10;
+    }
+}

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

@@ -0,0 +1,17 @@
+package com.xboe.module.course.dao;
+
+import com.xboe.core.orm.BaseDao;
+import com.xboe.module.course.entity.CourseTagRelation;
+import com.xboe.module.course.entity.CourseTypeTagRelation;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @ClassName:CourseTypeTagRelationDao
+ * @author:zhengge@oracle.com
+ * @since:2025/8/113:42
+ */
+@Repository
+public class CourseTypeTagRelationDao extends BaseDao<CourseTypeTagRelation> {
+
+
+}

servers/boe-server-all/src/main/java/com/xboe/module/course/dto/CourseQueryDto.java

@@ -140,4 +140,5 @@ public class CourseQueryDto {
      */
     private String userId;
 
+    private String tags;
 }

servers/boe-server-all/src/main/java/com/xboe/module/course/dto/CourseTagQueryDto.java

@@ -0,0 +1,40 @@
+package com.xboe.module.course.dto;
+
+import lombok.Data;
+
+/**
+ * 课程标签查询的条件对象
+ * @ClassName:CourseTagQueryDto
+ * @author:zhengge@oracle.com
+ * @since:2025/7/2517:02
+ */
+@Data
+public class CourseTagQueryDto {
+
+    /**
+     * 标签id
+     */
+    private String id;
+
+    /**
+     * 标签名称
+     */
+    private String tagName;
+
+
+    /**
+     * 是否热点标签（ 0-否(默认) 1-是）
+     */
+    private Boolean isHot;
+
+    /**
+     * 排序字段
+     */
+    private String orderField;
+
+    /**
+     * 排序顺序
+     */
+    private Boolean orderAsc;
+
+}

servers/boe-server-all/src/main/java/com/xboe/module/course/dto/CourseTagRelationDto.java

@@ -0,0 +1,49 @@
+package com.xboe.module.course.dto;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * @ClassName:CourseTagRelationDto
+ * @author:zhengge@oracle.com
+ * @since:2025/7/2815:00
+ */
+@Data
+@NoArgsConstructor
+public class CourseTagRelationDto{
+
+    private String id;
+    private String courseId;
+    private String tagId;
+    private String tagName;
+    private String courseName;
+    private String sysCreateBy;
+    private Date sysCreateTime;
+    private String otherTags; // 改为字符串类型，与 GROUP_CONCAT 结果匹配
+    private String sysType1;
+    private String sysType2;
+    private String sysType3;
+
+    // 添加匹配查询字段顺序的构造函数
+    public CourseTagRelationDto(
+            String id,
+            String courseId,
+            String tagId,
+            String courseName,
+            String sysCreateBy,
+            Date sysCreateTime,
+            String otherTags
+    ) {
+        this.id = id;
+        this.courseId = courseId;
+        this.tagId = tagId;
+        this.courseName = courseName;
+        this.sysCreateBy = sysCreateBy;
+        this.sysCreateTime = sysCreateTime;
+        this.otherTags = otherTags;
+    }
+}

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

@@ -33,10 +33,7 @@ public class Course extends BaseEntity {
     
     /**所有的设备*/
     public static int DEVICE_ALL=3;
-
-    /**仅内网*/
-    public static int DEVICE_INTERNAL=4;
-
+    
     /**未提交，草稿*/
     public static final int STATUS_NONE=1;
     

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

@@ -0,0 +1,92 @@
+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.Table;
+import java.time.LocalDateTime;
+
+/**
+ * 在线课程的标签类
+ * @ClassName:CourseTag
+ * @author:zhengge@oracle.com
+ * @since:2025/7/25 16:37
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Entity
+@Table(name = SysConstant.TABLE_PRE+"course_tag")
+public class CourseTag extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 标签名称
+     */
+    @Column(name = "tag_name",nullable=false, length = 50)
+    private String tagName;
+
+    /**
+     * 是否设置为公共标签
+     */
+    @Column(name = "is_public",length = 1)
+    private Boolean isPublic;
+
+    /**
+     * 是否设置为热点标签
+     */
+    @Column(name = "is_hot",length = 1)
+    private Boolean isHot;
+
+    /**
+     * 使用次数(关联课程数)
+     */
+    @Column(name = "use_count",length = 1)
+    private Integer useCount;
+
+    /**
+     * 最近设置为公共标签的时间
+     */
+    @Column(name = "last_set_public_time", nullable = true)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime lastSetPublicTime;
+
+    /**
+     * 最近设置为热点标签的时间
+     */
+    @Column(name = "last_set_hot_time", nullable = true)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime lastSetHotTime;
+
+    public CourseTag() {
+
+    }
+    public CourseTag(Long id, Boolean isPublic,Boolean isHot) {
+        this.setId(String.valueOf(id));
+        this.isPublic=isPublic;
+        this.isHot=isHot;
+    }
+
+
+    public CourseTag(String id,String tagName,String sysCreateBy,String sysCreateAid,LocalDateTime sysCreateTime,
+                     Boolean isPublic,Boolean isHot,Integer useCount,LocalDateTime lastSetPublicTime,LocalDateTime lastSetHotTime,Boolean deleted){
+        this.setId(id);
+        this.setTagName(tagName);
+        super.setSysCreateBy(sysCreateBy);
+        super.setSysCreateAid(sysCreateAid);
+        super.setSysCreateTime(sysCreateTime);
+        this.isPublic = isPublic;
+        this.isHot = isHot;
+        this.useCount = useCount;
+        this.lastSetPublicTime = lastSetPublicTime;
+        this.lastSetHotTime = lastSetHotTime;
+        super.setDeleted(deleted);
+    }
+
+
+}

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

@@ -0,0 +1,37 @@
+package com.xboe.module.course.entity;
+
+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.Table;
+
+/**
+ * @ClassName:CourseTagRelation
+ * @author:zhengge@oracle.com
+ * @since:2025/7/2814:54
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Entity
+@Table(name = SysConstant.TABLE_PRE+"course_tag_relation")
+public class CourseTagRelation extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 课程Id
+     */
+    @Column(name = "course_id",length = 20)
+    private Long courseId;
+
+    /**
+     * 标签id
+     */
+    @Column(name = "tag_id",length = 20)
+    private Long tagId;
+
+}

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

@@ -0,0 +1,39 @@
+package com.xboe.module.course.entity;
+
+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.Table;
+
+/**
+ * @ClassName:CourseTypeTagRelation
+ * @author:zhengge@oracle.com
+ * @since:2025/8/111:02
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Entity
+@Table(name = SysConstant.TABLE_PRE+"course_type_tag_relation")
+public class CourseTypeTagRelation extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @Column(name = "sys_type1",length = 20)
+    private String sysType1;
+
+    @Column(name = "sys_type2",length = 20)
+    private String sysType2;
+
+    @Column(name = "sys_type3",length = 20)
+    private String sysType3;
+
+    @Column(name = "tag_id",length = 20)
+    private String tagId;
+
+
+
+}

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

@@ -52,6 +52,7 @@ public class CourseToCourseFullText {
 		cft.setTeacher("");
 		cft.setTeacherCode("");
 		cft.setType(c.getType());
+		cft.setTags(c.getTags());
 		if(c.getOpenCourse()==null) {
 			cft.setOpenCourse(0);
 		}else {

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

@@ -0,0 +1,89 @@
+package com.xboe.module.course.service;
+
+import com.xboe.common.OrderCondition;
+import com.xboe.common.PageList;
+import com.xboe.core.JsonResponse;
+import com.xboe.core.orm.IFieldFilter;
+import com.xboe.module.course.dto.CourseTagRelationDto;
+import com.xboe.module.course.entity.CourseTag;
+
+import java.util.List;
+
+/**
+ * @InterfaceName:ICourseTagService
+ * @author:zhengge@oracle.com
+ * @since:2025/7/2516:53
+ */
+public interface ICourseTagService {
+
+    /**
+     * 分页查询标签列表,使用自定义filter
+     * @param pageIndex
+     * @param pageSize
+     * @return
+     */
+    PageList<CourseTag> query(Integer pageIndex, Integer pageSize, List<IFieldFilter> filters, OrderCondition order);
+
+    /**
+     * 分页查询指定id标签关联的课程列表,使用自定义filter
+     * @param pageIndex
+     * @param pageSize
+     * @return
+     */
+    PageList<CourseTagRelationDto> getCourseByTag(Integer pageIndex, Integer pageSize, Long tagId, Boolean isAsc);
+
+    /**
+     * 修改指定id的课程标签的公共属性
+     * @param id
+     * @param isPublic
+     * @return
+     */
+    void changePublicStatus(Long id,Boolean isPublic);
+
+    /**
+     * 修改指定id的课程标签的热点属性
+     *
+     * @param id
+     * @param isHot
+     * @return
+     */
+    JsonResponse<Boolean> changeHotStatus(Long id, Boolean isHot);
+
+    /**
+     * 解除指定id的课程和某个标签之间的关联关系
+     * @return
+     */
+    void unbind(String id);
+
+    /**
+     * 根据标签名称进行检索(模糊查询)
+     * @param tagName
+     * @return 符合检索条件的所有公共标签
+     */
+    List<CourseTag> searchTags(String tagName);
+
+    /**
+     * 创建新标签,并与当前课程绑定
+     * @param courseTagRelationDto
+     * @return
+     */
+    CourseTag createTag(CourseTagRelationDto courseTagRelationDto);
+
+    /**
+     * 根据课程类型获取热点标签
+     * @param courseTagRelationDto
+     * @return
+     */
+    List<CourseTag> getHotTagList(CourseTagRelationDto courseTagRelationDto);
+
+    /**
+     * 根据多个id获取标签
+     * @param id
+     * @return
+     */
+    List<CourseTag> getTagsByIds(String id);
+
+    CourseTag getTagByName(String tagName);
+
+    void bindTag(String id, String tags);
+}

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

@@ -18,6 +18,7 @@ import javax.management.Query;
 import cn.hutool.core.collection.CollectionUtil;
 import com.xboe.api.ThirdApi;
 import com.xboe.core.orm.*;
+import com.xboe.module.course.service.ICourseTagService;
 import com.xboe.school.study.dao.StudyCourseDao;
 import com.xboe.school.study.entity.StudyCourse;
 import org.apache.commons.lang3.StringUtils;
@@ -98,7 +99,8 @@ public class CourseServiceImpl implements ICourseService {
 
     @Resource
     private CourseHRBPAuditDao courseHRBPAuditDao;
-
+    @Resource
+    private ICourseTagService courseTagService;
 
     @Resource
     private SysLogAuditDao logAuditDao;//审核日志记录
@@ -183,8 +185,6 @@ public class CourseServiceImpl implements ICourseService {
                 filters.add(FieldFilters.in("device", Course.DEVICE_MOBILE, Course.DEVICE_ALL));
             } else if (dto.getDevice() == Course.DEVICE_ALL) {
                 filters.add(FieldFilters.eq("device", Course.DEVICE_ALL));
-            }else if (dto.getDevice() == Course.DEVICE_INTERNAL) {
-                filters.add(FieldFilters.eq("device", Course.DEVICE_INTERNAL));
             }
 
         }
@@ -493,7 +493,7 @@ public class CourseServiceImpl implements ICourseService {
         String sql = "SELECT DISTINCT\n" +
                 "rt.course_id\n" +
                 "FROM\n" +
-                "boe_new.student s INNER JOIN boe_new.router_task rt on s.pid=rt.router_id inner join boe_course c on c.id=rt.course_id\n" +
+                "boe.student s INNER JOIN boe.router_task rt on s.pid=rt.router_id inner join boe_course c on c.id=rt.course_id\n" +
                 "\n" +
                 "WHERE\n" +
                 "\n" +
@@ -516,7 +516,7 @@ public class CourseServiceImpl implements ICourseService {
         String sql = "SELECT DISTINCT\n" +
                 "pt.course_id\n" +
                 "FROM\n" +
-                "boe_new.student s INNER JOIN boe_new.project_task pt on s.pid=pt.project_id inner join boe_course c on c.id=pt.course_id\n" +
+                "boe.student s INNER JOIN boe.project_task pt on s.pid=pt.project_id inner join boe_course c on c.id=pt.course_id\n" +
                 "\n" +
                 "WHERE\n" +
                 "\n" +
@@ -573,8 +573,8 @@ public class CourseServiceImpl implements ICourseService {
         String sql = "SELECT DISTINCT\n" +
                 "\tc.id \n" +
                 "FROM\n" +
-                "\tboe_new.student s\n" +
-                "\tINNER JOIN boe_new.grow_task gt ON s.pid = gt.grow_id\n" +
+                "\tboe.student s\n" +
+                "\tINNER JOIN boe.grow_task gt ON s.pid = gt.grow_id\n" +
                 "\tINNER JOIN boe_course c ON gt.course_id = c.id \n" +
                 "WHERE\n" +
                 "\ts.type = 14 \n" +
@@ -928,6 +928,7 @@ public class CourseServiceImpl implements ICourseService {
                 courseCrowdDao.save(cc);
             }
         }
+
     }
 
     /**
@@ -1024,7 +1025,9 @@ public class CourseServiceImpl implements ICourseService {
             publishUtil.removeByDocId(c.getFullTextId());
 
         }
-
+        // 添加课程对应的标签
+        String tags = full.getCourse().getTags();
+        courseTagService.bindTag(c.getId(), tags);
     }
 
     @Override

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

@@ -0,0 +1,393 @@
+package com.xboe.module.course.service.impl;
+
+import com.xboe.common.OrderCondition;
+import com.xboe.common.PageList;
+import com.xboe.core.JsonResponse;
+import com.xboe.core.orm.FieldFilters;
+import com.xboe.core.orm.IFieldFilter;
+import com.xboe.core.orm.QueryBuilder;
+import com.xboe.module.course.dao.CourseDao;
+import com.xboe.module.course.dao.CourseTagDao;
+import com.xboe.module.course.dao.CourseTagRelationDao;
+import com.xboe.module.course.dao.CourseTypeTagRelationDao;
+import com.xboe.module.course.dto.CourseTagRelationDto;
+import com.xboe.module.course.entity.Course;
+import com.xboe.module.course.entity.CourseTag;
+import com.xboe.module.course.entity.CourseTagRelation;
+import com.xboe.module.course.entity.CourseTypeTagRelation;
+import com.xboe.module.course.service.ICourseTagService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.*;
+
+/**
+ * @ClassName:CourseTagServiceImpl
+ * @author:zhengge@oracle.com
+ * @since:2025/7/2516:55
+ */
+@Slf4j
+@Service
+@Transactional
+public class CourseTagServiceImpl implements ICourseTagService {
+
+    @Resource
+    private CourseTagDao courseTagDao;
+    @Resource
+    PublishCourseUtil publishUtil;
+    @Resource
+    private CourseTagRelationDao courseTagRelationDao;
+    @Resource
+    private CourseTypeTagRelationDao courseTypeTagRelationDao;
+    @Resource
+    private CourseDao courseDao;
+
+    /**
+     * 课程标签分页查询
+     * @param pageIndex
+     * @param pageSize
+     * @param filters
+     * @param order
+     * @return
+     */
+    @Override
+    public PageList<CourseTag> query(Integer pageIndex, Integer pageSize, List<IFieldFilter> filters, OrderCondition order) {
+        QueryBuilder query=QueryBuilder.from(CourseTag.class);
+        query.setPageIndex(pageIndex);
+        query.setPageSize(pageSize);
+        filters.add(FieldFilters.eq("deleted",false));
+        query.addFilters(filters);
+        if(order!=null) {
+            query.addOrder(order);
+        }else {
+            query.addOrder(OrderCondition.desc("sysCreateTime"));
+        }
+        return courseTagDao.findPage(query.builder());
+    }
+
+    /**
+     * 分页查询指定id标签关联的课程
+     * @param pageIndex
+     * @param pageSize
+     * @param tagId
+     * @param isAsc
+     * @return
+     */
+    @Override
+    public PageList<CourseTagRelationDto> getCourseByTag(Integer pageIndex, Integer pageSize, Long tagId, Boolean isAsc) {
+        PageList<CourseTagRelationDto> list = null;
+        if(isAsc) {
+            list =  courseTagRelationDao.findCoursesWithRelatedTagsAsc(pageIndex,pageSize,tagId);
+        }else {
+            list =  courseTagRelationDao.findCoursesWithRelatedTagsDesc(pageIndex,pageSize,tagId);
+        }
+        return list;
+    }
+
+    /**
+     * 修改指定id的课程标签的公共属性
+     * @param id
+     * @param isPublic
+     * @return
+     */
+    @Override
+    public void changePublicStatus(Long id, Boolean isPublic) {
+        CourseTag courseTag = courseTagDao.findOne(FieldFilters.eq("id", String.valueOf(id)));
+        if (courseTag!=null){
+            courseTag.setIsPublic(isPublic);
+            courseTag.setLastSetPublicTime(isPublic?LocalDateTime.now():null);
+            courseTagDao.update(courseTag);
+        }
+    }
+
+    /**
+     * 修改指定id的课程标签的热点属性
+     *
+     * @param id
+     * @param isHot
+     * @return
+     */
+    @Override
+    public JsonResponse<Boolean> changeHotStatus(Long id, Boolean isHot) {
+        // 当标签切换为热点标签时才会判断，超过十个热点标签则禁止设置
+        JsonResponse<Boolean> objectJsonResponse = new JsonResponse<>();
+        if (isHot){
+            if (courseTagRelationDao.countHotTags()){
+                objectJsonResponse.setStatus(400);
+                objectJsonResponse.setMessage("超过十个热点标签，无法进行设置");
+                objectJsonResponse.setResult(false);
+                return objectJsonResponse;
+            }
+        }
+        CourseTag courseTag = courseTagDao.findOne(FieldFilters.eq("id", String.valueOf(id)));
+        if (courseTag!=null){
+            courseTag.setIsHot(isHot);
+            courseTag.setLastSetHotTime(isHot?LocalDateTime.now():null);
+            courseTagDao.update(courseTag);
+        }
+        objectJsonResponse.setStatus(200);
+        objectJsonResponse.setMessage("修改成功");
+        return objectJsonResponse;
+    }
+
+    /**
+     * 解除指定id的课程和某个标签之间的关联关系
+     * @return
+     */
+    @Override
+    public void unbind(String id) {
+        //根据主键查询关联关系
+        CourseTagRelation courseTagRelation = courseTagRelationDao.findOne(FieldFilters.eq("id", id));
+        if (courseTagRelation != null){
+            //修改该标签关联课程数
+            CourseTag courseTag = courseTagDao.findOne(FieldFilters.eq("id", String.valueOf(courseTagRelation.getTagId())));
+            if (courseTag != null){
+                courseTag.setUseCount(courseTag.getUseCount()>1?courseTag.getUseCount()-1:0);
+                courseTagDao.updateFieldById(courseTag.getId(),"useCount",courseTag.getUseCount());
+            }
+            //解绑(删除关联关系)
+            courseTagRelationDao.setDeleted(id);
+            Course course = courseDao.get(courseTagRelation.getCourseId().toString());
+            String tags = course.getTags();
+            if (StringUtils.isNotBlank(tags)){
+                String[] tagIds = tags.split(",");
+                List<String> tagIdList = new ArrayList<>();
+                for (String tagId : tagIds){
+                    if (!tagId.equals(courseTagRelation.getTagId().toString())){
+                        tagIdList.add(tagId);
+                    }
+                }
+                // 数据格式:1,2,3
+                String s = StringUtils.join(tagIdList, ",");
+                if (!"".equals(s)){
+                    s+=",";
+                }
+                course.setTags(s);
+            }
+            // 同步ES
+            publishUtil.fullTextPublish(course);
+        }
+    }
+
+    /**
+     * 根据标签名称进行检索(模糊查询)
+     * @param tagName
+     * @return 符合检索条件的所有公共标签
+     */
+    @Override
+    public List<CourseTag> searchTags(String tagName){
+        QueryBuilder query=QueryBuilder.from(CourseTag.class);
+        List<IFieldFilter> filters = new ArrayList<>();
+        filters.add(FieldFilters.eq("deleted",false));//未删除
+        filters.add(FieldFilters.eq("isPublic",true));//公共标签
+        filters.add(FieldFilters.like("tagName",tagName));//模糊检索
+        query.addFilters(filters);
+        List<CourseTag> courseTagList = courseTagDao.findList(query.builder());
+        return courseTagList;
+    }
+
+    /**
+     * 创建新标签,并与指定课程绑定
+     * @param courseTagRelationDto
+     * @return
+     */
+    @Override
+    public CourseTag createTag(CourseTagRelationDto courseTagRelationDto) {
+        CourseTag courseTag = null;
+        String tagName = courseTagRelationDto.getTagName();
+        Long courseId = Long.valueOf(courseTagRelationDto.getCourseId());
+        //1.创建标签：先判断是否已经存在该标签
+        QueryBuilder query=QueryBuilder.from(CourseTag.class);
+        List<IFieldFilter> filters = new ArrayList<>();
+        filters.add(FieldFilters.eq("tagName",tagName));//精确匹配
+        query.addFilters(filters);
+        List<CourseTag> courseTagList = courseTagDao.findList(query.builder());
+        if (courseTagList==null || courseTagList.size()==0){//1.1 如果该标签不存在，则新建标签
+            courseTag = new CourseTag();
+            courseTag.setTagName(tagName);
+            courseTag.setIsPublic(false);
+            courseTag.setIsHot(false);
+            courseTag.setUseCount(1);
+            courseTagDao.save(courseTag);
+            //新建一条标签和课程的关联关系
+            CourseTagRelation courseTagRelation = new CourseTagRelation();
+            courseTagRelation.setTagId(Long.valueOf(courseTag.getId()));
+            courseTagRelation.setCourseId(courseId);
+            courseTagRelationDao.save(courseTagRelation);
+        }else {//1.2 否则修改标签
+            courseTag=courseTagList.get(0);
+            // 当同一标签被3个及以上课管创建时，默认开启这个标签的公共化
+            if(courseTag.getUseCount() >= 3){
+                courseTag.setIsPublic(true);
+            }
+            courseTag.setDeleted(false);//有可能是之前被删除的标签，这里恢复为有效
+            //查找改课程与这个标签是否已经建立关联关系
+            query=QueryBuilder.from(CourseTagRelation.class);
+            filters = new ArrayList<>();
+            filters.add(FieldFilters.eq("tagId",Long.valueOf(courseTag.getId())));//精确匹配
+            filters.add(FieldFilters.eq("courseId",courseId));//精确匹配
+            query.addFilters(filters);
+            List<CourseTagRelation> courseTagRelationList = courseTagRelationDao.findList(query.builder());
+            //1.2.1 如果还未建立关联关系，则新建一条标签和课程的关联关系
+            if (courseTagRelationList==null || courseTagRelationList.size()==0){
+                CourseTagRelation courseTagRelation = new CourseTagRelation();
+                courseTagRelation.setTagId(Long.valueOf(courseTag.getId()));
+                courseTagRelation.setCourseId(courseId);
+                courseTagRelationDao.save(courseTagRelation);
+                //更新该标签的关联课程数量
+                courseTag.setUseCount(courseTag.getUseCount()+1);
+            }else {//1.2.2 否则修改该标签和课程的关联关系
+                CourseTagRelation courseTagRelation = courseTagRelationList.get(0);
+                if (courseTagRelation.getDeleted()){//之前"解绑",这里恢复为有效
+                    courseTagRelation.setDeleted(false);
+                    courseTagRelationDao.saveOrUpdate(courseTagRelation);
+                    //更新该标签的关联课程数量
+                    courseTag.setUseCount(courseTag.getUseCount()+1);
+                }
+            }
+            courseTagDao.saveOrUpdate(courseTag);
+        }
+        //2.创建该标签和课程分类之间的关联关系
+        courseTagRelationDto.setTagId(courseTag.getId());
+        createCourseTypeAndTagRelation(courseTagRelationDto);
+        return courseTag;
+    }
+
+    @Override
+    public void bindTag(String id, String tags) {
+        // 将tags转换为数组
+        String[] tagIds = tags.split(",");
+        List<Long> tagIdList = new ArrayList<>();
+        for (String tagId : tagIds){
+            tagIdList.add(Long.valueOf(tagId));
+        }
+        for (Long tagId : tagIdList){
+            QueryBuilder courseTagQuery=QueryBuilder.from(CourseTag.class);
+            List<IFieldFilter> courseTagFilters = new ArrayList<>();
+            courseTagFilters.add(FieldFilters.eq("id",tagId.toString()));//精确匹配
+            courseTagQuery.addFilters(courseTagFilters);
+            //修改该标签关联课程数
+            CourseTag courseTag = courseTagDao.findOne(FieldFilters.eq("id", String.valueOf(tagId)));
+            if (courseTag!=null){
+                //更新该标签的关联课程数量
+                courseTag.setUseCount(courseTag.getUseCount()+1);
+                courseTagDao.saveOrUpdate(courseTag);
+            }
+            // 查询课程是否绑定了标签
+            QueryBuilder query=QueryBuilder.from(CourseTagRelation.class);
+            List<IFieldFilter> filters = new ArrayList<>();
+            filters.add(FieldFilters.eq("courseId",Long.valueOf(id)));
+            filters.add(FieldFilters.eq("tagId",Long.valueOf(tagId)));
+            query.addFilters(filters);
+            List<CourseTagRelation> courseTagRelationList = courseTagRelationDao.findList(query.builder());
+            // 如果没有绑定标签，那么就进行绑定
+            if (courseTagRelationList==null || courseTagRelationList.size()==0){
+                CourseTagRelation courseTagRelation = new CourseTagRelation();
+                courseTagRelation.setTagId(Long.valueOf(tagId));
+                courseTagRelation.setCourseId(Long.valueOf(id));
+                courseTagRelationDao.save(courseTagRelation);
+            }
+        }
+    }
+
+    @Override
+    public CourseTag getTagByName(String tagName) {
+        CourseTag courseTag = courseTagDao.getTagByName(tagName);
+        return courseTag;
+    }
+
+    @Override
+    public List<CourseTag> getTagsByIds(String id) {
+        // id=17,18
+        List<CourseTag> courseTagList = courseTagDao.getTagsByIds(id);
+        return courseTagList;
+    }
+
+    /**
+     * 获取热门标签
+     * @param courseTagRelationDto
+     * @return
+     */
+    @Override
+    public List<CourseTag> getHotTagList(CourseTagRelationDto courseTagRelationDto) {
+        List<CourseTag> hotTagList = null;
+        if (StringUtils.isNotBlank(courseTagRelationDto.getSysType1()) ||
+                StringUtils.isNotBlank(courseTagRelationDto.getSysType2()) ||
+                StringUtils.isNotBlank(courseTagRelationDto.getSysType3())){
+            String sysType1 = courseTagRelationDto.getSysType1();
+            String sysType2 = courseTagRelationDto.getSysType2();
+            String sysType3 = courseTagRelationDto.getSysType3();
+            hotTagList = courseTagDao.getHotTagListBySysTypes(sysType1,sysType2,sysType3);
+        }else {
+            hotTagList = courseTagDao.getHotTagList();
+        }
+        return hotTagList;
+    }
+
+    /**
+     * 创建标签和课程分类之间的关联关系
+     * @param courseTagRelationDto
+     */
+    private void createCourseTypeAndTagRelation(CourseTagRelationDto courseTagRelationDto){
+        String sysType1 = courseTagRelationDto!=null?courseTagRelationDto.getSysType1():null;
+        String tagId = courseTagRelationDto!=null?courseTagRelationDto.getTagId():null;
+        if (StringUtils.isNotBlank(sysType1) && StringUtils.isNotBlank(tagId)){
+            String sysType2 = courseTagRelationDto.getSysType2();
+            String sysType3 = courseTagRelationDto.getSysType3();
+            //判断数据库中该课程分类和标签是否已经存在关联关系
+            if (!isHadCourseTypeAndTagRelation(courseTagRelationDto,true)){//不存在，则新建
+                CourseTypeTagRelation courseTypeTagRelation = new CourseTypeTagRelation();
+                courseTypeTagRelation.setSysType1(sysType1);
+                courseTypeTagRelation.setSysType2(StringUtils.isNotBlank(sysType2)?sysType2:"0");
+                courseTypeTagRelation.setSysType3(StringUtils.isNotBlank(sysType3)?sysType3:"0");
+                courseTypeTagRelation.setTagId(tagId);
+                courseTypeTagRelationDao.save(courseTypeTagRelation);
+            }
+        }
+    }
+
+    /**
+     * 判断数据库制定的课程分类和标签是否已经存在关联关系
+     * @param courseTagRelationDto
+     * @param clearFlag 清理标识  true：清理已存在的数据，只保留一条有效数据
+     * @return  true:已存在；false:不存在
+     */
+    private Boolean isHadCourseTypeAndTagRelation(CourseTagRelationDto courseTagRelationDto,Boolean clearFlag){
+        QueryBuilder query=QueryBuilder.from(CourseTypeTagRelation.class);
+        List<IFieldFilter> filters = new ArrayList<>();
+        filters.add(FieldFilters.eq("sysType1",courseTagRelationDto.getSysType1()));//一级分类
+        filters.add(FieldFilters.eq("sysType2",courseTagRelationDto.getSysType1()));//二级分类
+        filters.add(FieldFilters.eq("sysType3",courseTagRelationDto.getSysType1()));//三级分类
+        filters.add(FieldFilters.eq("tagId",courseTagRelationDto.getTagId()));
+        List<CourseTypeTagRelation> courseTypeTagRelList = courseTypeTagRelationDao.findList(query.addFilters(filters).builder());
+        Boolean isExist = (courseTypeTagRelList!=null && courseTypeTagRelList.size()>0)?true:false;
+        if (isExist && clearFlag ){
+            List<CourseTypeTagRelation> toRemove = new ArrayList<>();
+            for (CourseTypeTagRelation courseTypeTagRel : courseTypeTagRelList) {
+                if (courseTypeTagRel.getDeleted()) {//如果是逻辑删的本次物理删除
+                    courseTypeTagRelationDao.getGenericDao().delete(courseTypeTagRel);
+                    toRemove.add(courseTypeTagRel);
+                }
+            }
+            courseTypeTagRelList.removeAll(toRemove);//移除逻辑删的数据
+            //如果还存在有效数据
+            if (courseTypeTagRelList!=null && courseTypeTagRelList.size()>0){
+                //只保留一条有效数据，其余物理删除
+                for (int i = courseTypeTagRelList.size() - 1; i >= 1; i--) {
+                    CourseTypeTagRelation courseTypeTagRel = courseTypeTagRelList.get(i);
+                    if (courseTypeTagRel.getDeleted()) {
+                        courseTypeTagRelationDao.getGenericDao().delete(courseTypeTagRel);
+                        courseTypeTagRelList.remove(i); // 倒序删除不影响未遍历的索引
+                    }
+                }
+                isExist = true;//存在一条有效数据
+            }else {
+                isExist = false;//不存在有效数据了
+            }
+        }
+        return isExist;
+    }
+}

servers/boe-server-all/src/main/java/com/xboe/module/popup/entity/Popup.java

@@ -1,6 +1,5 @@
 package com.xboe.module.popup.entity;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.xboe.core.SysConstant;
 import com.xboe.core.orm.IdEntity;
 import lombok.Data;
@@ -25,14 +24,12 @@ public class   Popup extends IdEntity {
      * 开始时间
      * */
     @Column(name = "start_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime startTime;
 
     /**
      * 结束时间
      * */
     @Column(name = "end_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime endTime;
 
 

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

@@ -10,8 +10,6 @@ import java.util.stream.Collectors;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.nacos.shaded.com.google.common.util.concurrent.RateLimiter;
-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.vo.TeacherVo;
@@ -235,30 +233,7 @@ public class StudyCourseApi extends ApiBaseController{
 		rs.put("contents",cclist);
 		rs.put("sections",sectionlist);
 		rs.put("teachers",teachers);
-		// 未选择仅内网时isPermission = false，不用区分内外网
-		boolean isPermission = false;
-		if(course.getDevice() ==4){
-			CommonSearchVo searcher = new CommonSearchVo();
-			searcher.setPid(637L);
-			searcher.setType(1);
-			List<Dict> dictList = thirdApi.getDictItems(searcher);
-			if(dictList != null && dictList.size() > 0){
-				List<String> dicts =  dictList.stream().map(Dict::getValue).collect(Collectors.toList());
-				// 选择仅内网 并且字典中配置了此课程资源归属，那么只能内网观看 返回 truw
-				isPermission = dicts.contains(course.getOrgId());
-			}
-		}
-		rs.put("isPermission",isPermission);
-
-		CommonSearchVo warn = new CommonSearchVo();
-		warn.setCode("course_warn");
-		warn.setType(1);
-		List<Dict> warns = thirdApi.getDictItems(warn);
-		if(warns != null && warns.size() > 0){
-			rs.put("warn",warns.get(0).getValue());
-			rs.put("warnTitle",warns.get(0).getName());
-		}
-
+		
 		//检查是否已报名
 		StudyCourse sc=service.findByCourseIdAndAid(cid, aid);
 		if(pass==true && sc==null) {

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

@@ -10,7 +10,6 @@ import com.xboe.module.course.entity.CourseExam;
 import com.xboe.school.study.dao.StudyCourseDao;
 import com.xboe.school.study.dao.StudyCourseItemDao;
 import com.xboe.school.study.dao.StudyExamDao;
-import com.xboe.school.study.entity.StudyCourse;
 import com.xboe.school.study.entity.StudyCourseItem;
 import com.xboe.school.study.entity.StudyExam;
 import com.xboe.school.study.service.IStudyExamService;
@@ -171,32 +170,15 @@ public class StudyExamServiceImpl implements IStudyExamService{
 			}
 			builder.addGroupBy("studyId");
 			List<StudyExam> list1 = dao.findList(builder.builder());
-			if(list1 != null && list1.size() > 0){
-				log.info("----------StudyExam--QueryBuilder list1.size = " + list1.size() + ",0 = " + list1.get(0));
-				for(StudyExam item : list1){
-					log.info("--------------StudyExam---CourseId = " + item.getCourseId() + " , StudyId = " + item.getStudyId() + " , StudentId = " + item.getStudentId());
-					int totalContent = courseContentDao.getCount(item.getCourseId());
-					log.info("--------StudyExam--准备判断进度-------totalContent = " + totalContent);
-					scDao.finishCheck1(item.getStudyId(),item.getCourseId(),totalContent);
-					log.info("--------StudyExam--判断进度完毕----------------------");
-				}
-			}else{
-				QueryBuilder builder1 = QueryBuilder.from(StudyCourse.class);
-				if (StringUtils.isEmpty(courseId)){
-				 	return;
-				}
-				builder1.addFilter(FieldFilters.eq("courseId", courseId));
-				List<StudyCourse> list2 = scDao.findList(builder1.builder());
-				log.info("------------StudyCourse list2.size = " + list2.size() + ",0 = " + list2.get(0));
-				for(StudyCourse item : list2){
-					log.info("-------------StudyCourse----CourseId = " + item.getCourseId() + " , StudyId = " + item.getId() + " , StudentId = " + item.getAid());
-					int totalContent = courseContentDao.getCount(item.getCourseId());
-					log.info("--------StudyCourse--准备判断进度-------totalContent = " + totalContent);
-					scDao.finishCheck1(item.getId(),item.getCourseId(),totalContent);
-					log.info("--------StudyCourse--判断进度完毕----------------------");
-				}
-			}
+			log.info("------------QueryBuilder list1.size = " + list1.size() + ",0 = " + list1.get(0));
 
+			for(StudyExam item : list1){
+				log.info("-----------------CourseId = " + item.getCourseId() + " , StudyId = " + item.getStudyId() + " , StudentId = " + item.getStudentId());
+				int totalContent = courseContentDao.getCount(item.getCourseId());
+				log.info("----------准备判断进度-------totalContent = " + totalContent);
+				scDao.finishCheck1(item.getStudyId(),item.getCourseId(),totalContent);
+				log.info("----------判断进度完毕----------------------");
+			}
 		} catch (Exception exception) {
 			exception.printStackTrace();
 			log.info("------异常----------------------：" +exception.getMessage());

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

@@ -282,12 +282,11 @@ public class StudyServiceImpl implements IStudyService{
 				return pageList;
 			}
 		}
-
 		String sql = "select a.id, a.course_id, a.course_name, a.aname, " +
-				"IFNULL(b.finish_time, '0') as finish_time, IFNULL(b.progress, 0) as progress, IFNULL(b.status, 1) as status,b.score " +
+				"IFNULL(b.finish_time, '0') as finish_time, IFNULL(b.progress, 0) as progress, IFNULL(b.status, 1) as status " +
 				"from (select id, course_id, course_name, aname, 0, 1 from boe_study_course where course_id = '" + courseId + "' and aname like '%"+name+"%') a " +
 				"left join " +
-				"(select bsc.id, bsc.course_id, bsc.course_name, bsc.aname, item.finish_time, item.progress, item.status,MAX(item.score) score " +
+				"(select bsc.id, bsc.course_id, bsc.course_name, bsc.aname, item.finish_time, item.progress, item.status " +
 				"from boe_study_course bsc left join boe_study_course_item item on item.course_id = bsc.course_id and item.study_id = bsc.id " +
 				"where bsc.course_id = '" + courseId + "' and item.content_id = '" + contentId + "' and item.aname like '%"+name+"%' group by bsc.id) b " +
 				"on a.course_id = b.course_id and a.id = b.id " +
@@ -316,9 +315,6 @@ public class StudyServiceImpl implements IStudyService{
 			sc.setProgress(Integer.valueOf(objs[5].toString()));
 			sc.setStatus(Integer.valueOf(objs[6].toString()));
 			sc.setAname(objs[3].toString());
-			if(objs[7] != null){
-				sc.setScore(Float.valueOf(objs[7].toString()));
-			}
 			item.add(sc);
 		}
 		log.info("资源完成情况人员"+item);

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

@@ -87,8 +87,6 @@ xboe:
       ai-api-code: 30800
       case-knowledge-id: de2e006e-82fb-4ace-8813-f25c316be4ff
       file-upload-callback-url: http://192.168.0.253:9090/xboe/m/boe/caseDocumentLog/uploadCallback
-      alert-email-recipients: 
-        - liu.zixi@ebiz-digits.com
 xxl:
   job:
     accessToken: 65ddc683-22f5-83b4-de3a-3c97a0a29af0

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

@@ -118,9 +118,7 @@ xboe:
       secret-key: db4d24279e3d6dbf1524af42cd0bedd2
       ai-api-code: 30800
       case-knowledge-id: de2e006e-82fb-4ace-8813-f25c316be4ff
-      file-upload-callback-url: http://10.251.132.75:9090/xboe/m/boe/caseDocumentLog/uploadCallback
-      alert-email-recipients: 
-        - liu.zixi@ebiz-digits.com
+      file-upload-callback-url: http://192.168.0.253:9090/xboe/m/boe/caseDocumentLog/uploadCallback
 jasypt:
   encryptor:
     algorithm: PBEWithMD5AndDES

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

@@ -79,45 +79,12 @@ 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
-      # 20251117 张娟提供新版kId
-      case-knowledge-id: 0a4d5d9e-0dae-456e-a342-3dfd2046b9e3
-      caseDetailUrlBase: https://u.boe.com/pc/case/detail?id=
-      file-upload-callback-url: https://u.boe.com/systemapi/xboe/m/boe/caseDocumentLog/uploadCallback
-      use-white-list: true
-      white-user-code-list:
-        - "00004409"
-        - "10361430"
-        - "10867319"
-        - "00004746"
-        - "00004701"
-        - "00004471"
-        - "11311660"
-        - "10157955"
-        - "10726944"
-        - "110408"
-        - "10768019"
-        - "137812"
-        - "107863"
-        - "10046607"
-        - "110858"
-        - "98000352"
-        - "101215"
-        - "00005011"
-        - "10827857"
-        - "11339772"
-        - "pctest06"
-      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
+      case-knowledge-id: de2e006e-82fb-4ace-8813-f25c316be4ff
+      file-upload-callback-url: http://192.168.0.253:9090/xboe/m/boe/caseDocumentLog/uploadCallback
 xxl:
   job:
     accessToken: 65ddc683-22f5-83b4-de3a-3c97a0a29af0

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

@@ -117,35 +117,8 @@ xboe:
       app-key: 6e9be45319184ac793aa127c362b0f0b
       secret-key: db4d24279e3d6dbf1524af42cd0bedd2
       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:
-        - "00004409"
-        - "10361430"
-        - "10867319"
-        - "00004746"
-        - "00004701"
-        - "00004471"
-        - "11311660"
-        - "10157955"
-        - "10726944"
-        - "110408"
-        - "10768019"
-        - "137812"
-        - "107863"
-        - "10046607"
-        - "110858"
-        - "98000352"
-        - "101215"
-        - "00005011"
-        - "10827857"
-        - "11339772"
-      alert-email-recipients:
-        - chengmeng@boe.com.cn
-      ai-chat-root-path: /home/www/elearning/upload/ai/chat
+      file-upload-callback-url: http://192.168.0.253:9090/xboe/m/boe/caseDocumentLog/uploadCallback
 jasypt:
   encryptor:
     algorithm: PBEWithMD5AndDES
@@ -157,8 +130,8 @@ boe:
 ok:
   http:
     connect-timeout: 30
-    read-timeout: 300
-    write-timeout: 300
+    read-timeout: 30
+    write-timeout: 30
     max-idle-connections: 200
     keep-alive-duration: 300
 

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

@@ -15,8 +15,6 @@ spring:
     time-zone: GMT+8
   mvc:
     static-path-pattern: /cdn/**
-    async:
-      request-timeout: 600000
   jpa:
     database: MYSQL
     show-sql: false
@@ -46,8 +44,8 @@ server:
 ok:
   http:
     connect-timeout: 30
-    read-timeout: 300
-    write-timeout: 300
+    read-timeout: 30
+    write-timeout: 30
     max-idle-connections: 200
     keep-alive-duration: 300
 boe:

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

@@ -47,30 +47,10 @@
         </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,30 +47,10 @@
         </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="debug"/>
         <appender-ref ref="error"/>
         <appender-ref ref="console"/>
     </root>
-
-    <logger name="caseAiChatLogger" additivity="false" level="INFO">
-        <appender-ref ref="caseAiChat"/>
-    </logger>
 </configuration>