修复1155报错、阶段性审核信息

fix: 资源学习情况倒序改正序
(cherry picked from commit 0837ab3676)
2025-12-25 02:32:57 +08:00 · 2025-12-24 14:24:16 +08:00 · 2025-12-24 09:35:44 +08:00 · 2025-12-23 21:51:35 +08:00 · 2025-12-23 21:42:30 +08:00 · 2025-12-23 18:49:05 +08:00
24 changed files with 966 additions and 453 deletions
--- a/servers/boe-server-all/src/main/java/com/xboe/enums/StudyTimeStatusEnum.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/enums/StudyTimeStatusEnum.java
@@ -0,0 +1,71 @@
+package com.xboe.enums;
+
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Objects;
+
+/**
+ * 学习时长时间筛选状态枚举
+ * <p>用于筛选学习时长的时间范围条件</p>
+ *
+ * @author miaowenbo
+ * @since 2025-11-24
+ */
+@Getter
+public enum StudyTimeStatusEnum {
+
+    /**
+     * 所有时间范围
+     */
+    STATUS_ALL(0, "所有"),
+
+    /**
+     * 今年以来
+     */
+    STATUS_THIS_YEAR(1, "今年以来"),
+
+    /**
+     * 最近一年
+     */
+    STATUS_LAST_YEAR(2, "最近一年"),
+
+    /**
+     * 最近三个月
+     */
+    STATUS_LAST_THREE_MONTHS(3, "最近三个月"),
+
+    /**
+     * 最近一个月
+     */
+    STATUS_LAST_MONTH(4, "最近一个月"),
+
+    /**
+     * 最近一周
+     */
+    STATUS_LAST_WEEK(5, "最近一周");
+
+    private final int code;
+    private final String label;
+
+    /**
+     * 构造函数
+     *
+     * @param code  状态码
+     * @param label 标签描述
+     */
+    StudyTimeStatusEnum(int code, String label) {
+        this.code = code;
+        this.label = label;
+    }
+
+    /**
+     * 根据状态码获取对应的枚举值
+     *
+     * @param code 状态码
+     * @return 对应的枚举值，若未找到则返回默认值STATUS_ALL
+     */
+    public static StudyTimeStatusEnum getByCode(Integer code) {
+        return Arrays.stream(values()).filter(item -> Objects.equals(item.code, code)).findFirst().orElse(STATUS_ALL);
+    }
+}
--- a/servers/boe-server-all/src/main/java/com/xboe/module/assistance/service/impl/SmtpEmailServiceImpl.java
+++ b/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();
--- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CaseAiChatApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CaseAiChatApi.java
@@ -200,10 +200,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());
--- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CaseAiChatServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CaseAiChatServiceImpl.java
@@ -216,7 +216,6 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
        EventSourceListener listener = new EventSourceListener() {
            @Override
            public void onOpen(@NotNull EventSource eventSource, @NotNull Response response) {
-                log.info("调用接口 [{}] 接口开始监听", request.url());
                // 检查contentType
                String contentType = response.header("Content-Type");
                if (contentType == null || !contentType.contains("text/event-stream")) {
@@ -258,6 +257,7 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {
                    eventSource.cancel();
                    return;
                }
+                log.info("调用接口 [{}] 接口开始监听", request.url());
                // 将EventSource存储到Map中，以便后续可以中断
                conversationEventSourceMap.put(conversationId, eventSource);
            }
@@ -375,7 +375,7 @@ public class CaseAiChatServiceImpl implements ICaseAiChatService {

        // 8. 执行HTTP请求
        OkHttpClient client = new OkHttpClient.Builder()
-                .connectTimeout(100, TimeUnit.SECONDS)
+                .connectTimeout(60, TimeUnit.SECONDS)
                .writeTimeout(600, TimeUnit.SECONDS)
                .readTimeout(600, TimeUnit.SECONDS)
                .callTimeout(600, TimeUnit.SECONDS)
--- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CaseKnowledgeServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CaseKnowledgeServiceImpl.java
@@ -765,191 +765,186 @@ public class CaseKnowledgeServiceImpl implements ICaseKnowledgeService {
            }
        }

-        if (StringUtils.equals(cases.getConfidentialityLevel(), "内部")) {
-            JSONObject requestBody = new JSONObject();
-            String userId = getCurrentUserId();
-            requestBody.put("userId", userId);
-            requestBody.put("kId", caseAiProperties.getCaseKnowledgeId());
-            requestBody.put("parseType", "AUTO");
-            // 2. 检查文件路径
-            if (StringUtil.isBlank(cases.getFilePath())) {
-                log.error("上传案例文档失败，案例文件路径为空，caseId: {}", caseId);
-                saveCaseDocumentLog(caseId, cases.getTitle(), CaseDocumentLogOptTypeEnum.UPDATE.getCode(), CaseAiConstants.CASE_DOC_UPLOAD_INTERFACE_NAME,
-                        requestBody.toJSONString(), "上传案例文档失败，案例文件路径为空",
-                        CaseDocumentLogRunStatusEnum.COMPLETED.getCode(), CaseDocumentLogOptStatusEnum.FAILED.getCode(), null, null);
-                return false;
-            }
+        JSONObject requestBody = new JSONObject();
+        String userId = getCurrentUserId();
+        requestBody.put("userId", userId);
+        requestBody.put("kId", caseAiProperties.getCaseKnowledgeId());
+        requestBody.put("parseType", "AUTO");
+        // 2. 检查文件路径
+        if (StringUtil.isBlank(cases.getFilePath())) {
+            log.error("上传案例文档失败，案例文件路径为空，caseId: {}", caseId);
+            saveCaseDocumentLog(caseId, cases.getTitle(), CaseDocumentLogOptTypeEnum.UPDATE.getCode(), CaseAiConstants.CASE_DOC_UPLOAD_INTERFACE_NAME,
+                    requestBody.toJSONString(), "上传案例文档失败，案例文件路径为空",
+                    CaseDocumentLogRunStatusEnum.COMPLETED.getCode(), CaseDocumentLogOptStatusEnum.FAILED.getCode(), null, null);
+            return false;
+        }

-            String savePath = fileUploader.getSavePath();
-            String filePath = savePath + cases.getFilePath();
-            File file = new File(filePath);
-            if (!file.exists()) {
-                log.error("上传案例文档失败，案例文件不存在，filePath: {}", filePath);
-                saveCaseDocumentLog(caseId, cases.getTitle(), CaseDocumentLogOptTypeEnum.UPDATE.getCode(), CaseAiConstants.CASE_DOC_UPLOAD_INTERFACE_NAME,
-                        requestBody.toJSONString(), "上传案例文档失败，案例文件不存在，filePath: " + filePath,
-                        CaseDocumentLogRunStatusEnum.COMPLETED.getCode(), CaseDocumentLogOptStatusEnum.FAILED.getCode(), null, null);
-                return false;
-            }
+        String savePath = fileUploader.getSavePath();
+        String filePath = savePath + cases.getFilePath();
+        File file = new File(filePath);
+        if (!file.exists()) {
+            log.error("上传案例文档失败，案例文件不存在，filePath: {}", filePath);
+            saveCaseDocumentLog(caseId, cases.getTitle(), CaseDocumentLogOptTypeEnum.UPDATE.getCode(), CaseAiConstants.CASE_DOC_UPLOAD_INTERFACE_NAME,
+                    requestBody.toJSONString(), "上传案例文档失败，案例文件不存在，filePath: " + filePath,
+                    CaseDocumentLogRunStatusEnum.COMPLETED.getCode(), CaseDocumentLogOptStatusEnum.FAILED.getCode(), null, null);
+            return false;
+        }

-            // 4. 构建上传参数
-            String fileName = file.getName();
+        // 4. 构建上传参数
+        String fileName = file.getName();

-            String fileType = getFileType(fileName);
+        String fileType = getFileType(fileName);

-            // 5. 重试逻辑：最多3次机会
-            int uploadMaxRetries = 3;
+        // 5. 重试逻辑：最多3次机会
+        int uploadMaxRetries = 3;

-            // 构建multipart/form-data请求体
-            MultipartEntityBuilder builder = MultipartEntityBuilder.create();
-            builder.addBinaryBody("file", file);
-            builder.addTextBody("userId", userId, ContentType.TEXT_PLAIN);
-            builder.addTextBody("kId", caseAiProperties.getCaseKnowledgeId(), ContentType.TEXT_PLAIN);
-            builder.addTextBody("fileName", fileName, ContentType.TEXT_PLAIN);
-            requestBody.put("fileName", fileName);
-            builder.addTextBody("fileType", fileType, ContentType.TEXT_PLAIN);
-            requestBody.put("fileType", fileType);
-            builder.addTextBody("parseType", "AUTO", ContentType.TEXT_PLAIN);
+        // 构建multipart/form-data请求体
+        MultipartEntityBuilder builder = MultipartEntityBuilder.create();
+        builder.addBinaryBody("file", file);
+        builder.addTextBody("userId", userId, ContentType.TEXT_PLAIN);
+        builder.addTextBody("kId", caseAiProperties.getCaseKnowledgeId(), ContentType.TEXT_PLAIN);
+        builder.addTextBody("fileName", fileName, ContentType.TEXT_PLAIN);
+        requestBody.put("fileName", fileName);
+        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()))
+        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();
-                    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));
+                    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());

-            ContentType contentType = ContentType.create("text/plain", StandardCharsets.UTF_8);
-            builder.addTextBody("fileMetaData", fileMetaData.toJSONString(), contentType);
-            requestBody.put("fileMetaData", fileMetaData);
-            // 由于接口权限，目前采用不回调，而是通过批处理的方式，处理文件状态
-            if (caseAiProperties.isFileUploadUseCallback()) {
-                builder.addTextBody("callbackUrl", caseAiProperties.getFileUploadCallbackUrl(), ContentType.TEXT_PLAIN);
-                requestBody.put("callbackUrl", caseAiProperties.getFileUploadCallbackUrl());
+            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));
            }
+        }

-            String uploadUrl = caseAiProperties.getBaseUrl() + "/apigateway/knowledge/v1/file/upload";
+        ContentType contentType = ContentType.create("text/plain", StandardCharsets.UTF_8);
+        builder.addTextBody("fileMetaData", fileMetaData.toJSONString(), contentType);
+        requestBody.put("fileMetaData", fileMetaData);
+        // 由于接口权限，目前采用不回调，而是通过批处理的方式，处理文件状态
+        if (caseAiProperties.isFileUploadUseCallback()) {
+            builder.addTextBody("callbackUrl", caseAiProperties.getFileUploadCallbackUrl(), ContentType.TEXT_PLAIN);
+            requestBody.put("callbackUrl", caseAiProperties.getFileUploadCallbackUrl());
+        }

-            // 3. 获取access_token
-            String accessToken = aiAccessTokenService.getAccessToken();
-            if (StringUtil.isBlank(accessToken)) {
-                log.error("上传案例文档失败，获取access_token失败");
-                saveCaseDocumentLog(caseId, cases.getTitle(), CaseDocumentLogOptTypeEnum.UPDATE.getCode(), CaseAiConstants.CASE_DOC_UPLOAD_INTERFACE_NAME,
-                        requestBody.toJSONString(), "上传案例文档失败，获取access_token失败",
-                        CaseDocumentLogRunStatusEnum.COMPLETED.getCode(), CaseDocumentLogOptStatusEnum.FAILED.getCode(), null, null);
-                return false;
-            }
-            for (int attempt = 1; attempt <= uploadMaxRetries; attempt++) {
-                log.info("上传案例文档第{}次尝试，caseId: {}", attempt, caseId);
+        String uploadUrl = caseAiProperties.getBaseUrl() + "/apigateway/knowledge/v1/file/upload";

-                try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
-                    HttpPost httpPost = new HttpPost(uploadUrl);
-                    httpPost.setHeader("X-AI-ApiCode", caseAiProperties.getAiApiCode());
-                    httpPost.setHeader("access_token", accessToken);
+        // 3. 获取access_token
+        String accessToken = aiAccessTokenService.getAccessToken();
+        if (StringUtil.isBlank(accessToken)) {
+            log.error("上传案例文档失败，获取access_token失败");
+            saveCaseDocumentLog(caseId, cases.getTitle(), CaseDocumentLogOptTypeEnum.UPDATE.getCode(), CaseAiConstants.CASE_DOC_UPLOAD_INTERFACE_NAME,
+                    requestBody.toJSONString(), "上传案例文档失败，获取access_token失败",
+                    CaseDocumentLogRunStatusEnum.COMPLETED.getCode(), CaseDocumentLogOptStatusEnum.FAILED.getCode(), null, null);
+            return false;
+        }
+        for (int attempt = 1; attempt <= uploadMaxRetries; attempt++) {
+            log.info("上传案例文档第{}次尝试，caseId: {}", attempt, caseId);

-                    HttpEntity multipart = builder.build();
-                    httpPost.setEntity(multipart);
+            try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
+                HttpPost httpPost = new HttpPost(uploadUrl);
+                httpPost.setHeader("X-AI-ApiCode", caseAiProperties.getAiApiCode());
+                httpPost.setHeader("access_token", accessToken);

-                    try (CloseableHttpResponse response = httpClient.execute(httpPost)) {
-                        int statusCode = response.getStatusLine().getStatusCode();
-                        String responseBody = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
+                HttpEntity multipart = builder.build();
+                httpPost.setEntity(multipart);

-                        if (statusCode == 200) {
-                            JSONObject result = JSON.parseObject(responseBody);
-                            if (result.getBooleanValue("success")) {
-                                // 业务处理成功
-                                JSONObject data = result.getJSONObject("data");
-                                String taskId = data.getString("taskId");
+                try (CloseableHttpResponse response = httpClient.execute(httpPost)) {
+                    int statusCode = response.getStatusLine().getStatusCode();
+                    String responseBody = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);

-                                // 保存成功的CaseDocumentLog记录
+                    if (statusCode == 200) {
+                        JSONObject result = JSON.parseObject(responseBody);
+                        if (result.getBooleanValue("success")) {
+                            // 业务处理成功
+                            JSONObject data = result.getJSONObject("data");
+                            String taskId = data.getString("taskId");
+
+                            // 保存成功的CaseDocumentLog记录
 //                            saveCaseDocumentLog(caseId, cases.getTitle(), CaseDocumentLogOptTypeEnum.UPDATE.getCode(), CaseAiConstants.CASE_DOC_UPLOAD_INTERFACE_NAME,
 //                                    requestBody.toJSONString(), responseBody,
 //                                    CaseDocumentLogRunStatusEnum.RUNNING.getCode(), null, null, taskId);
-                                saveCaseDocumentLog(caseId, cases.getTitle(), CaseDocumentLogOptTypeEnum.UPDATE.getCode(), CaseAiConstants.CASE_DOC_UPLOAD_INTERFACE_NAME,
-                                        requestBody.toJSONString(), responseBody,
-                                        CaseDocumentLogRunStatusEnum.COMPLETED.getCode(), CaseDocumentLogOptStatusEnum.SUCCESS.getCode(), CaseDocumentLogCaseStatusEnum.FAILED.getCode(), taskId);
-
-                                log.info("上传案例文档成功，等待文档状态变更. caseId: {}, taskId: {}, 尝试次数: {}", caseId, taskId, attempt);
-                                return true;
-                            } else {
-                                // 业务处理失败，不重试
-                                log.error("上传案例文档业务处理失败，不重试，response: {}", responseBody);
-                                saveCaseDocumentLog(caseId, cases.getTitle(), CaseDocumentLogOptTypeEnum.UPDATE.getCode(), CaseAiConstants.CASE_DOC_UPLOAD_INTERFACE_NAME,
-                                        requestBody.toJSONString(), responseBody,
-                                        CaseDocumentLogRunStatusEnum.COMPLETED.getCode(), CaseDocumentLogOptStatusEnum.SUCCESS.getCode(), CaseDocumentLogCaseStatusEnum.FAILED.getCode(), null);
-                                return false;
-                            }
-                        } else {
-                            // 接口调用失败
-                            log.error("上传案例文档接口调用失败，第{}次尝试，status: {}, response: {}", attempt, statusCode, responseBody);
                            saveCaseDocumentLog(caseId, cases.getTitle(), CaseDocumentLogOptTypeEnum.UPDATE.getCode(), CaseAiConstants.CASE_DOC_UPLOAD_INTERFACE_NAME,
                                    requestBody.toJSONString(), responseBody,
-                                    CaseDocumentLogRunStatusEnum.COMPLETED.getCode(), CaseDocumentLogOptStatusEnum.FAILED.getCode(), null, null);
-                            if (attempt == uploadMaxRetries) {
-                                // 最后一次尝试仍然失败
-                                return false;
-                            }
-                            // 继续下一次重试
+                                    CaseDocumentLogRunStatusEnum.COMPLETED.getCode(), CaseDocumentLogOptStatusEnum.SUCCESS.getCode(), CaseDocumentLogCaseStatusEnum.FAILED.getCode(), taskId);
+
+                            log.info("上传案例文档成功，等待文档状态变更. caseId: {}, taskId: {}, 尝试次数: {}", caseId, taskId, attempt);
+                            return true;
+                        } else {
+                            // 业务处理失败，不重试
+                            log.error("上传案例文档业务处理失败，不重试，response: {}", responseBody);
+                            saveCaseDocumentLog(caseId, cases.getTitle(), CaseDocumentLogOptTypeEnum.UPDATE.getCode(), CaseAiConstants.CASE_DOC_UPLOAD_INTERFACE_NAME,
+                                    requestBody.toJSONString(), responseBody,
+                                    CaseDocumentLogRunStatusEnum.COMPLETED.getCode(), CaseDocumentLogOptStatusEnum.SUCCESS.getCode(), CaseDocumentLogCaseStatusEnum.FAILED.getCode(), null);
+                            return false;
                        }
+                    } else {
+                        // 接口调用失败
+                        log.error("上传案例文档接口调用失败，第{}次尝试，status: {}, response: {}", attempt, statusCode, responseBody);
+                        saveCaseDocumentLog(caseId, cases.getTitle(), CaseDocumentLogOptTypeEnum.UPDATE.getCode(), CaseAiConstants.CASE_DOC_UPLOAD_INTERFACE_NAME,
+                                requestBody.toJSONString(), responseBody,
+                                CaseDocumentLogRunStatusEnum.COMPLETED.getCode(), CaseDocumentLogOptStatusEnum.FAILED.getCode(), null, null);
+                        if (attempt == uploadMaxRetries) {
+                            // 最后一次尝试仍然失败
+                            return false;
+                        }
+                        // 继续下一次重试
                    }
-                } catch (Exception e) {
-                    // 接口调用异常
-                    log.error("上传案例文档接口调用异常，第{}次尝试", attempt, e);
-                    saveCaseDocumentLog(caseId, cases.getTitle(), CaseDocumentLogOptTypeEnum.UPDATE.getCode(), CaseAiConstants.CASE_DOC_UPLOAD_INTERFACE_NAME,
-                            requestBody.toJSONString(), "接口调用异常: " + e.getMessage(),
-                            CaseDocumentLogRunStatusEnum.COMPLETED.getCode(), CaseDocumentLogOptStatusEnum.FAILED.getCode(), null, null);
-                    if (attempt == uploadMaxRetries) {
-                        // 最后一次尝试仍然异常
-                        log.error("上传案例文档最终失败，已重试{}次", uploadMaxRetries);
-                        return false;
-                    }
-                    // 继续下一次重试
                }
+            } catch (Exception e) {
+                // 接口调用异常
+                log.error("上传案例文档接口调用异常，第{}次尝试", attempt, e);
+                saveCaseDocumentLog(caseId, cases.getTitle(), CaseDocumentLogOptTypeEnum.UPDATE.getCode(), CaseAiConstants.CASE_DOC_UPLOAD_INTERFACE_NAME,
+                        requestBody.toJSONString(), "接口调用异常: " + e.getMessage(),
+                        CaseDocumentLogRunStatusEnum.COMPLETED.getCode(), CaseDocumentLogOptStatusEnum.FAILED.getCode(), null, null);
+                if (attempt == uploadMaxRetries) {
+                    // 最后一次尝试仍然异常
+                    log.error("上传案例文档最终失败，已重试{}次", uploadMaxRetries);
+                    return false;
+                }
+                // 继续下一次重试
            }
-        } else {
-            log.info("非【内部】密级案例，不进行上传");
-            return true;
        }

        return false;
@@ -1033,7 +1028,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()
@@ -1043,11 +1038,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()
@@ -1057,11 +1052,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();
@@ -1101,7 +1096,7 @@ public class CaseKnowledgeServiceImpl implements ICaseKnowledgeService {
            log.error("批量检查文件状态异常", e);
        }
        
-//        log.info("批量检查文件状态完成");
+        log.info("批量检查文件状态完成");
    }

    /**
@@ -1369,7 +1364,7 @@ public class CaseKnowledgeServiceImpl implements ICaseKnowledgeService {
                caseLog.setCaseStatus(CaseDocumentLogCaseStatusEnum.SUCCESS.getCode());
                caseLog.setMetadataStatus(1);
                needUpdate = true;
-//                log.info("文档向量化成功，更新状态，taskId: {}, caseId: {}", caseLog.getTaskId(), caseLog.getCaseId());
+                log.info("文档向量化成功，更新状态，taskId: {}, caseId: {}", caseLog.getTaskId(), caseLog.getCaseId());
            } else if ("failed".equals(fileStatus)) {
                // 状态为failed，run_status、opt_status变更为1，case_status变更为2
                caseLog.setRunStatus(CaseDocumentLogRunStatusEnum.COMPLETED.getCode());
@@ -1377,20 +1372,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);
@@ -1407,7 +1402,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);
--- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/task/CaseDocumentLogTask.java
+++ b/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("结束批量查询文件状态");
    }
 }
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseAuditApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseAuditApi.java
@@ -18,6 +18,7 @@ import com.xboe.module.course.service.*;
 import com.xboe.module.course.dto.*;
 import com.xboe.module.course.entity.*;
 import com.xboe.module.course.utils.HttpUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.CloseableHttpResponse;
@@ -26,7 +27,6 @@ import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -359,6 +359,8 @@ public class CourseAuditApi  extends ApiBaseController{
 			return badRequest("无审核结果信息");
 		}
 		Course c=courseService.get(courseId);
+		log.info("-- hrbp-submit-audit 提交审核 -- " + c );
+		log.info("-- hrbp-submit-audit 提交审核 tags-- " + c.getTags() );
 		if(c==null) {
 			return badRequest("课程不存在");
 		}
@@ -377,7 +379,9 @@ public class CourseAuditApi  extends ApiBaseController{
 		try {
 			CurrentUser cu=getCurrent();
 			service.hrbpSubmitAudit(auditId, courseId,open, pass,cu.getAccountId(),cu.getName(), remark);
-
+			log.info("-- hrbpSubmitAudit 提交审核 tags-- " + c.getTags() );
+			Course cc=courseService.get(courseId);
+			log.info("-- hrbpSubmitAudit 提交审核 tags-- " + cc.getTags() );
 			if (pass){
 				//修改在线课开课状态=已开课
 				String token = request.getHeader("Xboe-Access-Token");
@@ -387,6 +391,9 @@ public class CourseAuditApi  extends ApiBaseController{
                param.setOrgName(c.getOrgName());
 				thirdApi.updateOrSaveCourse(param,token);
 			}
+			log.info("-- updateOrSaveCourse 提交审核 tags-- " + c.getTags() );
+			Course ccc=courseService.get(courseId);
+			log.info("-- updateOrSaveCourse 提交审核 tags-- " + ccc.getTags() );
 			return success(true);
 		} catch (Exception e) {
 			log.error("HRBP审核提交处理错误",e);
@@ -492,14 +499,16 @@ public class CourseAuditApi  extends ApiBaseController{
 		log.info("aiSet:"+course.getAiSet()+",aiAbstract:"+course.getAiAbstract()+",aiDraft:"+course.getAiDraft()+",aiTranslate:"+course.getAiTranslate()+",languageCode:"+course.getLanguageCode());
 		List<CourseTeacher> teachers = dto.getTeachers();
 		StringBuilder teacherNames = new StringBuilder();
-		if(!CollectionUtils.isEmpty(teachers)){
+		if(teachers != null){
 			for (CourseTeacher teacher : teachers) {
 				teacherNames.append(teacher.getTeacherName()).append(",");
 			}
 		}
+		log.info("---------------courseID= "+course.getId());
+		log.info("-----------ccontentService:"+ccontentService);
 		List<CourseContent> cclist = ccontentService.getByCourseId(course.getId());
 		List<String> languageCode = course.getLanguageCode();
-		String code = String.join(",", languageCode);
+		String code = languageCode == null  ?  "" : String.join(",", languageCode);
 		List<BoeaiCourseDto> courseDtos = new ArrayList<>();
 		BoeaiCourseDto boeaiCourseDto = new BoeaiCourseDto();
 		List<BoeaiVideoResourceDto> videoList = new ArrayList<>();
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFullTextApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFullTextApi.java
@@ -14,10 +14,10 @@ import com.boe.feign.api.serverall.entity.UserData;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.xboe.api.ThirdApi;
 import com.xboe.data.outside.IOutSideDataService;
-import com.xboe.module.course.entity.CourseTag;
-import com.xboe.module.course.service.*;
 import com.xboe.module.course.dto.BoeaiCourseDto;
 import com.xboe.module.course.utils.HttpUtils;
+import com.xboe.module.course.entity.CourseTag;
+import com.xboe.module.course.service.*;
 import com.xboe.module.course.vo.TeacherVo;
 import com.xboe.school.study.entity.StudyCourse;
 import com.xboe.school.study.service.IStudyCourseService;
@@ -46,7 +46,7 @@ import lombok.extern.slf4j.Slf4j;

 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-//课程AI设置
+
@Slf4j
@RestController
@RequestMapping(value="/xboe/m/course/fulltext")
@@ -82,8 +82,6 @@ public class CourseFullTextApi  extends ApiBaseController{
 	@Value("${kjb.aicoreUrl}")
 	private String aicoreUrl;

-
-
 	/**
 	 * 课程的初始化
 	 * @return
@@ -441,9 +439,11 @@ public class CourseFullTextApi  extends ApiBaseController{
 						c.setKeywordsList(keywordsList);
 					}
 				}
-				if (StringUtils.isNotBlank(c.getTags()) && c.getTags().matches("[0-9,]+")) {
+				log.info("课程查询接口 getTags = " + c.getTags());
+                if (StringUtils.isNotBlank(c.getTags()) && c.getTags().matches("[0-9,]+")) {
 					List<CourseTag> tagList = courseTagService.getTagsByIds(c.getTags());
 					List<String> tags = tagList.stream().map(CourseTag::getTagName).collect(Collectors.toList());
+					log.info("课程查询接口 Tags = " + tags);
 					c.setTagsList(tags);
 				}

--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java
@@ -18,11 +18,10 @@ import com.xboe.api.vo.UserBasicInfoVo;
 import com.xboe.module.course.dto.*;
 import com.xboe.module.course.entity.*;
 import com.xboe.module.course.service.*;
-import com.xboe.module.course.vo.CoursePageVo;
 import org.apache.commons.collections4.CollectionUtils;
+import com.xboe.module.course.vo.CoursePageVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.util.CollectionUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.core.parameters.P;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -42,6 +41,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;
@@ -99,7 +111,6 @@ public class CourseManageApi extends ApiBaseController{
 	private ICourseTagService tagService;
 	@Resource
 	IOutSideDataService outSideDataService;
-	
 	@Autowired
    IDataUserSyncService userSyncService;
 	@Resource
@@ -110,7 +121,6 @@ public class CourseManageApi extends ApiBaseController{
 	@Resource
 	CourseFullTextApi courseFullTextApi;

-
 	@Value("${boe.pcPageUrl}")
 	private String pcPageUrl;

@@ -123,6 +133,8 @@ public class CourseManageApi extends ApiBaseController{
 	@Value("${boe.pcLoginUrl}")
 	private String pcLoginUrl;

+
+
 //	@PostMapping("/test")
 //	public JsonResponse<PageList<Course>> findTest(Pagination pager,CourseQueryDto dto){
 //		//dto.setOrgAid("7003708665807110150");
@@ -196,6 +208,7 @@ public class CourseManageApi extends ApiBaseController{
 	public void manageExport(CoursePageQueryDTO coursePageQueryDTO, HttpServletResponse response) {
 		coursePageService.exportCourseList(coursePageQueryDTO, response);
 	}
+
 	/**
 	 * 管理列表的查询
 	 * @param pager
@@ -248,13 +261,36 @@ public class CourseManageApi extends ApiBaseController{
 	public void fullAuditInfo(List<Course> list){
 		List<String> courseIdList = list.stream().map(Course::getId).collect(Collectors.toList());
 		List<CourseHRBPAudit> auditList = hrbpAuditService.listByCourseIds(courseIdList);
-		Map<String,CourseHRBPAudit> map = auditList.stream().collect(Collectors.toMap(CourseHRBPAudit::getCourseId, i->i));
+		Map<String,CourseHRBPAudit> map = new HashMap<>();
+		for(CourseHRBPAudit audit : auditList){
+			CourseHRBPAudit r = map.get(audit.getCourseId());
+			//可能存在多个审核记录，取时间最新的那一条
+			if(r == null || r.getAddTime().isBefore(audit.getAddTime())){
+				map.put(audit.getCourseId(),audit);
+			}
+		}
+
 		list.forEach(item ->{
 			CourseHRBPAudit audit = map.get(item.getId());
 			if(audit != null){
-				//暂时获取这两个字段,之后看是否需要调整
-				item.setAuditUser(audit.getAuditUser());
-				item.setAuditTime(audit.getAuditTime());
+				//公开课审核完成取公开课的审核信息
+				if(StringUtils.isNotEmpty(audit.getLastAname())){
+					item.setAuditUser(audit.getLastAname());
+					item.setAuditTime(audit.getLastTime());
+				}else if(CourseHRBPAudit.FORWARD_TEACHER == audit.getForward()){
+					//转发到教师审核取教师审核信息
+					item.setAuditUser(audit.getToName());
+				}else if (CourseHRBPAudit.FORWARD_TO_FINISH == audit.getForward()){
+					//老师审核完成
+					item.setAuditUser(audit.getAuditUser());
+					if(CourseHRBPAudit.STATUS_NOPASS ==audit.getStatus()){
+						//老师审核不通过时取老师的审核时间
+						item.setAuditTime(audit.getToAuditTime());
+					}
+				}else {
+					item.setAuditUser(audit.getAuditUser());
+					item.setAuditTime(audit.getAuditTime());
+				}
 			}
 		});

@@ -314,6 +350,7 @@ public class CourseManageApi extends ApiBaseController{
 		return success(rs);
 		
 	}
+
 	@GetMapping("/getDictIds")
 	public JsonResponse<Map<String,Object>> getDictIds(Long pid,Integer type){
 		CommonSearchVo searcher = new CommonSearchVo();
@@ -467,9 +504,8 @@ public class CourseManageApi extends ApiBaseController{
 				fillCourseData(dto.getCourse());
 				courseService.save(dto);
 			}else {
-				// 20251215lzx：编辑基本信息不提交状态，让前端课程可以继续查看
 				//修改后重置，重新提交审核，重新发布
-//				dto.getCourse().setPublished(false);
+				dto.getCourse().setPublished(false);
 				dto.getCourse().setStatus(Course.STATUS_NONE);
 				courseService.update(dto);
 			}
@@ -726,9 +762,8 @@ public class CourseManageApi extends ApiBaseController{
 			
 			//设置为提交状态
 			dto.getCourse().setStatus(Course.STATUS_SUBMIT);
-			// 20251217lzx 提交审核时不改变状态
-//			dto.getCourse().setEnabled(true);//设置启用状态问题
-//			dto.getCourse().setPublished(false);//重新提交审核设置为未发布状态
+			dto.getCourse().setEnabled(true);//设置启用状态问题
+			dto.getCourse().setPublished(false);//重新提交审核设置为未发布状态
 			courseService.submit(dto);
 			//提交成功发邮件提醒
 			try {
@@ -1045,7 +1080,6 @@ public class CourseManageApi extends ApiBaseController{
 	 */
 	@PostMapping("/top")
 	public JsonResponse<Boolean> setTop(String ids,String title, Boolean top){
-		// lzx：这个ids实际上只有一个id。。。
 		if(StringUtils.isBlank(ids)){
 			return badRequest("参数错误");
 		}
@@ -1054,14 +1088,8 @@ public class CourseManageApi extends ApiBaseController{
 		}
 		
 		try {
-//			courseService.setTop(ids, top,getCurrent().getAccountId(), title,"");
-//			return success(true);
-			// 调整置顶逻辑
-			ServiceResponse<Boolean> serviceResponse = coursePageService.top(ids, top);
-			if (!serviceResponse.isSuccess()) {
-				return error(serviceResponse.getMessage());
-			}
-			return success(serviceResponse.getData());
+			courseService.setTop(ids, top,getCurrent().getAccountId(), title,"");
+			return success(true);
 		} catch (Exception e) {
 			log.error("课程设置置顶错误",e);
 			return error("设置置顶失败",e.getMessage(),false);
@@ -1423,40 +1451,4 @@ public class CourseManageApi extends ApiBaseController{
 		courseService.saveTip(aid);
 		return success(true);
 	}
-
-	/**
-	 * 扫描二维码重定向
-	 * @param courseId 课程id
-	 * @param request
-	 * @param response
-	 * @throws IOException
-	 */
-	@GetMapping("/redirectDetail")
-	public void redirectDetail(
-			@NotNull Long courseId,
-			HttpServletRequest request,
-			HttpServletResponse response) throws IOException {
-
-		boolean isMobile = UserAgentUtil.parse(request.getHeader(Header.USER_AGENT.toString())).isMobile();
-		String baseUrl = isMobile ? h5PageUrl : pcPageUrl;
-//		String loginUrl = isMobile ? h5LoginUrl : pcLoginUrl;
-//
-//		CurrentUser currentUser;
-//		try {
-//			currentUser = getCurrent();
-//		} catch (Exception e) {
-//			log.warn("获取当前用户信息异常，跳转至登录页。课程ID: {}", courseId, e);
-//			response.sendRedirect(loginUrl);
-//			return;
-//		}
-//
-//		if (currentUser == null) {
-//			log.info("用户未登录，跳转至登录页。课程ID: {}", courseId);
-//			response.sendRedirect(loginUrl);
-//			return;
-//		}
-
-		log.info("跳转到课程详情页，课程ID: {}", courseId);
-		response.sendRedirect(baseUrl + courseId);
-	}
 }
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/Course.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/Course.java
@@ -442,19 +442,22 @@ public class Course extends BaseEntity {
    @Transient
    private String teacher;

+    /**审核人名称（列表展示用）*/
+    @Transient
+    private String auditUser;
+
+    /**审核时间（列表展示用）*/
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Transient
+    private LocalDateTime auditTime;
+
+
    /**
     * 新增在线课时是否需要标签提示
     */
    @Transient
    private Boolean isTip;

-    @Transient
-    private String auditUser;
-
-    @Transient
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime auditTime;
-
    /**
     * 课程时长（秒）
     */
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/CourseContent.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/CourseContent.java
@@ -2,6 +2,7 @@ package com.xboe.module.course.entity;

 import com.xboe.core.SysConstant;
 import com.xboe.core.orm.BaseEntity;
+import com.xboe.module.course.dto.BoeaiSubtitleRsp;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

@@ -9,14 +10,6 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
-
-import com.xboe.core.SysConstant;
-import com.xboe.core.orm.BaseEntity;
-
-import com.xboe.module.course.dto.BoeaiSubtitleRsp;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
 import java.util.List;

 /**
@@ -102,9 +95,6 @@ public class CourseContent extends BaseEntity {
    @Transient
    private Integer status;

-    @Transient
-    List<BoeaiSubtitleRsp> boeaiSubtitleRspList;
-
    /**
     * 展示名称（章名+节名，如果没有章节，则为课程名+节名）
     * 25.12.15新增
@@ -112,6 +102,9 @@ public class CourseContent extends BaseEntity {
    @Transient
    private String displayName;

+    @Transient
+    List<BoeaiSubtitleRsp> boeaiSubtitleRspList;
+
    public CourseContent() {
    	
    }
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseHRBPAuditService.java
+++ b/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,7 +57,12 @@ public interface ICourseHRBPAuditService {
     */
    PageList<CourseHRBPAudit> pageList(Integer pageIndex, Integer pageSize,int userType, CourseHRBPAudit info);

-
    List<CourseHRBPAudit> listByCourseIds(List<String> courseIdList);
+    
+    /**
+     * 查询一组课程的最近一次审核记录，返回键为courseId的映射。
+     */
+    Map<String, CourseHRBPAudit> findLatestByCourseIds(List<String> courseIds);
+

 }
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseHRBPAuditServiceImpl.java
+++ b/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,7 +265,31 @@ 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;
+    }
+
 	public List<CourseHRBPAudit> listByCourseIds(List<String> courseIdList){
 		return courseHRBPAuditDao.findList(FieldFilters.in("courseId",courseIdList));
 	}
+
 }
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java
@@ -18,27 +18,29 @@ import javax.management.Query;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson2.JSON;
-//import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+//import com.alibaba.fastjson2.JSON;
+//import cn.hutool.json.JSONUtil;
 import com.xboe.api.ThirdApi;
 import com.xboe.core.orm.*;
 import com.xboe.enums.CourseAuditTypeEnum;
 import com.xboe.module.course.dao.*;
 import com.xboe.module.course.dto.*;
 import com.xboe.module.course.entity.*;
+import com.xboe.module.course.utils.HttpUtils;
 import com.xboe.module.course.dao.*;
+import com.xboe.module.course.entity.*;
 import com.xboe.module.course.dto.CourseTagRelationDto;
 import com.xboe.module.course.entity.*;
 import com.xboe.module.course.service.ICourseHRBPAuditService;
 import com.xboe.module.course.service.ICourseTagService;
-import com.xboe.module.course.utils.HttpUtils;
 import com.xboe.school.study.dao.StudyCourseDao;
 import com.xboe.school.study.entity.StudyCourse;
 import org.apache.commons.lang3.StringUtils;
@@ -133,8 +135,6 @@ public class CourseServiceImpl implements ICourseService {

    @Resource
    RestHighLevelClient restHighLevelClient;
-    @Resource
-    private TipDao tipDao;

    @Resource
    private CourseTeacherDeletedRecordDao courseTeacherDeletedRecordDao;
@@ -145,6 +145,10 @@ public class CourseServiceImpl implements ICourseService {
    @Value("${kjb.aicoreUrl}")
    private String aicoreUrl;

+    @Resource
+    private TipDao tipDao;
+
+
    /**
     * 生成过滤条件
     *
@@ -439,12 +443,15 @@ public class CourseServiceImpl implements ICourseService {
        }
        Set<String> seache = getSeache(dto);
        //查出全部的课程
+        log.info("-------hhh-dto为" + dto);
        List<Course> listByFilters2 = courseDao.findListByFilters(oc, filters2);
+        log.info("*************listByFilters2为" + listByFilters2);
        if (TempFilterConfig.Manager_CourseFile_ByOrgIds) {
            if (dto.getIsSystemAdmin() == null || !dto.getIsSystemAdmin()) {
                List<String> finalStrings = strings;
                log.info("dto为" + dto);
                if (dto.getIsCreateCourse() != null && dto.getIsCreateCourse()) {
+                    log.info("-----111------" + "---------111---------");
                    listByFilters2.removeIf(e -> {
                        //去掉未发布的课程
                        if (!e.getPublished() && seache.contains(e.getId()) && !finalStrings.contains(e.getOrgId()) && !dto.getOrgAid().equals(e.getSysCreateAid())) {
@@ -458,36 +465,30 @@ 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{
+                    log.info("-----222------" + "---------222---------");
+                    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());
                    rs.setList(paginate);
-                    //log.info("78888888888888888888 "+paginate.isEmpty());
-                    if (paginate != null && !paginate.isEmpty()) {
-                        log.info("-----KJB------ getCourse");
-                        for (Course course : paginate) {
-                            this.getCourseFromKJB(course);
-                        }
-                    }
                    return rs;
                }
            }
        }
+        log.info("-----333------" + "---------333---------");
        List<Course> paginate = paginate(listByFilters2, pageIndex, pageSize);
        PageList<Course> rs = new PageList<>();
        rs.setCount(listByFilters2.size());
        rs.setPageSize(pageSize);
        rs.setList(paginate);
-
        if (paginate != null && !paginate.isEmpty()) {
            log.info("-----KJB------ getCourse");
            for (Course course : paginate) {
@@ -555,7 +556,7 @@ public class CourseServiceImpl implements ICourseService {
        String sql = "SELECT DISTINCT\n" +
                "rt.course_id\n" +
                "FROM\n" +
-                "boe_new.student s INNER JOIN boe_new.router_task rt on s.pid=rt.router_id inner join boe_course c on c.id=rt.course_id\n" +
+                "boe.student s INNER JOIN boe.router_task rt on s.pid=rt.router_id inner join boe_course c on c.id=rt.course_id\n" +
                "\n" +
                "WHERE\n" +
                "\n" +
@@ -578,7 +579,7 @@ public class CourseServiceImpl implements ICourseService {
        String sql = "SELECT DISTINCT\n" +
                "pt.course_id\n" +
                "FROM\n" +
-                "boe_new.student s INNER JOIN boe_new.project_task pt on s.pid=pt.project_id inner join boe_course c on c.id=pt.course_id\n" +
+                "boe.student s INNER JOIN boe.project_task pt on s.pid=pt.project_id inner join boe_course c on c.id=pt.course_id\n" +
                "\n" +
                "WHERE\n" +
                "\n" +
@@ -635,8 +636,8 @@ public class CourseServiceImpl implements ICourseService {
        String sql = "SELECT DISTINCT\n" +
                "\tc.id \n" +
                "FROM\n" +
-                "\tboe_new.student s\n" +
-                "\tINNER JOIN boe_new.grow_task gt ON s.pid = gt.grow_id\n" +
+                "\tboe.student s\n" +
+                "\tINNER JOIN boe.grow_task gt ON s.pid = gt.grow_id\n" +
                "\tINNER JOIN boe_course c ON gt.course_id = c.id \n" +
                "WHERE\n" +
                "\ts.type = 14 \n" +
@@ -948,6 +949,7 @@ public class CourseServiceImpl implements ICourseService {
    public Course getAddView(String id) {
        Course c = courseDao.get(id);
        courseDao.updateFieldById(id, "views", c.getViews() + 1);
+
        return c;
    }

@@ -1043,7 +1045,6 @@ public class CourseServiceImpl implements ICourseService {

        Course c = full.getCourse();//当前的课程信息
        Course nowCourse = courseDao.get(c.getId());//修改之前的课程信息
-
        StringBuffer stringBuffer = new StringBuffer("[");
        //追加日志内容
        appendUpdateLog(stringBuffer, nowCourse, c);
@@ -1176,6 +1177,7 @@ public class CourseServiceImpl implements ICourseService {
        hrbpAudit.setCourseId(c.getId());
        hrbpAudit.setAddTime(LocalDateTime.now());
        hrbpAudit.setAid(full.getAuditUser().getAid());
+        hrbpAudit.setAuditUser(full.getAuditUser().getName());//提前保存审核hrbp的名字，用于显示下一步审核人
        hrbpAudit.setAuditRemark("");
        hrbpAudit.setForward(CourseHRBPAudit.FORWARD_NONE);
        hrbpAudit.setStatus(CourseHRBPAudit.STATUS_NONE);
@@ -1189,8 +1191,9 @@ public class CourseServiceImpl implements ICourseService {

    @Override
    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());
--- a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java
@@ -2,10 +2,37 @@ package com.xboe.school.study.api;

 import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.nacos.shaded.com.google.common.util.concurrent.RateLimiter;
 import com.boe.feign.api.infrastructure.entity.CommonSearchVo;
 import com.boe.feign.api.infrastructure.entity.Dict;
 import com.xboe.api.ThirdApi;
+import com.xboe.constants.CacheName;
+import com.xboe.module.course.api.CourseFullTextApi;
+import com.xboe.module.course.dto.AiVideoResourceRsp;
+import com.xboe.module.course.dto.BoeaiSubtitleRsp;
+import com.xboe.module.course.dto.CourseFullText;
+import com.xboe.module.course.utils.HttpUtils;
+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.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.xboe.common.OrderCondition;
 import com.xboe.common.PageList;
 import com.xboe.common.Pagination;
@@ -63,7 +90,6 @@ import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;

-//添加AI课程学习内容
 /**
 * 课程学习的内容
 */
@@ -116,6 +142,12 @@ public class StudyCourseApi extends ApiBaseController{
 	@Resource
 	private ICourseTagService courseTagService;

+	@Autowired
+	CourseFullTextApi courseFullTextApi;
+
+	@Value("${kjb.aicoreUrl}")
+	private String aicoreUrl;
+
 	@Resource
 	private IOutSideDataService outsideService;

@@ -128,12 +160,6 @@ public class StudyCourseApi extends ApiBaseController{
 	@Resource
 	private XFileUploader fileUploader;

-	@Autowired
-	CourseFullTextApi courseFullTextApi;
-
-	@Value("${kjb.aicoreUrl}")
-	private String aicoreUrl;
-
 	/**
 	 * 用于避免JPA查询后修改entity实体字段，自动更新到数据库
 	 */
@@ -464,8 +490,6 @@ public class StudyCourseApi extends ApiBaseController{
 									Organization organization = organizationService.get(userInfo.getDepartId());
 									String departName = organization != null ? organization.getNamePath() : "";
 									studyCourse1.setOrgInfo(departName);
-									// 取userNo为工号
-									studyCourse1.setUserNo(userInfo.getUserNo());
 								}
 							}
 						} else {
@@ -567,6 +591,11 @@ public class StudyCourseApi extends ApiBaseController{
 		//StudyCourse sc=service.findByCourseIdAndAid(id, aid);
 		Map<String,Object> rs=new HashMap<String,Object>();
 		Course course=courseService.getAddView(cid);
+		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(","));
+			course.setTags(tags);
+		}
 		if(course==null || course.getDeleted()){
 			return badRequest("课程不存在或已被删除");
 		}
@@ -577,13 +606,14 @@ public class StudyCourseApi extends ApiBaseController{
 			String tags = tagList.stream().map(CourseTag::getTagName).collect(Collectors.joining(","));
 			course1.setTags(tags);
 		}
-		//rs.put("course",course1);
+		rs.put("course",course1);
 		//获取课程AI详情
 		log.info("---- KJB 获取课程详情 ---");
 		CourseFullText courseFullText = new CourseFullText();
 		courseFullText.setId(cid);
 		courseFullTextApi.getCourseFromKJB(courseFullText,course1);
 		rs.put("course",course1);
+		//rs.put("course",course);

 		List<CourseCrowd> courseCrowdList = courseService.findCrowdByCourseId(cid);
 		if(crowd!=null && crowd) {
@@ -809,41 +839,38 @@ public class StudyCourseApi extends ApiBaseController{
 	@PostMapping("/study")
 	public JsonResponse<String> study(@RequestBody StudyContentDto sci, HttpServletRequest request){

-		log.info("study已进入");
 		if(StringUtils.isBlank(sci.getStudyId())){
 			return error("参数错误");
 		}
 		if(StringUtils.isBlank(sci.getContentId())){
 			return error("参数错误:内容");
 		}
-//		LocalDateTime now=LocalDateTime.now();
 		CurrentUser cuser=getCurrent();
 		
 		if(sci.getDuration()==null) {
 			sci.setDuration(1);//增加5秒的学习时长,因方法是每5秒调用一次的
 		}
 		
-//		StudyTime st=new StudyTime();
-//		st.setContentId(sci.getContentId());
-//		st.setCourseId(sci.getCourseId());
-//		st.setDuration(5);//增加5秒的学习时长,因方法是每5秒调用一次的
-//		st.setEndTime(now);
-//		st.setStartTime(now);
-//		st.setStudentId(cuser.getAccountId());
-//		st.setStudentName(cuser.getName());
-//		st.setStudyId(sci.getStudyId());
 		String token = request.getHeader("Xboe-Access-Token");
 		if (StringUtils.isEmpty(token)) {
 			token = request.getHeader("token");
 		}
 		//检查是否已存在
+		long checkStartTime = System.currentTimeMillis();
 		StudyCourseItem item = studyService.checkHas(sci.getStudyId(),sci.getContentId());
+		long checkEndTime = System.currentTimeMillis();
+		log.info("【学习记录】检查学习记录是否存在完成，耗时={}ms, 是否存在={}", checkEndTime - checkStartTime, item != null);
+		
 		if(item!=null) {
+			long redisStartTime = System.currentTimeMillis();
 			String studyKey = CacheName.NAME_AUTH + ":" + CacheName.STUDY_KEY + item.getCourseId()+":"+cuser.getAccountId()+":"+item.getContentId();
 			String studyKey2 = CacheName.NAME_AUTH + ":" + CacheName.STUDY_KEY + sci.getCourseId()+":"+cuser.getAccountId()+":"+sci.getContentId();
 			redisTemplate.opsForValue().set(studyKey,
 					String.valueOf(item.getProgress()), 2, TimeUnit.HOURS);
 			String progressStr = redisTemplate.opsForValue().get(studyKey2);
+			long redisEndTime = System.currentTimeMillis();
+			log.info("【学习记录】Redis操作完成，耗时={}ms", redisEndTime - redisStartTime);
+			
 			if (progressStr != null && !progressStr.isEmpty()) {
 				// 尝试将 Redis 中的字符串转换为整数
 				int redisProgress = Integer.parseInt(progressStr);
@@ -851,20 +878,24 @@ public class StudyCourseApi extends ApiBaseController{
 				int sciProgress = sci.getProgress();

 				if (redisProgress < sciProgress && redisProgress < 100) {
-					// 执行一些操作
-//					if(item.getProgress()<100 && sci.getProgress()>item.getProgress()) {
-//					}
+					long updateStartTime = System.currentTimeMillis();
 					studyService.updateProcess(item.getId(), sci.getStudyId(), sci.getCourseId(), sci.getContentTotal(), sci.getProgress(),token);
+					long updateEndTime = System.currentTimeMillis();
+					log.info("【学习记录】更新学习进度完成，耗时={}ms", updateEndTime - updateStartTime);
 				}
 			}
 			//追加学习时长
+			long appendStartTime = System.currentTimeMillis();
 			studyService.appendStudyDuration(sci.getStudyId(),item.getId(),sci.getContentId(),sci.getDuration());
+			long appendEndTime = System.currentTimeMillis();
+			log.info("【学习记录】追加学习时长完成1，耗时={}ms", appendEndTime - appendStartTime);

-			log.info(" 1 在线课学习记录 sci.getStudyId() = "+ sci.getStudyId() + " , sci.getCourseId() = " + sci.getCourseId() );
+			log.info("【学习记录】调用第三方API，sci.getStudyId()={}, sci.getCourseId()={}", sci.getStudyId(), sci.getCourseId());
+			long thirdApiStartTime = System.currentTimeMillis();
 			List<StudyCourse> allUserList = thirdApi.getStudyCourseList(sci.getStudyId() ,sci.getCourseId(), token);
-			log.info("在线课学习记录"+allUserList);
+			long thirdApiEndTime = System.currentTimeMillis();
+			log.info("【学习记录】第三方API调用完成，耗时={}ms, 结果={}", thirdApiEndTime - thirdApiStartTime, allUserList);
 			return success(item.getId());
-			//如果记录存在，但是进度不100无成情况，就更新进度，一期不会有这种情况
 		}

 		if(StringUtils.isBlank(sci.getCourseId())){
@@ -878,15 +909,22 @@ public class StudyCourseApi extends ApiBaseController{
 			sci.setAid(cuser.getAccountId());
 			sci.setAname(cuser.getName());
 			
+			long saveStartTime = System.currentTimeMillis();
 			studyService.saveStudyInfo(sci,token);
+			long saveEndTime = System.currentTimeMillis();
+			log.info("【学习记录】保存学习信息完成，耗时={}ms", saveEndTime - saveStartTime);
+			
 			//学习记录成功后处理
+			long appendStartTime2 = System.currentTimeMillis();
 			studyService.appendStudyDuration(sci.getStudyId(),sci.getStudyItemId(),sci.getContentId(),sci.getDuration());
+			long appendEndTime2 = System.currentTimeMillis();
+			log.info("【学习记录】追加学习时长完成2，耗时={}ms", appendEndTime2 - appendStartTime2);
+			long thirdApiStartTime2 = System.currentTimeMillis();
 			List<StudyCourse> allUserList = thirdApi.getStudyCourseList(sci.getStudyId() ,sci.getCourseId(), token);
-			log.info("在线课学习记录"+allUserList);
-			//System.out.println("在线课学习记录"+allUserList);
+			long thirdApiEndTime2 = System.currentTimeMillis();
+			log.info("【学习记录】第三方API调用完成2，耗时={}ms, 结果={}", thirdApiEndTime2 - thirdApiStartTime2, allUserList);
 			return success(sci.getStudyItemId());
 		}catch(Exception e) {
-			log.error("记录学习情况错误",e);
 			return error("记录学习情况失败",e.getMessage());
 		}
 		
--- a/servers/boe-server-all/src/main/java/com/xboe/school/study/entity/StudyCourse.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/entity/StudyCourse.java
@@ -13,9 +13,9 @@ import javax.persistence.Transient;
 import java.time.LocalDateTime;

 /*
-* 课程学习表,课程图片通过对应图片的api获取,这里不做存储。
-* 此表也是一种历史记录，所以记录的字段多一些
-* */
+ * 课程学习表,课程图片通过对应图片的api获取,这里不做存储。
+ * 此表也是一种历史记录，所以记录的字段多一些
+ * */
@Data
@Entity
@EqualsAndHashCode(callSuper = true)
@@ -23,123 +23,123 @@ import java.time.LocalDateTime;
 public class StudyCourse extends IdEntity{

    private static final long serialVersionUID = 1L;
-    
+
    /**未开始学习*/
    public static final int STATUS_NOSTUDY=1;
-    
+
    /**学习中*/
    public static final int STATUS_STUDYING=2;
-    
+
    /**终止，比如课程下架*/
    public static final int STATUS_ABORTED=8;
-    
+
    /**学习完成*/
    public static final int STATUS_FINISH=9;

    /*
-    * 课程id
-    * */
+     * 课程id
+     * */
    @Column(name = "course_id",nullable=false,length = 20)
    private String courseId;
-    
+
    /*
-    * 课程类型
-    * */
+     * 课程类型
+     * */
    @Column(name = "course_type",nullable=false,length = 1)
    private Integer courseType;
-    
+
    /*
-    * 课程名称
-    * */
+     * 课程名称
+     * */
    @Column(name = "course_name",nullable=false,length = 100)
    private String courseName;
-    
+
    /*
-    * 账号id
-    * */
+     * 账号id
+     * */
    @Column(name = "aid",nullable=false,length = 20)
    private String aid;
-    
+
    /*
-    * 姓名,用于查看学习记录时显示，
-    * */
+     * 姓名,用于查看学习记录时显示，
+     * */
    @Column(name="aname",length = 30)
    private String aname;
-    
+
    /*
-    * 来源：自主报名，和报名中的报名方式一致
-    * */
+     * 来源：自主报名，和报名中的报名方式一致
+     * */
    @Column(name = "source")
    private Integer source;
-    
+
    /*
-    * 加入时间  对应报名时间
-    * */
+     * 加入时间  对应报名时间
+     * */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Column(name = "add_time")
    private LocalDateTime addTime;
-    
+
    /*
-    * 开始学习时间,报名和学习是一体的，此字段为后续报名学习不致的情况，当前这种情况没有
-    * 25.11.21修改：经生产数据查证本字段实际未废弃，因此继续使用
-    */
+     * 开始学习时间,报名和学习是一体的，此字段为后续报名学习不致的情况，当前这种情况没有
+     * 25.11.21修改：经生产数据查证本字段实际未废弃，因此继续使用
+     */
    // @Deprecated
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Column(name = "start_time")
    private LocalDateTime startTime;
-    
+
    /*
-    * 完成学习时间
-    * */
+     * 完成学习时间
+     * */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Column(name = "finish_time")
    private LocalDateTime finishTime;
-    
+
    /*
-    * 学习进度
-    * */
+     * 学习进度
+     * */
    @Column(name = "progress")
    private Float progress;
-    
+
    /*
-    * 学习总时间,秒，没有小数的情况，所以直接使用整数类型
-    * 这一项计算时间，在二期中已经不在使用，学习时长已经移到统计服务中，单独的课程不再记录
-    * 25.11.21修改：经生产数据查证本字段实际未废弃，因此继续使用
-    */
+     * 学习总时间,秒，没有小数的情况，所以直接使用整数类型
+     * 这一项计算时间，在二期中已经不在使用，学习时长已经移到统计服务中，单独的课程不再记录
+     * 25.11.21修改：经生产数据查证本字段实际未废弃，因此继续使用
+     */
    // @Deprecated
    @Column(name = "total_duration")
    private Integer totalDuration;
-    
+
    /*
-    * 最终成绩
-    * */
+     * 最终成绩
+     * */
    @Column(name = "last_score")
    private Float lastScore;
-    
+
    /*
-    * 状态  1表未开始，8表意外终止，9表正常完成。
-    * 
-    * */
+     * 状态  1表未开始，8表意外终止，9表正常完成。
+     *
+     * */
    @Column(name = "status")
    private Integer status;
-    
+
    /*
-    * 状态时间
-    * */
+     * 状态时间
+     * */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Column(name = "status_time")
    private LocalDateTime statusTime;
-    
+
    /**
     * 最后的学习时间
     */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Column(name = "last_time")
    private LocalDateTime lastTime;
-    
+
    /*
-    * 备注
-    * */
+     * 备注
+     * */
    @Column(name = "remark",length = 200)
    private String remark;

--- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyCourseServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyCourseServiceImpl.java
@@ -92,8 +92,8 @@ public class StudyCourseServiceImpl implements IStudyCourseService{
 	@Autowired
 	StudyTimeDao studyTimeDao;

-    @Autowired
-    CourseStatDao courseStatDao;
+	@Autowired
+	CourseStatDao courseStatDao;

 	@Autowired
 	CourseDao courseDao;
@@ -279,16 +279,16 @@ public class StudyCourseServiceImpl implements IStudyCourseService{
 		return studyCoursePageList;
 	}

-    /**
-     * 分页查询课程的资源名称以及资源学习完成人数
-     *
-     * @param pageIndex   页码
-     * @param pageSize    每页数据条数
-     * @param courseId    课程id
-     * @param contentName 资源名称
-     */
-    @Override
-    public PageList<CourseFinishCountDto> findPageResource(int pageIndex, int pageSize, String courseId, String contentName) {
+	/**
+	 * 分页查询课程的资源名称以及资源学习完成人数
+	 *
+	 * @param pageIndex   页码
+	 * @param pageSize    每页数据条数
+	 * @param courseId    课程id
+	 * @param contentName 资源名称
+	 */
+	@Override
+	public PageList<CourseFinishCountDto> findPageResource(int pageIndex, int pageSize, String courseId, String contentName) {
 		// 1. 调用Dao层：查当前页数据（传入偏移量、每页条数、courseId条件）
 		List<CourseFinishCountDto> dtoList = courseStatDao.findFinishCountList(courseId, contentName);
 		// 2. 调用Dao层：查总条数（对应PageList的count字段，用int类型，和PageList一致）
@@ -297,13 +297,13 @@ public class StudyCourseServiceImpl implements IStudyCourseService{
 		int fromIndex = (pageIndex - 1) * pageSize;
 		int toIndex = Math.min(fromIndex + pageSize, totalCount);
 		List<CourseFinishCountDto> pageData = dtoList.subList(fromIndex, toIndex);
-        // 4. 按PageList构造函数创建对象（只传list和count）
+		// 4. 按PageList构造函数创建对象（只传list和count）
 		PageList<CourseFinishCountDto> pageList = new PageList<>(pageData, totalCount);
-        // 5. 设置pageSize（覆盖默认10，确保总页数计算正确）
-        pageList.setPageSize(pageSize);
-        // 6. 返回：totalPage会在前端调用getTotalPages()时自动计算
-        return pageList;
-    }
+		// 5. 设置pageSize（覆盖默认10，确保总页数计算正确）
+		pageList.setPageSize(pageSize);
+		// 6. 返回：totalPage会在前端调用getTotalPages()时自动计算
+		return pageList;
+	}
 	@Override
 	public List<StudyCourseNameDto> studyCounts(int num) {
 //		QueryBuilder builder = QueryBuilder.from(StudyCourse.class);
--- a/servers/boe-server-all/src/main/resources/application-prod.yml
+++ b/servers/boe-server-all/src/main/resources/application-prod.yml
@@ -9,20 +9,20 @@ spring:
  cloud:
    nacos:
      discovery:
-        server-addr: 10.232.28.76:8848,10.232.28.83:8848,10.232.28.77:8848
+        server-addr: 10.251.113.100:8848
      config:
-        server-addr: 10.232.28.76:8848,10.232.28.83:8848,10.232.28.77:8848
+        server-addr: 10.251.113.100:8848
  redis:
    database: 1
-    host: 10.232.27.44
-    password: j2ZsxUyl
+    host: 10.251.88.213
+    password: qwert!W588
    port: 6379
  jpa:
    hibernate:
      ddl-auto: none
  datasource:
    driverClassName: com.mysql.jdbc.Driver
-    url: jdbc:mysql://10.232.27.47:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+    url: jdbc:mysql://10.251.88.216:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
    username: admin
    password: boeRds01
    type: com.zaxxer.hikari.HikariDataSource
@@ -34,7 +34,7 @@ spring:
      max-lifetime: 1800000
      maximum-pool-size: 20
  activemq:
-    broker-url: tcp://10.232.28.73:61616
+    broker-url: tcp://10.251.113.100:61616
    user: admin
    password: admin
  jms:
@@ -67,12 +67,12 @@ xboe:
      url: https://u.boe.com/userbasic
  elasticsearch:
    server:
-      ip: 10.232.27.40
+      ip: 10.251.88.218
      port: 9200
      user:
      password:
  email:
-    url: http://u.boe.com/infrasApi/sendMsg/sendMail
+    url: https://u.boe.com/api/b1/email/send
    from: boeu_learning@boe.com.cn
    user:
    security:
@@ -314,7 +314,6 @@ xboe:
        - "120434"
        - "126466"
        - "98050020"
-        - "10928732"
      alert-email-recipients:
        - chengmeng@boe.com.cn
        - liyubing@boe.com.cn
@@ -338,28 +337,9 @@ aop-log-record:
  #不进行拦截的包或者类
  excludeClassNames:
  activemq:
-    broker-url: tcp://10.232.28.73:61616
+    broker-url: tcp://10.251.113.100:61616
    user: admin
    password: admin
  elasticsearch:
-    host: 10.232.27.40
-    port: 9200
-
-boe:
-  domain: http://192.168.0.253
-  domain-name: https://u.boe.com
-  pcPageUrl: ${boe.domain-name}/pc/course/studyindex?id=
-  h5PageUrl: ${boe.domain-name}/mobile/pages/study/courseStudy?id=
-  pcLoginUrl: ${boe.domain-name}/web/
-  h5LoginUrl: ${boe.domain-name}/m/loginuser
-
-mysql:
-  schema:
-    user-center-schema: user_basic
-
-kjb:
-  aicoreUrl: http://10.232.28.95:8080
-  videoUrlPrefix: https://u.boe.com/upload
-
-boe:
-  domain: https://u.boe.com
+    host: 10.251.88.218
+    port: 9200
--- a/servers/boe-server-all/src/main/resources/application-test.yml
+++ b/servers/boe-server-all/src/main/resources/application-test.yml
@@ -168,6 +168,7 @@ boe:
 kjb:
  aicoreUrl: http://10.251.186.27:8088
  videoUrlPrefix: https://u-pre.boe.com/upload
+
 ok:
  http:
    connect-timeout: 30
--- a/servers/boe-server-all/src/main/resources/log/logback-prod.xml
+++ b/servers/boe-server-all/src/main/resources/log/logback-prod.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration debug="false" scan="false">
    <springProperty scop="context" name="spring.application.name" source="spring.application.name" defaultValue=""/>
-    <property name="log.path" value="/data/logs/${spring.application.name}"/>
+    <property name="log.path" value="/home/logs/${spring.application.name}"/>
    <!-- 彩色日志格式 -->
    <property name="CONSOLE_LOG_PATTERN"
              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
@@ -37,27 +37,27 @@
            <pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
            <charset>UTF-8</charset>
        </encoder>
-        <file>${log.path}/caseAiChat.log</file>
+        <File>${log.path}/caseAiChat.log</File>
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${log.path}/caseAiChat.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <FileNamePattern>${log.path}/caseAiChat.%d{yyyy-MM-dd}.log</FileNamePattern>
        </rollingPolicy>
    </appender>

    <!-- Log file error output -->
-<!--    <appender name="caseAiChat" class="ch.qos.logback.core.rolling.RollingFileAppender">-->
-<!--        <file>${log.path}/caseAiChat.log</file>-->
-<!--        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">-->
-<!--            <fileNamePattern>${log.path}/%d{yyyy-MM}/caseAiChat.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>-->
-<!--            <maxFileSize>50MB</maxFileSize>-->
-<!--            <maxHistory>30</maxHistory>-->
-<!--        </rollingPolicy>-->
-<!--        <encoder>-->
-<!--            <pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>-->
-<!--        </encoder>-->
-<!--        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">-->
-<!--            <level>ERROR</level>-->
-<!--        </filter>-->
-<!--    </appender>-->
+    <appender name="caseAiChat" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/caseAiChat.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/%d{yyyy-MM}/caseAiChat.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+            <maxFileSize>50MB</maxFileSize>
+            <maxHistory>30</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>ERROR</level>
+        </filter>
+    </appender>

    <!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
    <root level="INFO">
--- a/servers/boe-server-basic/src/main/resources/application-prod.yml
+++ b/servers/boe-server-basic/src/main/resources/application-prod.yml
@@ -2,8 +2,8 @@
 spring:
  redis:
    database: 1
-    host: 10.232.27.44
-    password: j2ZsxUyl
+    host: 10.251.88.213
+    password: qwert!W588
    port: 6379
  jpa:
    hibernate:
@@ -16,12 +16,12 @@ spring:
    driverClassName: com.mysql.jdbc.Driver
    db1:
      driverClassName: com.mysql.jdbc.Driver
-      jdbc-url: jdbc:mysql://10.232.27.47:3306/boe_basic?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+      jdbc-url: jdbc:mysql://10.251.88.216:3306/boe_basic?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
      username: admin
      password: boeRds01
    db2:
      driverClassName: com.mysql.jdbc.Driver
-      jdbc-url: jdbc:mysql://10.232.27.47:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+      jdbc-url: jdbc:mysql://10.251.88.216:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
      username: admin
      password: boeRds01

--- a/servers/boe-server-basic/src/main/resources/log/logback-prod.xml
+++ b/servers/boe-server-basic/src/main/resources/log/logback-prod.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration debug="false" scan="false">
    <springProperty scop="context" name="spring.application.name" source="spring.application.name" defaultValue=""/>
-    <property name="log.path" value="/data/logs/${spring.application.name}"/>
+    <property name="log.path" value="/home/logs/${spring.application.name}"/>
    <!-- 彩色日志格式 -->
    <property name="CONSOLE_LOG_PATTERN"
              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
--- a/sql/20251115/数据迁移SQL脚本.sql
+++ b/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;
--- a/sql/20251115/数据迁移方案文档.md
+++ b/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：学习完成
+
+---