Merge branch 'refs/heads/release-20250328-master-xc' into test1031

增加临时接口

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

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

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

@@ -8,8 +8,6 @@ import com.xboe.module.boecase.service.ICaseAiChatService;
 import com.xboe.module.boecase.service.ICaseAiPermissionService;
 import com.xboe.module.boecase.service.IElasticSearchIndexService;
 import com.xboe.module.boecase.vo.CaseAiMessageVo;
-import com.xboe.module.excel.ExportsExcelSenderUtil;
-import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
@@ -17,12 +15,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 
 import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
 import java.util.List;
 
 /**
@@ -80,44 +73,6 @@ public class CaseAiChatApi extends ApiBaseController {
         }
     }
     
-    /**
-     * 导出会话记录为Excel
-     * @param startTime 开始时间
-     * @param endTime 结束时间
-     * @param response HTTP响应
-     */
-    @GetMapping("/export-conversations")
-    public void downloadConversationExcel(@RequestParam String startTime, 
-                                          @RequestParam String endTime, 
-                                          HttpServletResponse response) {
-        try {
-            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-            LocalDateTime start = LocalDateTime.parse(startTime, formatter);
-            LocalDateTime end = LocalDateTime.parse(endTime, formatter);
-            
-            // TODO: 这里需要修改为实际返回数据的方法
-            caseAiChatService.downloadConversationExcel(start, end);
-            
-            response.setContentType("application/vnd.ms-excel");
-            response.setHeader("Content-Disposition", "attachment; filename=conversations.xls");
-            
-            // 示例数据，实际应该从Service获取
-            LinkedHashMap<String, String> headers = new LinkedHashMap<>();
-            headers.put("会话ID", "conversationId");
-            headers.put("会话名称", "conversationName");
-            headers.put("用户", "user");
-            headers.put("开始时间", "startTime");
-            headers.put("会话时长", "duration");
-            
-            List<ConversationExcelVo> dataList = new ArrayList<>();
-            // 这里应该填充实际数据
-            
-            ExportsExcelSenderUtil.export(headers, dataList, response.getOutputStream(), "yyyy-MM-dd HH:mm:ss");
-        } catch (Exception e) {
-            log.error("导出会话记录为Excel异常", e);
-        }
-    }
-    
     /**
      * 判断当前登录用户是否显示"案例专家"功能入口
      * @return 是否显示功能入口
@@ -127,10 +82,7 @@ public class CaseAiChatApi extends ApiBaseController {
         try {
             String currentUserCode = getCurrent().getCode();
             boolean shouldShow = caseAiPermissionService.shouldShowCaseAiEntrance(currentUserCode);
-//            return success(shouldShow);
-            JsonResponse<Boolean> result = success(shouldShow);
-            result.setMessage(currentUserCode);
-            return result;
+            return success(shouldShow);
         } catch (Exception e) {
             log.error("判断案例专家功能入口显示权限异常", e);
             return error("判断失败", e.getMessage());
@@ -171,16 +123,4 @@ public class CaseAiChatApi extends ApiBaseController {
         }
         return error("创建失败");
     }
-    
-    /**
-     * 用于Excel导出的VO类
-     */
-    @Data
-    static class ConversationExcelVo {
-        private String conversationId;
-        private String conversationName;
-        private String user;
-        private String startTime;
-        private String duration;
-    }
-}
+}

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

@@ -54,27 +54,28 @@ public class AiChatConversationData {
      */
     private String userName;
 
-    /**
-     * 消息时间戳
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private LocalDateTime startTime;
-
     /**
      * 消息时间戳
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime timestamp;
 
-    /**
-     * 聊天时长（秒）
-     */
-    private Integer durationSeconds;
-
     // ================== 构造函数 ==================
 
     public AiChatConversationData() {
-        this.startTime = LocalDateTime.now();
+        this.timestamp = LocalDateTime.now();
+    }
+
+    public AiChatConversationData(String conversationId, String query, String answer, 
+                                  List<CaseReferVo> caseRefers, List<String> suggestions, 
+                                  String userId) {
+        this.conversationId = conversationId;
+        this.query = query;
+        this.answer = new StringBuilder(answer != null ? answer : "");
+        this.caseRefers = caseRefers != null ? caseRefers : new ArrayList<>();
+        this.suggestions = suggestions != null ? suggestions : new ArrayList<>();
+        this.userId = userId;
+        this.timestamp = LocalDateTime.now();
     }
 
     // ================== 便捷方法 ==================

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

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

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

@@ -6,7 +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 java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -36,11 +35,4 @@ public interface ICaseAiChatService {
      * @return 消息记录列表
      */
     List<CaseAiMessageVo> getConversationMessages(String conversationId);
-
-    /**
-     * 导出会话记录为Excel
-     * @param startTime 开始时间
-     * @param endTime 结束时间
-     */
-    void downloadConversationExcel(LocalDateTime startTime, LocalDateTime endTime);
-}
+}

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

@@ -12,17 +12,20 @@ public interface IElasticSearchIndexService {
 
     /**
      * 查看索引是否存在
+     * @param indexName
      * @return
      */
     boolean checkIndexExists();
 
     /**
      * 创建索引
+     * @param indexName
      */
     boolean createIndex();
 
     /**
      * 删除索引
+     * @param indexName
      * @return
      */
     boolean deleteIndex();

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

@@ -3,7 +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;
@@ -19,10 +18,8 @@ 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 +32,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;
@@ -61,13 +53,8 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 
-import java.io.File;
 import java.io.IOException;
-import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -106,21 +93,8 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
     @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, "服务繁忙，请稍后再试。");
-            sseEmitter.complete();
-            return sseEmitter;
-        }
-
-        // 2. 查询历史
-        List<CaseAiMessageVo> historyMessages = elasticSearchIndexService.queryData(conversationId);
+        String conversationId = getOrCreateConversationId(caseAiChatDto, currentUser);
         
         // 3. 构建请求参数
         String userId = currentUser.getCode();
@@ -133,33 +107,11 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
         chatParam.put("query", caseAiChatDto.getQuery());
         chatParam.put("conversationId", conversationId);
         chatParam.put("enableThinking", Objects.equals(caseAiChatDto.getEnableThinking(), 1));
-        if (historyMessages != null && !historyMessages.isEmpty()) {
-            // 最多10条历史，从后往前
-            JSONArray historyList = new JSONArray();
-            int size = historyMessages.size();
-            int startIndex = Math.max(0, size - 10);
-            for (int i = startIndex; i < size; i++) {
-                JSONObject conversationDetail = new JSONObject();
-                CaseAiMessageVo message = historyMessages.get(i);
-                conversationDetail.put("query", message.getQuery());
-                conversationDetail.put("content", message.getAnswer());
-                historyList.add(conversationDetail);
-            }
-            chatParam.put("historyList", historyList);
-        }
         String chatParamStr = chatParam.toJSONString();
         log.info("案例问答接口请求参数: [{}]", chatParamStr);
         
         // 4. 设置请求头
-        String accessToken;
-        try {
-            accessToken = aiAccessTokenService.getAccessToken();
-        } catch (Exception e) {
-            log.error("获取access_token失败", e);
-            errMessage(sseEmitter, "服务繁忙，请稍后再试。");
-            sseEmitter.complete();
-            return sseEmitter;
-        }
+        String accessToken = aiAccessTokenService.getAccessToken();
         String apiCode = caseAiProperties.getChatApiCode();
         Request.Builder builder = new Request.Builder();
         builder.url(caseAiProperties.getBaseUrl() + "/apigateway/chat/knowledge/v1/chat/completions");
@@ -168,7 +120,9 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
         RequestBody bodyRequestBody = RequestBody.create(chatParamStr, MediaType.parse("application/json"));
         builder.post(bodyRequestBody);
         Request request = builder.build();
-
+        
+        // 5. 创建SSE响应器
+        SseEmitter sseEmitter = new SseEmitter();
         
         // 6. 用于收集对话数据的容器
         AiChatConversationData conversationData = new AiChatConversationData();
@@ -204,28 +158,30 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
                         
                         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 (statusEnum) {
+                                case REFERS: // 返回引用文件
+                                    // 处理文件引用并构建返给前端的数据
+                                    JSONObject modifiedData = handleFileReferAndBuildResponse(responseData, conversationData);
+                                    if (modifiedData != null) {
+                                        // 发送修改后的数据给前端
+                                        sseEmitter.send(modifiedData.toJSONString());
+                                        return; // 早期返回，不发送原始数据
+                                    }
+                                    break;
+                                case CHAT: // 流式对话中
+                                    String content = responseData.getString("content");
+                                    if (content != null) {
+                                        conversationData.appendAnswer(content);
+                                    }
+                                    break;
+                                case SUGGESTIONS: // 返回建议
+                                    handleSuggestions(responseData, conversationData);
+                                    break;
+                                case CHAT_COMPLETED:
+                                case API_COMPLETED: // 接口交互完成
+                                default:
+                                    // 不做特殊处理
+                                    break;
                             }
                         }
                         sseEmitter.send(responseData.toJSONString());
@@ -251,7 +207,7 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
                 // 如果是 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);
+                    CaseAiChatServiceImpl.this.handleAsRegularHttpRequest(request, sseEmitter, conversationData);
                     return;
                 }
                 
@@ -358,117 +314,7 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
         }
         return elasticSearchIndexService.queryData(conversationId);
     }
-
-    @Override
-    public void downloadConversationExcel(LocalDateTime startTime, LocalDateTime endTime) {
-        // 1. 根据startTime和endTime，查询在这个时间区间内的CaseAiConversations数据
-        List<CaseAiConversations> conversations = caseAiConversationsDao.getGenericDao().findList(
-            CaseAiConversations.class,
-            FieldFilters.ge("sysCreateTime", startTime),
-            FieldFilters.le("sysCreateTime", endTime)
-        );
-        
-        // 准备Excel数据
-        List<ConversationExcelVo> excelDataList = new ArrayList<>();
-        
-        // 2. 遍历这组数据，根据aiConversationId从es中查询数据（可调用getConversationMessages()方法）
-        for (CaseAiConversations conversation : conversations) {
-            String aiConversationId = conversation.getAiConversationId();
-            String conversationName = conversation.getConversationName();
-            String conversationUser = conversation.getConversationUser();
-            
-            List<CaseAiMessageVo> messages = getConversationMessages(aiConversationId);
-            
-            // 计算会话时长
-            long duration = 0; // 默认为0，如果需要精确计算，需要从消息中提取时间信息
-            
-            // 3. 写入Excel，包括每个会话的用户，会话标题，会话内的问答记录，每次对话时长等
-            ConversationExcelVo excelData = new ConversationExcelVo();
-            excelData.setConversationId(aiConversationId);
-            excelData.setConversationName(conversationName);
-            excelData.setUser(conversationUser);
-            excelData.setMessages(messages);
-            
-            excelDataList.add(excelData);
-        }
-        
-        // 写入Excel文件
-        Workbook workbook = new XSSFWorkbook();
-        Sheet sheet = workbook.createSheet("AI会话数据");
-        // 标题行
-        Row headerRow = sheet.createRow(0);
-        headerRow.createCell(0).setCellValue("会话ID");
-        headerRow.createCell(1).setCellValue("会话名称");
-        headerRow.createCell(2).setCellValue("用户");
-        headerRow.createCell(3).setCellValue("提问");
-        headerRow.createCell(4).setCellValue("回答");
-        headerRow.createCell(5).setCellValue("开始时间");
-        headerRow.createCell(6).setCellValue("问答时长(秒)");
-        
-        // 内容行
-        if (!excelDataList.isEmpty()) {
-            int rowNum = 1; // 从第二行开始写入数据
-            for (ConversationExcelVo excelData : excelDataList) {
-                List<CaseAiMessageVo> messages = excelData.getMessages();
-                
-                if (messages != null && !messages.isEmpty()) {
-                    // 记录起始行号，用于后续合并单元格
-                    int startRow = rowNum;
-                    
-                    // 遍历每个消息
-                    for (CaseAiMessageVo message : messages) {
-                        Row row = sheet.createRow(rowNum++);
-                        // 填充每行数据
-                        row.createCell(0).setCellValue(excelData.getConversationId());
-                        row.createCell(1).setCellValue(excelData.getConversationName());
-                        row.createCell(2).setCellValue(excelData.getUser());
-                        row.createCell(3).setCellValue(message.getQuery() != null ? message.getQuery() : "");
-                        row.createCell(4).setCellValue(message.getAnswer() != null ? message.getAnswer() : "");
-                        row.createCell(5).setCellValue(""); // 开始时间字段暂留空
-                        row.createCell(6).setCellValue(message.getDurationSeconds() != null ? message.getDurationSeconds() : 0);
-                    }
-                    
-                    // 合并单元格（会话ID、会话名称、用户三列）
-                    // 参数说明：起始行号，结束行号，起始列号，结束列号
-                    if (rowNum > startRow + 1) { // 只有当有多行时才合并
-                        sheet.addMergedRegion(new CellRangeAddress(startRow, rowNum - 1, 0, 0));
-                        sheet.addMergedRegion(new CellRangeAddress(startRow, rowNum - 1, 1, 1));
-                        sheet.addMergedRegion(new CellRangeAddress(startRow, rowNum - 1, 2, 2));
-                    }
-                } else {
-                    // 如果没有消息，则仍然创建一行显示基本信息
-                    Row row = sheet.createRow(rowNum++);
-                    row.createCell(0).setCellValue(excelData.getConversationId());
-                    row.createCell(1).setCellValue(excelData.getConversationName());
-                    row.createCell(2).setCellValue(excelData.getUser());
-                }
-            }
-        }
-        // 3. 创建Excel文件并保存
-        if (caseAiProperties.isAiChatDataSendEmail()) {
-            // TODO 发送邮件附件
-        } else {
-            // 保存文件
-            String dirPath = caseAiProperties.getAiChatRootPath() + File.separator + startTime.format(DateTimeFormatter.ofPattern("yyyyMM"));
-            Path dir = Paths.get(dirPath);
-            if (!Files.exists(dir)) {
-                try {
-                    Files.createDirectories(dir);
-                } catch (IOException e) {
-                    throw new RuntimeException(e);
-                }
-            }
-            String fileName = "AI会话数据-" + startTime.format(DateTimeFormatter.ofPattern("yyyyMMdd")) + "-" + System.currentTimeMillis() + ".xlsx";
-            Path filePath = dir.resolve(fileName);
-            try (OutputStream out = Files.newOutputStream(filePath)) {
-                workbook.write(out);
-                out.flush();
-            } catch (IOException e) {
-                log.error("保存文件错误", e);
-            }
-        }
-    }
-
+    
     /**
      * 从 ES 数据中解析消息对象
      * @param sourceMap ES数据
@@ -697,12 +543,6 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
                 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 {
@@ -714,16 +554,9 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
             sseEmitter.completeWithError(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);
-        }
-    }
+    
+    /**
+     * 对话数据容器
+     */
+    // ConversationData 已移动到独立的Entity类：AiChatConversationData
 }

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

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

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

@@ -29,7 +29,6 @@ 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;
@@ -135,11 +134,7 @@ public class ElasticSearchIndexServiceImpl implements IElasticSearchIndexService
             esData.put("answer", conversationData.getAnswerAsString());
             esData.put("conversationId", conversationData.getConversationId());
             esData.put("userId", conversationData.getUserId());
-            // 持续时间
-            LocalDateTime now = LocalDateTime.now();
-            esData.put("startTime", conversationData.getStartTime().toString());
-            esData.put("timestamp", now.toString());
-            esData.put("durationSeconds", Duration.between(conversationData.getStartTime(), now).getSeconds());
+            esData.put("timestamp", LocalDateTime.now().toString());
 
             // 构建 caseRefer 数据
             JSONArray caseReferArray = new JSONArray();
@@ -211,46 +206,35 @@ public class ElasticSearchIndexServiceImpl implements IElasticSearchIndexService
             CaseAiMessageVo messageVo = new CaseAiMessageVo();
             messageVo.setQuery((String) sourceMap.get("query"));
             messageVo.setAnswer((String) sourceMap.get("answer"));
-            if (sourceMap.containsKey("startTime")) {
-                String startTimeStr = (String) sourceMap.get("startTime");
-                messageVo.setStartTime(LocalDateTime.parse(startTimeStr));
-            }
-            if (sourceMap.containsKey("durationSeconds")) {
-                messageVo.setDurationSeconds((Long) sourceMap.get("durationSeconds"));
-            }
 
             // 解析 suggestions
-            if (sourceMap.containsKey("suggestions")) {
-                Object suggestionsObj = sourceMap.get("suggestions");
-                if (suggestionsObj instanceof List) {
-                    messageVo.setSuggestions((List<String>) suggestionsObj);
-                }
+            Object suggestionsObj = sourceMap.get("suggestions");
+            if (suggestionsObj instanceof List) {
+                messageVo.setSuggestions((List<String>) suggestionsObj);
             }
 
             // 解析 caseRefer
-            if (sourceMap.containsKey("caseRefer")) {
-                Object caseReferObj = sourceMap.get("caseRefer");
-                if (caseReferObj instanceof List) {
-                    List<CaseReferVo> caseReferList = new ArrayList<>();
-                    List<Map<String, Object>> caseReferMaps = (List<Map<String, Object>>) caseReferObj;
+            Object caseReferObj = sourceMap.get("caseRefer");
+            if (caseReferObj instanceof List) {
+                List<CaseReferVo> caseReferList = new ArrayList<>();
+                List<Map<String, Object>> caseReferMaps = (List<Map<String, Object>>) caseReferObj;
 
-                    for (Map<String, Object> caseReferMap : caseReferMaps) {
-                        CaseReferVo caseRefer = new CaseReferVo();
-                        caseRefer.setCaseId((String) caseReferMap.get("caseId"));
-                        caseRefer.setTitle((String) caseReferMap.get("title"));
-                        caseRefer.setAuthorName((String) caseReferMap.get("authorName"));
-                        caseRefer.setContent((String) caseReferMap.get("content"));
+                for (Map<String, Object> caseReferMap : caseReferMaps) {
+                    CaseReferVo caseRefer = new CaseReferVo();
+                    caseRefer.setCaseId((String) caseReferMap.get("caseId"));
+                    caseRefer.setTitle((String) caseReferMap.get("title"));
+                    caseRefer.setAuthorName((String) caseReferMap.get("authorName"));
+                    caseRefer.setContent((String) caseReferMap.get("content"));
 
-                        // 解析 keywords
-                        Object keywordsObj = caseReferMap.get("keywords");
-                        if (keywordsObj instanceof List) {
-                            caseRefer.setKeywords((List<String>) keywordsObj);
-                        }
-
-                        caseReferList.add(caseRefer);
+                    // 解析 keywords
+                    Object keywordsObj = caseReferMap.get("keywords");
+                    if (keywordsObj instanceof List) {
+                        caseRefer.setKeywords((List<String>) keywordsObj);
                     }
-                    messageVo.setCaseRefer(caseReferList);
+
+                    caseReferList.add(caseRefer);
                 }
+                messageVo.setCaseRefer(caseReferList);
             }
 
             return messageVo;

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

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

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

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

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

@@ -1,10 +1,6 @@
 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;
@@ -12,7 +8,6 @@ import com.xboe.module.boecase.entity.CaseDocumentLog;
 import com.xboe.module.boecase.entity.Cases;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Component;
@@ -21,7 +16,6 @@ import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 
 /**
  * 旧案例上传
@@ -47,18 +41,18 @@ public class CaseUploadTask {
     @XxlJob("oldDataUploadJob")
     public void oldDataUploadJob() {
         try {
-//            log.info("开始执行旧案例上传任务");
+            log.info("开始执行旧案例上传任务");
 
             // 从Redis获取上次处理的最后一条记录ID
             String lastProcessedId = stringRedisTemplate.opsForValue().get(CASE_UPLOAD_LAST_ID_KEY);
-//            log.info("上次处理的最后一条记录ID: {}", lastProcessedId);
+            log.info("上次处理的最后一条记录ID: {}", lastProcessedId);
 
             // 查询符合条件的案例数据
             List<Cases> casesToProcess = findCasesToProcess(lastProcessedId);
-//            log.info("查询到待处理案例数量: {}", casesToProcess.size());
+            log.info("查询到待处理案例数量: {}", casesToProcess.size());
 
             if (casesToProcess.isEmpty()) {
-//                log.info("没有需要处理的案例数据");
+                log.info("没有需要处理的案例数据");
                 return;
             }
 
@@ -78,11 +72,7 @@ public class CaseUploadTask {
             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())) {
+                    if (cases.getId().equals(log.getCaseId())) {
                         exists = true;
                         break;
                     }
@@ -92,7 +82,7 @@ public class CaseUploadTask {
                 }
             }
 
-//            log.info("过滤后需要处理的案例数量: {}", casesList.size());
+            log.info("过滤后需要处理的案例数量: {}", casesList.size());
 
             if (!casesList.isEmpty()) {
                 // 调用异步处理方法
@@ -106,7 +96,7 @@ public class CaseUploadTask {
                 log.info("没有新的案例需要处理");
             }
 
-//            log.info("旧案例上传任务执行完成");
+            log.info("旧案例上传任务执行完成");
         } catch (Exception e) {
             log.error("执行旧案例上传任务时发生异常", e);
         }

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

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

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

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

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

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

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

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

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

@@ -33,6 +33,19 @@ import com.xboe.data.dto.UserOrgIds;
 import com.xboe.data.outside.IOutSideDataService;
 import com.xboe.data.service.IDataUserSyncService;
 import com.xboe.module.assistance.service.IEmailService;
+import com.xboe.module.course.entity.Course;
+import com.xboe.module.course.entity.CourseContent;
+import com.xboe.module.course.entity.CourseCrowd;
+import com.xboe.module.course.entity.CourseHRBPAudit;
+import com.xboe.module.course.entity.CourseSection;
+import com.xboe.module.course.entity.CourseTeacher;
+import com.xboe.module.course.entity.CourseUpdateLog;
+import com.xboe.module.course.service.ICourseContentService;
+import com.xboe.module.course.service.ICourseCrowdService;
+import com.xboe.module.course.service.ICourseHRBPAuditService;
+import com.xboe.module.course.service.ICourseSectionService;
+import com.xboe.module.course.service.ICourseService;
+import com.xboe.module.course.service.ICourseTeacherService;
 import com.xboe.module.excel.ExportsExcelSenderUtil;
 import com.xboe.standard.enums.BoedxContentType;
 import com.xboe.standard.enums.BoedxCourseType;
@@ -137,6 +150,22 @@ public class CourseManageApi extends ApiBaseController{
 	        dto.setOrgIds(ids);
 			dto.setReadIds(userOrgIds.getReadIds());
 	        PageList<Course> coursePageList = courseService.findPage(pager.getPageIndex(), pager.getPageSize(),dto);
+	        // 补充审核人和审核时间（取最近一条审核记录）- 批量查询优化
+	        if (coursePageList != null && coursePageList.getList() != null && !coursePageList.getList().isEmpty()) {
+	        	List<String> courseIds = coursePageList.getList().stream().map(Course::getId).collect(Collectors.toList());
+	        	Map<String, CourseHRBPAudit> latestAuditMap = hrbpAuditService.findLatestByCourseIds(courseIds);
+	        	for (Course c : coursePageList.getList()) {
+	        		try {
+	        			CourseHRBPAudit latest = latestAuditMap.get(c.getId());
+	        			if (latest != null) {
+	        				c.setAuditUser(latest.getAuditUser());
+	        				c.setAuditTime(latest.getAuditTime());
+	        			}
+	        		} catch (Exception ignore) {
+	        			// ignore single course enrich error
+	        		}
+	        	}
+	        }
 			return success(coursePageList);
         }catch(Exception e) {
         	log.error("管理课程列表查询错误",e);
@@ -174,7 +203,7 @@ public class CourseManageApi extends ApiBaseController{
 			rs.put("dicts",dicts);
 		}
 		log.error("-------是否仅内网查看 = " + isPermission);
-		if (StringUtils.isNotBlank(course.getTags()) && course.getTags().matches("[0-9,]+")){
+		if (StringUtils.isNotBlank(course.getTags())){
 			List<CourseTag> tagList = tagService.getTagsByIds(course.getTags());
 			rs.put("tagList", tagList);
 		}
@@ -298,7 +327,6 @@ public class CourseManageApi extends ApiBaseController{
 	@PostMapping("/save")
 	@AutoLog(module = "课程",action = "保存课程基本信息",info = "")
 	public JsonResponse<CourseFullDto> saveCourseFull(@RequestBody CourseFullDto dto, HttpServletRequest request){
-		log.info("-------- 保存课程的全部信息 ------- 课程信息 = {} " , dto.getCourse());
 		if(dto.getCourse()==null){
 			return badRequest("无课程信息");
 		}
@@ -319,26 +347,11 @@ public class CourseManageApi extends ApiBaseController{
 		
 		//填充必要的信息
 		try {
-			log.info("-------- 标签相关开始 ------- 课程ID = {} " , dto.getCourse().getId());
-			log.info("-------- 标签相关开始 ------- 课程TAG = {} " , dto.getCourse().getTags());
-			CurrentUser userInfo = getCurrent();
-			Course oldCourse = StringUtils.isBlank(dto.getCourse().getId()) ? null : courseService.get(dto.getCourse().getId());
-			log.info("-------- 标签相关 ------- oldtags = {} " , oldCourse.getTags());
-			if(oldCourse!=null && StringUtils.isNotEmpty(oldCourse.getTags())){
-				String[] tagArray = oldCourse.getTags().split(",");
-				// 检查每个元素是否为纯数字
-				for (String tag : tagArray) {
-					if (!tag.matches("\\d+")) { // 使用正则表达式检查是否为纯数字
-						log.info("-------- 不是纯数字 -------oldtags tag = {} " , tag);
-						oldCourse.setTags(null); // 兼容
-						break;
-					}
-				}
-			}
-			log.info("-------- 标签相关 updateTags ------- oldtags = {} " , oldCourse.getTags());
-			log.info("-------- 标签相关 updateTags ------- newtags = {} " , dto.getCourse().getTags());
-			tagService.updateTags(oldCourse,dto.getCourse(),userInfo);
-			log.info("-------- 标签相关结束 ------newtags = {} " , dto.getCourse().getTags());
+//			log.info("-------- 标签相关开始 ------- 课程ID = {} " , dto.getCourse().getId());
+//			CurrentUser userInfo = getCurrent();
+//			Course oldCourse = StringUtils.isBlank(dto.getCourse().getId()) ? null : courseService.get(dto.getCourse().getId());
+//			tagService.updateTags(oldCourse,dto.getCourse(),userInfo);
+//			log.info("-------- 标签相关结束 -------");
 
 			if(StringUtils.isBlank(dto.getCourse().getId())) {
 				//只有在第一次添加保存时才会这样
@@ -367,6 +380,8 @@ public class CourseManageApi extends ApiBaseController{
 	
 	/***
 	 * 仅仅是保存
+	 * @param dto
+	 * @return
 	 */
 	@PostMapping("/save-only-course")
 	@AutoLog(module = "课程",action = "保存课程基本信息",info = "")
@@ -393,10 +408,6 @@ public class CourseManageApi extends ApiBaseController{
 				//修改后重置，重新提交审核，重新发布
 				courseService.update(course,true);
 			}
-			//查询是否需要标签提示
-			String aid=getCurrent().getAccountId();
-			Boolean isTip = courseService.getCourseTip(aid);
-			course.setIsTip(isTip);
 			return success(course);
 		} catch (Exception e) {
 			log.error("整体保存课程信息错误",e);
@@ -747,6 +758,7 @@ public class CourseManageApi extends ApiBaseController{
 	
 	/**
 	 * 审核课程，这个是管理人员的审核。老师审核不在这里处理.
+	 * @param id
 	 * @param title
 	 * @param pass
 	 * @param remark
@@ -780,6 +792,7 @@ public class CourseManageApi extends ApiBaseController{
 	
 	/**
 	 * 审核并发布,未完成的处理，
+	 * @param id
 	 * @param title
 	 * @param pass
 	 * @param remark
@@ -823,6 +836,10 @@ public class CourseManageApi extends ApiBaseController{
 	
 	/**
 	 * 发布课程信息,已经没有单独的发布了
+	 * @param id
+	 * @param title
+	 * @param pass
+	 * @param remark
 	 * @return
 	 */
 	@Deprecated
@@ -1220,10 +1237,5 @@ public class CourseManageApi extends ApiBaseController{
 		return success(courses);
 	}
 
-	@PostMapping("/saveTip")
-	public JsonResponse<Boolean> saveTip(){
-		String aid=getCurrent().getAccountId();
-		courseService.saveTip(aid);
-		return success(true);
-	}
+
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -399,13 +399,16 @@ public class Course extends BaseEntity {
 
     @Transient
     private String teacher;
-
-    /**
-     * 新增在线课时是否需要标签提示
-     */
+    
+    /**审核人名称（列表展示用）*/
     @Transient
-    private Boolean isTip;
+    private String auditUser;
 
+    /**审核时间（列表展示用）*/
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Transient
+    private LocalDateTime auditTime;
+    
     public Course(String id,String name,String summary,String coverImg,String sysCreateAid,String sysCreateBy,Integer type,LocalDateTime publishTime){
         super.setId(id);
         this.name=name;

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

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

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

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

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

@@ -2,6 +2,7 @@ package com.xboe.module.course.service;
 
 
 import java.util.List;
+import java.util.Map;
 
 import com.xboe.common.PageList;
 import com.xboe.module.course.dto.CourseHRBPAuditDto;
@@ -56,5 +57,10 @@ public interface ICourseHRBPAuditService {
      */
     PageList<CourseHRBPAudit> pageList(Integer pageIndex, Integer pageSize,int userType, CourseHRBPAudit info);
     
+    /**
+     * 查询一组课程的最近一次审核记录，返回键为courseId的映射。
+     */
+    Map<String, CourseHRBPAudit> findLatestByCourseIds(List<String> courseIds);
+
 
 }

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

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

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

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

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

@@ -1,7 +1,9 @@
 package com.xboe.module.course.service.impl;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import javax.annotation.Resource;
 
@@ -263,4 +265,27 @@ public class CourseHRBPAuditServiceImpl implements ICourseHRBPAuditService {
 		return courseHRBPAuditDao.get(id);
 	}
 
+    @Override
+    public Map<String, CourseHRBPAudit> findLatestByCourseIds(List<String> courseIds) {
+        Map<String, CourseHRBPAudit> result = new HashMap<String, CourseHRBPAudit>();
+        if (courseIds == null || courseIds.isEmpty()) {
+            return result;
+        }
+        try {
+            // 按 addTime 倒序，使首次出现的courseId即为该课程的最近一条审核记录
+            List<CourseHRBPAudit> audits = courseHRBPAuditDao.findList(
+                    OrderCondition.desc("addTime"),
+                    FieldFilters.in("courseId", courseIds)
+            );
+            for (CourseHRBPAudit a : audits) {
+                if (!result.containsKey(a.getCourseId())) {
+                    result.put(a.getCourseId(), a);
+                }
+            }
+        } catch (Exception e) {
+            log.error("批量查询课程审核记录错误", e.getMessage());
+        }
+        return result;
+    }
+
 }

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

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

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

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

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

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

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

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

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

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

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

@@ -79,15 +79,13 @@ xboe:
       default: https://u.boe.com/pc/images/bgimg/course.png
   case:
     ai:
-      base-url: https://gateway-internal.boe.com
-#      base-url: https://gateway-pro.boe.com
-      app-key: 3edef300b25642da949ccddf58441a0f
-      secret-key: 43bc8003a811a7f9c89cbecbfe4bbb22
+      base-url: http://10.10.181.114:30003
+      app-key: 6e9be45319184ac793aa127c362b0f0b
+      secret-key: db4d24279e3d6dbf1524af42cd0bedd2
       ai-api-code: 30800
       chat-api-code: 32065
-      case-knowledge-id: f062c9e4-c6ad-437b-b5ca-bbb9fed9b442
-      caseDetailUrlBase: https://u.boe.com/pc/case/detail?id=
-      file-upload-callback-url: https://u.boe.com/systemapi/xboe/m/boe/caseDocumentLog/uploadCallback
+      case-knowledge-id: de2e006e-82fb-4ace-8813-f25c316be4ff
+      file-upload-callback-url: http://10.251.113.95:9090/xboe/m/boe/caseDocumentLog/uploadCallback
       use-white-list: true
       white-user-code-list:
         - "00004409"
@@ -110,12 +108,10 @@ xboe:
         - "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
 xxl:
   job:
     accessToken: 65ddc683-22f5-83b4-de3a-3c97a0a29af0

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

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

sql/20251115/数据迁移SQL脚本.sql

@@ -0,0 +1,215 @@
+-- 数据迁移SQL（项目与报名）
+-- 执行顺序：
+--   1.1 查看项目数据量
+--   1.2 预览项目数据
+--   1.3 迁移项目信息
+--   1.4 验证项目迁移结果
+--   2.1 查看报名数据量（按项目ID）
+--   2.2 预览报名数据
+--   2.3 获取新项目ID
+--   2.4 写入报名数据（使用新项目ID）
+--   2.5 验证报名迁移结果
+
+-- 任务1：项目数据迁移（eln_boe_mixture_project -> boe_new.project_info），条件：is_deleted='0' AND program_name='社招新员工在线入职学习'
+-- 步骤1.1：查看符合条件的数据量（执行前验证）
+SELECT COUNT(*) AS data_count
+FROM elearninglms.eln_boe_mixture_project
+WHERE is_deleted = '0' 
+  AND program_name = '社招新员工在线入职学习';
+
+-- 步骤1.2：查看要迁移的数据详情（执行前验证）
+SELECT *
+FROM elearninglms.eln_boe_mixture_project
+WHERE is_deleted = '0' 
+  AND program_name = '社招新员工在线入职学习';
+
+-- 步骤1.3：执行数据迁移（INSERT INTO ... SELECT）
+INSERT INTO boe_new.project_info (
+    name,
+    pic_url,
+    type,
+    begin_time,
+    end_time,
+    manager_id,
+    remark,
+    status,
+    num_value,
+    introduction,
+    new_type,
+    deleted,
+    unlock_mode,
+    rank_flag,
+    attach_switch,
+    bpm_flag,
+    load_flag,
+    create_time,
+    create_id,
+    update_time,
+    update_id
+)
+SELECT 
+    p.program_name AS name,
+    p.theme_url AS pic_url,
+    1 AS type,  -- 项目类别固定为1
+    CASE 
+        WHEN p.open_start_time IS NOT NULL AND p.open_start_time > 0 
+        THEN FROM_UNIXTIME(p.open_start_time)
+        WHEN p.start_time IS NOT NULL AND p.start_time > 0 
+        THEN FROM_UNIXTIME(p.start_time)
+        ELSE NULL
+    END AS begin_time,
+    CASE 
+        WHEN p.open_end_time IS NOT NULL AND p.open_end_time > 0 
+        THEN FROM_UNIXTIME(p.open_end_time)
+        WHEN p.end_time IS NOT NULL AND p.end_time > 0 
+        THEN FROM_UNIXTIME(p.end_time)
+        ELSE NULL
+    END AS end_time,
+    p.project_manager_id AS manager_id,
+    COALESCE(p.program_desc, p.program_desc_nohtml, '') AS remark,
+    CASE 
+        WHEN p.status = '0' THEN 0   -- 临时 → 草稿
+        WHEN p.status = '1' THEN 1   -- 正常 → 已发布
+        WHEN p.status = '2' THEN -1  -- 停用 → 已结束
+        ELSE 0
+    END AS status,
+    p.program_code AS num_value,
+    COALESCE(p.program_desc_nohtml, p.program_desc, '') AS introduction,
+    2 AS new_type,  -- 学习项目
+    0 AS deleted,   -- 未删除
+    1 AS unlock_mode,  -- 自由模式
+    0 AS rank_flag,    -- 不显示积分排行榜
+    1 AS attach_switch, -- 共享文档开启
+    0 AS bpm_flag,     -- 报名审批关闭
+    0 AS load_flag,    -- 下载成绩关闭
+    FROM_UNIXTIME(p.created_at) AS create_time,
+    CAST(p.created_by AS UNSIGNED) AS create_id,
+    FROM_UNIXTIME(COALESCE(p.updated_at, p.created_at)) AS update_time,
+    CAST(COALESCE(p.updated_by, p.created_by) AS UNSIGNED) AS update_id
+FROM elearninglms.eln_boe_mixture_project p
+WHERE p.is_deleted = '0' 
+  AND p.program_name = '社招新员工在线入职学习'
+  AND NOT EXISTS (
+      -- 防止重复插入：如果项目名称已存在则跳过
+      SELECT 1 
+      FROM boe_new.project_info pi 
+      WHERE pi.name = p.program_name 
+        AND pi.deleted = 0
+  );
+
+-- 步骤1.4：验证迁移结果
+SELECT 
+    COUNT(*) AS migrated_count,
+    name,
+    status,
+    begin_time,
+    end_time
+FROM boe_new.project_info
+WHERE name = '社招新员工在线入职学习'
+  AND deleted = 0
+GROUP BY name, status, begin_time, end_time;
+
+-- 任务2：项目报名数据迁移（eln_boe_mixture_project_enroll -> boe_base.boe_study_course）
+-- 迁移全部报名数据（包括已删除记录，按 is_deleted 映射状态）
+
+-- 步骤2.1：查看符合条件的数据量（执行前验证）
+-- 注意：需要先将 '123xxx' 替换为实际的项目ID（kid）
+SELECT COUNT(*) AS enroll_count
+FROM elearninglms.eln_boe_mixture_project_enroll
+WHERE program_id = '123xxx';  -- 请替换为实际的项目ID（kid）
+
+-- 步骤2.2：查看要迁移的数据详情（执行前验证）
+SELECT *
+FROM elearninglms.eln_boe_mixture_project_enroll
+WHERE program_id = '123xxx'  -- 请替换为实际的项目ID（kid）
+LIMIT 100;
+
+-- 步骤2.3：获取新项目ID
+SET @new_project_id = (
+    SELECT id FROM boe_new.project_info 
+    WHERE name = '社招新员工在线入职学习' AND deleted = 0
+    ORDER BY id DESC LIMIT 1
+);
+
+-- 步骤2.4：写入报名数据（使用新项目ID）
+INSERT INTO boe_base.boe_study_course (
+    course_id,
+    course_type,
+    course_name,
+    aid,
+    aname,
+    source,
+    add_time,
+    start_time,
+    last_score,
+    status,
+    progress,
+    remark
+)
+SELECT 
+    pi.id AS course_id,  -- 使用新项目表的自增ID
+    90 AS course_type,
+    COALESCE(pi.name, p.program_name, '') AS course_name,
+    e.user_id AS aid,
+    COALESCE(u.real_name, '') AS aname,
+    CASE 
+        WHEN e.enroll_method = 'self' THEN 1
+        WHEN e.enroll_method = 'admin' THEN 2
+        WHEN e.enroll_method = 'manager' THEN 3
+        ELSE 1
+    END AS source,
+    FROM_UNIXTIME(e.enroll_time) AS add_time,
+    FROM_UNIXTIME(e.enroll_time) AS start_time,
+    NULL AS last_score,
+    CASE 
+        WHEN e.enroll_type = '1' AND e.approved_state = '1' AND e.is_deleted = '0' THEN 2
+        WHEN e.enroll_type = '3' THEN 8
+        WHEN e.cancel_state = '1' THEN 8
+        WHEN e.is_deleted = '1' THEN 8
+        ELSE 1
+    END AS status,
+    0 AS progress,
+    CONCAT('迁移自项目报名表，报名ID：', e.kid) AS remark
+FROM elearninglms.eln_boe_mixture_project_enroll e
+LEFT JOIN elearninglms.eln_boe_mixture_project p 
+    ON e.program_id = p.kid
+LEFT JOIN boe_new.project_info pi 
+    ON p.program_name = pi.name AND pi.deleted = 0
+LEFT JOIN elearninglms.eln_fw_user u 
+    ON e.user_id = u.kid
+WHERE e.program_id = '123xxx'  -- 请替换为实际的项目ID（kid）
+  AND pi.id = @new_project_id  -- 使用新项目ID
+  AND NOT EXISTS (
+      SELECT 1 
+      FROM boe_base.boe_study_course sc 
+      WHERE sc.course_id = @new_project_id 
+        AND sc.aid = e.user_id
+  );
+
+-- 步骤2.5：验证迁移结果
+SELECT 
+    COUNT(*) AS migrated_count,
+    status,
+    COUNT(CASE WHEN last_score IS NOT NULL THEN 1 END) AS has_score_count
+FROM boe_base.boe_study_course
+WHERE course_id = @new_project_id
+GROUP BY status;
+
+-- 回滚SQL
+-- 回滚步骤R1：确认新项目ID（如变量丢失可重新获取）
+--SET @new_project_id = (
+--    SELECT id FROM boe_new.project_info
+--    WHERE name = '社招新员工在线入职学习' AND deleted = 0
+--    ORDER BY id DESC LIMIT 1
+--);
+--
+---- 回滚步骤R2：回滚报名数据（按备注标记，仅删除本次迁移写入的数据）
+--DELETE FROM boe_base.boe_study_course
+--WHERE course_id = @new_project_id
+--  AND remark LIKE '迁移自项目报名表%';
+--
+---- 回滚步骤R3：回滚项目信息（谨慎执行，确认仅影响本次迁移记录）
+--DELETE FROM boe_new.project_info
+--WHERE id = @new_project_id
+--  AND name = '社招新员工在线入职学习'
+--  AND deleted = 0;

sql/20251115/数据迁移方案文档.md

@@ -0,0 +1,187 @@
+# 数据迁移方案文档
+
+## 一、迁移概述
+
+本次迁移涉及两个数据迁移任务：
+1. **项目数据迁移**：从 `elearninglms.eln_boe_mixture_project` 迁移到 `boe_new.project_info`
+2. **项目报名数据迁移**：从 `elearninglms.eln_boe_mixture_project_enroll` 迁移到 `boe_base.boe_study_course`
+
+---
+
+## 二、任务1：项目数据迁移
+
+### 2.1 迁移信息
+
+- **源表**：`elearninglms.eln_boe_mixture_project`
+- **目标表**：`boe_new.project_info`
+- **迁移条件**：`is_deleted='0'` AND `program_name='社招新员工在线入职学习'`
+
+### 2.2 字段映射关系
+
+| 源表字段 | 目标表字段 | 说明 | 转换规则 |
+|---------|-----------|------|---------|
+| `kid` | - | 项目ID（varchar） | 不直接映射，目标表id为自增 |
+| `program_name` | `name` | 项目名称 | 直接映射 |
+| `program_desc` | `remark` | 项目描述/说明 | 直接映射 |
+| `theme_url` | `pic_url` | 封面图地址 | 直接映射 |
+| `start_time` / `open_start_time` | `begin_time` | 开始时间 | 优先使用 `open_start_time`，空则用 `start_time`，需转换为 timestamp |
+| `end_time` / `open_end_time` | `end_time` | 结束时间 | 优先使用 `open_end_time`，空则用 `end_time`，需转换为 timestamp |
+| `project_manager_id` | `manager_id` | 项目经理ID | 直接映射 |
+| `status` | `status` | 状态 | 需要转换：'0'→0(草稿), '1'→1(已发布), '2'→-1(已结束) |
+| `created_at` | `create_time` | 创建时间 | 需转换为 timestamp |
+| `created_by` | `create_id` | 创建人ID | 需转换为 bigint |
+| `updated_at` | `update_time` | 更新时间 | 需转换为 timestamp |
+| `updated_by` | `update_id` | 更新人ID | 需转换为 bigint |
+| `program_code` | `num_value` | 项目编号 | 直接映射 |
+| `program_desc` / `program_desc_nohtml` | `introduction` | 项目介绍 | 优先使用 `program_desc_nohtml` |
+
+### 2.3 默认值设置
+
+- `type`: 1（项目类别）
+- `new_type`: 2（学习项目）
+- `deleted`: 0（未删除）
+- `unlock_mode`: 1（自由模式）
+- `rank_flag`: 0（不显示积分排行榜）
+- `attach_switch`: 1（共享文档开启）
+- `bpm_flag`: 0（报名审批关闭）
+- `load_flag`: 0（下载成绩关闭）
+
+### 2.4 注意事项
+
+1. 目标表的 `id` 字段为自增主键，无需手动设置
+2. 时间字段需要从 int（时间戳）转换为 timestamp
+3. 状态字段需要根据源表的值进行映射转换
+4. 如果源表中存在多条符合条件的记录，需要确认是否全部迁移或仅迁移最新的一条
+
+---
+
+## 三、任务2：项目报名数据迁移
+
+### 3.1 迁移信息
+
+- **源表**：`elearninglms.eln_boe_mixture_project_enroll`
+- **目标表**：`boe_base.boe_study_course`
+- **迁移条件**：`program_id='123xxx'`（注意：实际执行时需要替换为真实的项目ID）
+- **重要说明**：**迁移全部报名数据，包括已删除的记录（is_deleted='1'）**。已删除的记录在状态映射时会被标记为"终止"状态（status=8）
+
+### 3.2 字段映射关系
+
+| 源表字段 | 目标表字段 | 说明 | 转换规则 |
+|---------|-----------|------|---------|
+| `program_id` | `course_id` | 项目ID（作为课程ID） | 直接映射 |
+| `user_id` | `aid` | 学员ID | 直接映射 |
+| - | `last_score` | 学习成绩 | 初始设置为 NULL，后续需要从成绩表关联更新 |
+| `enroll_type` + `approved_state` | `status` | 完成状态 | 根据业务规则映射（见下方） |
+| `enroll_time` | `add_time` | 加入时间（报名时间） | 需转换为 datetime |
+| `enroll_time` | `start_time` | 开始学习时间 | 需转换为 datetime |
+
+### 3.3 状态映射规则
+
+根据 `boe_study_course` 表的 status 定义：
+- `STATUS_NOSTUDY = 1`（未开始学习）
+- `STATUS_STUDYING = 2`（学习中）
+- `STATUS_ABORTED = 8`（终止）
+- `STATUS_FINISH = 9`（学习完成）
+
+**状态映射逻辑**：
+```sql
+CASE 
+    WHEN enroll_type = '1' AND approved_state = '1' AND is_deleted = '0' THEN 2  -- 报名成功且审批同意 → 学习中
+    WHEN enroll_type = '3' THEN 8                                                -- 拒绝报名 → 终止
+    WHEN cancel_state = '1' THEN 8                                               -- 取消审批同意 → 终止
+    WHEN is_deleted = '1' THEN 8                                                  -- 已删除 → 终止
+    ELSE 1                                                                         -- 其他情况 → 未开始
+END AS status
+```
+
+### 3.4 其他字段设置
+
+- `course_type`: 需要根据项目类型设置（默认为项目类型对应的课程类型）
+- `course_name`: 需要关联项目表获取项目名称
+- `aname`: 需要关联用户表获取学员姓名
+- `source`: 根据 `enroll_method` 映射（'self'→1, 'admin'→2, 'manager'→3）
+- `progress`: 初始设置为 0 或 NULL
+- `last_score`: 初始设置为 NULL，需要后续从成绩表更新
+
+### 3.5 注意事项
+
+1. **学习成绩（last_score）**：源表中没有直接的成绩字段，需要：
+   - 方案A：从其他成绩表（如 `eln_ln_examination_result_user`）关联获取
+   - 方案B：先设置为 NULL，后续通过业务逻辑更新
+   
+2. **完成状态（status）**：需要根据业务逻辑判断，当前映射规则仅供参考，实际使用时需要根据业务需求调整
+
+3. **项目ID替换**：SQL中的 `'123xxx'` 需要替换为实际的项目ID
+
+4. **数据去重**：确保 `(course_id, aid)` 组合的唯一性，避免重复插入
+
+5. **关联查询**：可能需要关联用户表获取学员姓名等信息
+
+6. **全部数据迁移**：本次迁移会包含所有符合条件的报名记录，包括已删除的记录。已删除的记录会根据 `is_deleted='1'` 映射为终止状态（status=8）
+
+---
+
+## 四、执行步骤
+
+### 4.1 执行前准备
+
+1. **备份数据**：执行迁移前，务必备份源表和目标表
+2. **验证条件**：确认迁移条件是否正确（特别是项目名称和项目ID）
+3. **数据检查**：检查源表中符合条件的数据量
+4. **环境确认**：确认目标数据库连接和权限
+
+### 4.2 执行顺序
+
+1. **先执行任务1**：迁移项目数据
+2. **获取新项目ID**：记录迁移后的项目ID（如果需要）
+3. **更新任务2的SQL**：将项目ID替换为实际值
+4. **执行任务2**：迁移项目报名数据
+
+### 4.3 执行后验证
+
+1. **数据量核对**：对比源表和目标表的记录数
+2. **关键字段验证**：抽查关键字段是否正确迁移
+3. **业务功能验证**：在系统中验证迁移后的数据是否正常
+
+---
+
+## 五、风险评估与回滚方案
+
+### 5.1 风险点
+
+1. **数据量**：如果数据量较大，可能影响系统性能
+2. **字段类型不匹配**：时间戳转换、状态值转换可能出错
+3. **数据完整性**：关联字段可能缺失或无效
+4. **业务逻辑**：状态映射规则可能与实际业务不符
+
+### 5.2 回滚方案
+
+1. **备份恢复**：使用备份数据恢复目标表
+2. **删除迁移数据**：根据迁移条件删除已迁移的数据
+3. **数据修复**：手动修复错误的数据
+
+---
+
+## 六、附录
+
+### 6.1 相关表结构
+
+- `elearninglms.eln_boe_mixture_project`：源项目表
+- `boe_new.project_info`：目标项目表
+- `elearninglms.eln_boe_mixture_project_enroll`：源报名表
+- `boe_base.boe_study_course`：目标课程学习表
+
+### 6.2 状态值对照表
+
+**项目状态映射**：
+- '0'（临时）→ 0（草稿）
+- '1'（正常）→ 1（已发布）
+- '2'（停用）→ -1（已结束）
+
+**学习状态映射**：
+- 1：未开始学习
+- 2：学习中
+- 8：终止
+- 9：学习完成
+
+---