kjb接口添加配置

管理端端添加课程AI设置信息
2025-12-07 01:46:47 +08:00 · 2025-11-21 14:27:21 +08:00 · 2025-11-21 11:27:43 +08:00 · 2025-11-21 10:34:49 +08:00 · 2025-11-20 16:04:46 +08:00 · 2025-11-20 15:13:02 +08:00
39 changed files with 1837 additions and 274 deletions
--- a/servers/boe-server-all/pom.xml
+++ b/servers/boe-server-all/pom.xml
@@ -239,6 +239,10 @@
            <artifactId>xxl-job-core</artifactId>
            <version>2.3.0</version> <!-- 请根据实际需求选择版本 -->
        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+        </dependency>

    </dependencies>
    <build>
--- a/servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java
@@ -8,9 +8,11 @@ import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.boe.feign.api.courseweb.entity.ExamTestDto;
 import com.boe.feign.api.courseweb.entity.ProjectStudyDto;
+import com.boe.feign.api.courseweb.remote.ExternalRemoteClient;
 import com.boe.feign.api.courseweb.remote.OffCourseRemoteClient;
 import com.boe.feign.api.courseweb.remote.ProjectAdminRemoteClient;
 import com.boe.feign.api.courseweb.remote.ProjectRemoteClient;
+import com.boe.feign.api.courseweb.reps.ExamStudyRecordParam;
 import com.boe.feign.api.infrastructure.entity.CommonSearchVo;
 import com.boe.feign.api.infrastructure.entity.Dict;
 import com.boe.feign.api.infrastructure.remote.DictRemoteClient;
@@ -43,10 +45,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 import java.util.concurrent.ForkJoinPool;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
@@ -73,6 +72,8 @@ public class ThirdApi {

    @Resource
    private ProjectRemoteClient projectRemoteClient;
+    @Resource
+    ExternalRemoteClient externalRemoteClient;

    @Resource
    private DictRemoteClient dictRemoteClient;
@@ -94,7 +95,8 @@ public class ThirdApi {
    private String syncOnLineScore;
    @Value("${coursesuilt.updateOnLineStatua}")
    private String updateOnLineStatua;
-
+    @Value("${coursesuilt.delOnLineById}")
+    private String delOnLineById;

    //获取例外人员的id
    public List<String> getUserId() {
@@ -262,11 +264,19 @@ public class ThirdApi {
    }

    public List<StudyCourse> getStudyCourseList(String studyId, String courseId, String token) {
+        log.info(" 1  studyId = "+ studyId + " ,courseId = " + courseId );
+        if ( studyId == null || courseId == null ){
+            log.error(" 在线课学习记录 参数不能为空 ");
+            return new ArrayList<>();
+        }
        StudyCourseVo studyCourseVo = new StudyCourseVo();
        studyCourseVo.setStudyId(studyId);
        studyCourseVo.setCourseId(courseId);
        ProjectStudyDto projectStudyDto = new ProjectStudyDto();
-        BeanUtil.copyProperties(studyCourseVo, studyCourseVo);
+//        BeanUtil.copyProperties(studyCourseVo, studyCourseVo);
+        projectStudyDto.setStudyId(Long.parseLong(studyId));
+        projectStudyDto.setCourseId(Long.parseLong(courseId));
+        log.info(" 12 在线课学习记录 studyId = "+ projectStudyDto.getStudyId() + " ,courseId = " + projectStudyDto.getCourseId() );
        projectRemoteClient.updateStudyStatus(projectStudyDto);
        return new ArrayList<>();
    }
@@ -382,4 +392,32 @@ public class ThirdApi {
                        .body()).orElseThrow(() -> new RuntimeException("token校验失败"));
        log.info("updateOrSaveCourse = " + resp);
    }
+
+    public void syncExamStudyRecord(ExamStudyRecordParam param) {
+        externalRemoteClient.syncExamStudyRecord(param);
+    }
+
+    public void delOnLineById(CourseParam param, String token) {
+        log.info("---------------同步在线课删除 ------- param " + param);
+        String resp = Optional.ofNullable(
+                HttpRequest.post(delOnLineById).body(JSONUtil.toJsonStr(param)).header("token", token).execute()
+                        .body()).orElseThrow(() -> new RuntimeException("token校验失败"));
+        log.info("-------delOnLineById = " + resp);
+    }
+
+    //获取字典信息
+    public List<Dict> getDictItems(CommonSearchVo searcher) {
+        try {
+            List<Dict> dictList = dictRemoteClient.getList(searcher);
+            if(!Objects.isNull(dictList) && dictList.size() > 0){
+//               List<String> dicts =  dictList.stream().map(Dict::getValue).collect(Collectors.toList());
+               return dictList;
+            }else {
+               return null;
+            }
+        } catch (Exception e) {
+            log.error("-------获取字典信息 = " + e.getMessage());
+        }
+        return null;
+    }
 }
--- a/servers/boe-server-all/src/main/java/com/xboe/data/service/impl/DataUserSyncServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/data/service/impl/DataUserSyncServiceImpl.java
@@ -2,11 +2,16 @@ package com.xboe.data.service.impl;

 import java.time.LocalDateTime;

+import javax.annotation.Resource;
 import javax.transaction.Transactional;

 import com.boe.feign.api.serverall.entity.UserData;
+import com.xboe.constants.CacheName;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.Cache;
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.retry.annotation.Recover;
 import org.springframework.retry.annotation.Retryable;
 import org.springframework.stereotype.Service;
@@ -39,6 +44,9 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService {
    @Autowired
    TeacherDao teacherDao;

+    @Resource
+    private CacheManager cacheManager;
+

    @Override
    @Transactional
@@ -59,6 +67,8 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService {
                a.setDeleted(user.getDeleted());
            }
            a.setLoginName(user.getCode());
+            a.setMobile(user.getMobile());
+            a.setEmail(user.getEmail());
            log.info("更新账号code");
            accountDao.update(a);
        } else {
@@ -71,14 +81,18 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService {
            a.setRegTime(LocalDateTime.now());
            a.setSysId(user.getKid());
            a.setStatus(1);
+            a.setMobile(user.getMobile());
+            a.setEmail(user.getEmail());
            accountDao.save(a);
            log.info("账号不存在，新添加账号【" + user.getId() + "】");
        }
+
        if (u != null) {
            //更新部分用户字段
            u.setDepartId(user.getDepartId());
            u.setDepartName(user.getDepartName());
            u.setName(user.getName());
+            u.setMobileNo(user.getMobile());
            //2022-12-8 去掉用户类型的更新，因为返回的数据都是学员，
            //u.setUserType(user.getUserType());
            if (user.getLearningDuration() > 0) { //不大于0才会更新
@@ -106,9 +120,17 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService {
            } else {
                u.setShowHome(true);//band16以下，及其它无bandLevel的信息
            }
+            u.setMobileNo(user.getMobile());
            userDao.save(u);
            log.info("添加新用户");
        }
+
+        Cache cache = cacheManager.getCache(CacheName.NAME_USER);
+        if(cache != null) {
+            cache.evict(CacheName.KEY_ACCOUNT + user.getId());
+            cache.evict(CacheName.KEY_USER + user.getId());
+        }
+
        //对机构的判断，不为空时才会处理，为空时不处理
        if (StringUtils.isNotBlank(user.getDepartId())) {
            org = orgDao.get(user.getDepartId());
--- 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
@@ -1,5 +1,6 @@
 package com.xboe.module.course.api;

+import java.io.IOException;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
@@ -7,9 +8,22 @@ import java.util.List;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;

+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.xboe.api.ThirdApi;
-import com.xboe.module.course.dto.CourseParam;
+import com.xboe.module.course.dto.*;
+import com.xboe.module.course.entity.*;
+import com.xboe.module.course.utils.HttpUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -21,13 +35,6 @@ import com.xboe.core.CurrentUser;
 import com.xboe.core.JsonResponse;
 import com.xboe.core.api.ApiBaseController;
 import com.xboe.core.log.AutoLog;
-import com.xboe.module.course.dto.CourseFullDto;
-import com.xboe.module.course.dto.CourseHRBPAuditDto;
-import com.xboe.module.course.dto.CourseQueryDto;
-import com.xboe.module.course.entity.Course;
-import com.xboe.module.course.entity.CourseAudit;
-import com.xboe.module.course.entity.CourseContent;
-import com.xboe.module.course.entity.CourseHRBPAudit;
 import com.xboe.module.course.service.ICourseAuditService;
 import com.xboe.module.course.service.ICourseContentService;
 import com.xboe.module.course.service.ICourseHRBPAuditService;
@@ -61,6 +68,9 @@ public class CourseAuditApi  extends ApiBaseController{
 	@Resource
 	private ThirdApi thirdApi;

+	@Value("${kjb.aicoreUrl}")
+	private String aicoreUrl;
+

 	/**
 	 * 教师需要审核的课程
@@ -358,8 +368,10 @@ public class CourseAuditApi  extends ApiBaseController{
 				//修改在线课开课状态=已开课
 				String token = request.getHeader("Xboe-Access-Token");
 				CourseParam param = new CourseParam();
-				param.setId(courseId);
-				thirdApi.updateOnLineStatua(param,token);
+				param.setId(c.getId());
+                param.setOrgId(c.getOrgId());
+                param.setOrgName(c.getOrgName());
+				thirdApi.updateOrSaveCourse(param,token);
 			}
 			return success(true);
 		} catch (Exception e) {
@@ -433,16 +445,79 @@ public class CourseAuditApi  extends ApiBaseController{
 			param.setOrgName(dto.getCourse().getOrgName());
 			thirdApi.updateOrSaveCourse(param,token);
 			log.info("---------------在线课同步到讲师管理完毕 -------");
+			//AI视频处理-调用接口
+			this.sendMessageToKJB(dto);
+			log.info("---------------AI视频处理-调用接口完毕 -------");
 			return success(true);
 		} catch (Exception e) {
 			log.error("默认管理员提交直接发布处理失败",e);
 			e.printStackTrace();
 			return error("发布课程失败",e.getMessage());
 		}
-		
-	}

-	
+	}
+    public void sendMessageToKJB(CourseFullDto dto) throws JsonProcessingException {
+		Course course = dto.getCourse();
+		log.info("---------------AI视频处理-调用接口 -------");
+		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();
+		for (CourseTeacher teacher : teachers) {
+			teacherNames.append(teacher.getTeacherName()).append(",");
+		}
+		List<CourseContent> cclist = ccontentService.getByCourseId(course.getId());
+		List<String> languageCode = course.getLanguageCode();
+		String code = String.join(",", languageCode);
+		List<BoeaiCourseDto> courseDtos = new ArrayList<>();
+		BoeaiCourseDto boeaiCourseDto = new BoeaiCourseDto();
+		List<BoeaiVideoResourceDto> videoList = new ArrayList<>();
+		boeaiCourseDto = BoeaiCourseDto.builder()
+				.courseId(course.getId())
+				.title(course.getName())
+				.description(course.getSummary())
+				.instructor(teacherNames.toString())
+				.chapterCount(1)  //章节数
+				.languageCode(code) //语言
+				.aiTranslate(course.getAiTranslate())
+				.aiAbstract(course.getAiAbstract())
+				.aiDraft(course.getAiDraft())
+				.aiSet(course.getAiSet())
+				.languageStatus(course.getLanguageStatus())
+				.build() ;
+		for (CourseContent cc : cclist) {
+			//筛选视频资源
+			if(cc.getContentType() == 10 ){
+				JSONObject json = JSONObject.parseObject(cc.getContent());
+				if(json == null || json.getString("url") == null) {
+					continue;
+				}
+				String  videoUrl =  json.getString("url");
+				String videoUrlPerfix = "https://u-pre.boe.com/upload"; //测试
+				//String videoUrlPerfix = "https://u.boe.com/upload"; //生产
+				String videoType = videoUrl.substring(videoUrl.lastIndexOf(".")+1);
+				videoList.add(BoeaiVideoResourceDto.builder()
+						.courseId(cc.getCourseId())
+						.videoId(cc.getId())
+						.title(cc.getContentName())
+						.originalUrl(videoUrlPerfix+videoUrl)
+						.duration(cc.getDuration())
+						.format(videoType)
+						.build());
+			}
+		}
+		boeaiCourseDto.setBoeaiVideoResourceReqList(videoList);
+		boeaiCourseDto.setVideoCount(videoList.size());
+
+		courseDtos.add(boeaiCourseDto);
+		BoeaiCourseParamsReq paramReq = new BoeaiCourseParamsReq();
+		paramReq.setBoeaiCourseReqList(courseDtos);
+		ObjectMapper objectMapper = new ObjectMapper();
+		String message = objectMapper.writeValueAsString(paramReq);
+		String url = aicoreUrl +"/aiVideo/saveCourse";
+		HttpUtils.sendMessage(message,url);
+    }
+
+
 	/***
 	 * 审核
 	 * @param dto
@@ -473,5 +548,4 @@ public class CourseAuditApi  extends ApiBaseController{
 		
 	}

-	
 }
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFileApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFileApi.java
@@ -15,6 +15,8 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

+import it.sauronsoftware.jave.Encoder;
+import it.sauronsoftware.jave.MultimediaInfo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.orm.ObjectOptimisticLockingFailureException;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -46,8 +48,6 @@ import com.xboe.module.scorm.SCORMParser;
 import com.xboe.standard.BaseConstant;
 import com.xboe.standard.enums.BoedxCourseFileType;

-import it.sauronsoftware.jave.Encoder;
-import it.sauronsoftware.jave.MultimediaInfo;
 import lombok.extern.slf4j.Slf4j;

 /**
@@ -256,7 +256,7 @@ public class CourseFileApi extends ApiBaseController {
        }
        String fileFullPath = SysConstant.getConfigValue(BaseConstant.CONFIG_UPLOAD_FILES_SAVEPATH) + file.getFilePath();
        if ("mp3,mp4".indexOf(file.getFileType()) > -1){
-        	log.info("上传 "+file.getFileType()+"文件:"+file.getFilePath());
+            log.info("上传 "+file.getFileType()+"文件:"+file.getFilePath());
            Encoder encoder = new Encoder();
            try {
                //System.out.println(fileFullPath);
@@ -278,8 +278,8 @@ public class CourseFileApi extends ApiBaseController {
                    }
                }
            } catch (Exception e) {
-                log.error("读取视频时长错误");
-//                e.printStackTrace();
+                log.error("读取视频时长错误", e);
+                return error("视频解析失败，尝试重新上传或联系管理员", "视频解析失败，尝试重新上传或联系管理员");
            }
        }

--- 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
@@ -7,17 +7,23 @@ import java.util.stream.Collectors;

 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Opt;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.boe.feign.api.serverall.entity.UserData;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.xboe.api.ThirdApi;
 import com.xboe.data.outside.IOutSideDataService;
+import com.xboe.module.course.dto.BoeaiCourseDto;
+import com.xboe.module.course.utils.HttpUtils;
 import com.xboe.module.course.vo.TeacherVo;
 import com.xboe.school.study.entity.StudyCourse;
 import com.xboe.school.study.service.IStudyCourseService;
 import com.xboe.system.organization.service.IOrganizationService;
 import org.apache.commons.lang3.StringUtils;
 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;
@@ -76,6 +82,9 @@ public class CourseFullTextApi  extends ApiBaseController{
 	@Autowired
 	StringRedisTemplate redisTemplate;

+	@Value("${kjb.aicoreUrl}")
+	private String aicoreUrl;
+
 	/**
 	 * 课程的初始化
 	 * @return
@@ -322,6 +331,8 @@ public class CourseFullTextApi  extends ApiBaseController{
 				if(c.getSource()==2) {
 					cids.add(c.getId());
 				}
+				log.info("---- KJB 开始获取课程摘要信息 ---");
+				this.getCourseFromKJB(c);
 			}
 			List<Course> clist=null;
 			if(!cids.isEmpty()) {
@@ -413,6 +424,33 @@ public class CourseFullTextApi  extends ApiBaseController{

 	}

+	public void getCourseFromKJB(CourseFullText courseFull){
+		String courseId = courseFull.getId();
+		log.info("------------KJB---获取课程摘要信息---------；courseId = " + courseId);
+		//String url = env.getProperty("kjb.url") + "/api/course/getCourseFromKJB?courseId=" + courseId;
+		String url = aicoreUrl + "/aiVideo/getCourseList";
+
+		JSONObject jsonObject = new JSONObject();
+		JSONArray courseIds = new JSONArray();
+		courseIds.add(courseId);
+		jsonObject.put("courseIds", courseIds);
+		String result = HttpUtils.sendMessage(jsonObject.toJSONString(), url);
+
+		//将返回string 转为json对象
+		log.info("---KJB --摘要接口返回结果result: "+result);
+		JSONObject jsonResult  = JSONObject.parseObject(result);
+		String data = jsonResult.getString("rows");
+		//json字符串转为实体对象
+		// 直接解析为 List<Course>
+		List<BoeaiCourseDto> boeaiCourseDto = JSON.parseArray(data, BoeaiCourseDto.class);
+		//List<BoeaiCourseDto> aiVideoResourceRsp = Collections.singletonList(JSON.parseObject(data, BoeaiCourseDto.class));
+		if(boeaiCourseDto != null && !boeaiCourseDto.isEmpty()){
+			log.info("KJB摘要信息："+boeaiCourseDto.get(0).getSummaryContent());
+			courseFull.setAiAbstract(boeaiCourseDto.get(0).getAiAbstract());
+			courseFull.setSummaryContent(boeaiCourseDto.get(0).getSummaryContent());
+		}
+	}
+
 	private void getTeacherStatusByCode(String token, PageList<CourseFullText> coursePageList) {
 		log.info("获取教师信息通过工号 ");
 		List<String> teacherCoeds = new ArrayList<>();
--- 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
@@ -2,11 +2,14 @@

 import java.io.OutputStream;
 import java.util.*;
+import java.util.stream.Collectors;

 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

+import com.boe.feign.api.infrastructure.entity.CommonSearchVo;
+import com.boe.feign.api.infrastructure.entity.Dict;
 import com.xboe.api.ThirdApi;
 import com.xboe.module.course.dto.*;
 import org.apache.commons.lang3.StringUtils;
@@ -169,19 +172,48 @@ public class CourseManageApi extends ApiBaseController{
 		List<CourseSection> sectionlist=sectionService.getByCourseId(id);
 		List<CourseTeacher> teachers=courseService.findTeachersByCourseId(id);
 		List<CourseCrowd> crowds=courseService.findCrowdByCourseId(id);
-		
-		//
+
+        CommonSearchVo searcher = new CommonSearchVo();
+        searcher.setPid(637L);
+        searcher.setType(1);
+		List<Dict> dictList = thirdApi.getDictItems(searcher);
+		boolean isPermission = false;
+        if(dictList != null && dictList.size() > 0){
+			List<String> dicts =  dictList.stream().map(Dict::getValue).collect(Collectors.toList());
+			isPermission = dicts.contains(course.getOrgId());
+			rs.put("dicts",dicts);
+		}
+		log.error("-------是否仅内网查看 = " + isPermission);
 		rs.put("course",course);
 		rs.put("contents",cclist);
 		rs.put("sections",sectionlist);
 		rs.put("teachers",teachers);
 		rs.put("crowds",crowds);
-		
+		rs.put("isPermission",isPermission);
+
+
 		
 		return success(rs);
 		
 	}
-	
+	@GetMapping("/getDictIds")
+	public JsonResponse<Map<String,Object>> getDictIds(Long pid,Integer type){
+		CommonSearchVo searcher = new CommonSearchVo();
+		if(pid==null || type ==null){
+			return badRequest("参数错误");
+		}
+		Map<String,Object> rs=new HashMap<String,Object>();
+		searcher.setPid(pid);
+		searcher.setType(type);
+		List<Dict> dictList = thirdApi.getDictItems(searcher);
+		rs.put("dicts",null);
+		if(dictList != null && dictList.size() > 0){
+			List<String> dicts =  dictList.stream().map(Dict::getValue).collect(Collectors.toList());
+			rs.put("dicts",dicts);
+		}
+		return success(rs);
+	}
+
 	/**
 	 * 管理员审核列表，教师的审核不在这里，此审核也应该移动CourseAuditApi中去
 	 * @param pager
@@ -886,7 +918,7 @@ public class CourseManageApi extends ApiBaseController{
 	 * @return
 	 */
 	@PostMapping("/delete")
-	public JsonResponse<Boolean> delete(String id,Boolean erasable,String title,String remark){
+	public JsonResponse<Boolean> delete(String id,Boolean erasable,String title,String remark, HttpServletRequest request){
 		if(StringUtils.isBlank(id)){
 			return badRequest("参数错误");
 		}
@@ -901,6 +933,11 @@ public class CourseManageApi extends ApiBaseController{
 		try {
 			CurrentUser cu=getCurrent();
 			courseService.delete(id, erasable,cu.getAccountId(), cu.getName(), remark);
+
+			String token = request.getHeader("Xboe-Access-Token");
+			CourseParam param = new CourseParam();
+			param.setId(id);
+			thirdApi.delOnLineById(param,token);
 			return success(true);
 		} catch (Exception e) {
 			log.error("管理员删除课程错误",e);
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CoursePortalApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CoursePortalApi.java
@@ -314,8 +314,10 @@ public class CoursePortalApi extends ApiBaseController{
 			User user = userService.get(ct.getTeacherId());
 			if(t!=null) {
 				ct.setRemark(t.getDescription());
+				ct.setSupplier(t.getSupplier());
+				ct.setTeacherType(t.getTeacherType());
 				if(redisTemplate.opsForValue().get(ct.getTeacherId())!=null){
-					if(Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1")){
+					if(Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1") && ( t==null ||  t.getTeacherType() == 1)){
 						ct.setTeacherName("BOE教师");
 					}
 					teacherCourseDto.setCourseId(ct.getCourseId());
@@ -327,13 +329,15 @@ public class CoursePortalApi extends ApiBaseController{
 					teacherCourseDto.setSysCreateBy(ct.getSysCreateBy());
 					teacherCourseDto.setSysCreateTime(ct.getSysCreateTime());
 					teacherCourseDto.setId(ct.getId());
-					teacherCourseDto.setUserNo(user.getUserNo());
+					if(user!=null){
+						teacherCourseDto.setUserNo(user.getUserNo());
+					}
 					teacherCourseDtos.add(teacherCourseDto);
 				}else if (redisTemplate.opsForValue().get(ct.getTeacherId())==null){
 					List<String> list=new ArrayList<>();
 					list.add(ct.getTeacherId());
 					getTeacherInfo(request.getHeader("Xboe-Access-Token"),list);
-					if(Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1")){
+					if(Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1") && ( t==null ||  t.getTeacherType() == 1)){
 						ct.setTeacherName("BOE教师");
 					}
 					teacherCourseDto.setCourseId(ct.getCourseId());
@@ -345,7 +349,9 @@ public class CoursePortalApi extends ApiBaseController{
 					teacherCourseDto.setSysCreateBy(ct.getSysCreateBy());
 					teacherCourseDto.setSysCreateTime(ct.getSysCreateTime());
 					teacherCourseDto.setId(ct.getId());
-					teacherCourseDto.setUserNo(user.getUserNo());
+					if(user!=null){
+						teacherCourseDto.setUserNo(user.getUserNo());
+					}
 					teacherCourseDtos.add(teacherCourseDto);
 				}
 			}
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/dao/CourseTeacherDeletedRecordDao.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/dao/CourseTeacherDeletedRecordDao.java
@@ -0,0 +1,9 @@
+package com.xboe.module.course.dao;
+
+import com.xboe.core.orm.BaseDao;
+import com.xboe.module.course.entity.CourseTeacherDeletedRecord;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public class CourseTeacherDeletedRecordDao extends BaseDao<CourseTeacherDeletedRecord> {
+}
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/dao/ModifyLogDao.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/dao/ModifyLogDao.java
@@ -0,0 +1,20 @@
+package com.xboe.module.course.dao;
+
+import com.xboe.core.orm.BaseDao;
+import com.xboe.module.course.entity.ModifyLog;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public class ModifyLogDao extends BaseDao<ModifyLog> {
+
+    public void insert(String requestId, String location, String body, String remark) {
+        ModifyLog entity = new ModifyLog();
+        entity.setRequestId(requestId);
+        entity.setLocation(location);
+        entity.setBody(body);
+        entity.setRemark(remark);
+
+        save(entity);
+    }
+
+}
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/dto/AiVideoResourceRsp.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/dto/AiVideoResourceRsp.java
@@ -0,0 +1,86 @@
+package com.xboe.module.course.dto;
+
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author Huang Run
+ * @date 2025年11月04日
+ */
+@Data
+public class AiVideoResourceRsp {
+    //多语言字幕信息
+    List<BoeaiSubtitleRsp> boeaiSubtitleRspList;
+
+    private Long id;
+
+    /**
+     * 视频业务ID
+     */
+    private String videoId;
+    /**
+     * 视频语言编码 如 zh-CN, en-US
+     */
+    //private String languageCode;
+    /**
+     * 课程ID
+     */
+    private String courseId;
+
+    /**
+     * 视频标题
+     */
+    private String title;
+
+    /**
+     * 原始视频URL
+     */
+    private String originalUrl;
+
+    /**
+     * 视频时长(秒)
+     */
+    private Integer duration;
+
+    /**
+     * 文件大小(字节)
+     */
+    private Long fileSize;
+
+    /**
+     * 视频格式 mp4/avi等
+     */
+    private String format;
+
+    /**
+     * 状态 0-待处理 1-处理中 2-已完成 3-失败
+     */
+    private Integer status;
+
+    /**
+     * 是否已审核 0-否 1-是
+     */
+    private Integer isReviewed;
+
+    /**
+     * 审核人ID
+     */
+    private String reviewerId;
+
+    /**
+     * 审核时间
+     */
+    private Date reviewedAt;
+
+    /**
+     *
+     */
+    private Date createdAt;
+
+    /**
+     *
+     */
+    private Date updatedAt;
+}
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/dto/BoeaiCourseDto.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/dto/BoeaiCourseDto.java
@@ -0,0 +1,103 @@
+package com.xboe.module.course.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Transient;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author
+ * @date 2025年11月18日
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class BoeaiCourseDto {
+    List<BoeaiVideoResourceDto> boeaiVideoResourceReqList;
+
+
+    List<String> courseVideoIds;
+
+    private Long id;
+
+    /**
+     * 课程ID
+     */
+    private String courseId;
+    /**
+     * 视频ID
+     */
+    private String videoId;
+
+    /**
+     * 课程标题
+     */
+    private String title;
+
+    /**
+     * 讲师名称
+     */
+    private String instructor;
+
+    /**
+     * 章节数
+     */
+    private Integer chapterCount;
+
+    /**
+     * 视频数
+     */
+    private Integer videoCount;
+
+    /**
+     * 总时长(秒)
+     */
+    private Integer totalDuration;
+
+    private Date createdAt;
+
+    private Date updatedAt;
+
+    /**
+     * 课程描述
+     */
+    private String description;
+    /**
+     * 视频语言编码 如 zh-CN, en-US
+     */
+    private String languageCode;
+
+    /**
+     * 0：关闭；1：打开；
+     * */
+
+    private Integer aiSet;
+    /**
+     * 摘要 0:上架；1：下架；
+     * */
+
+    private Integer aiAbstract;
+    /**
+     * 文稿 0:上架；1：下架；
+     * */
+
+    private Integer aiDraft;
+    /**
+     * 翻译 0:上架；1：下架；
+     * */
+
+    private Integer aiTranslate;
+
+    private Integer languageStatus;
+    //摘要
+    private String summaryContent;
+    //摘要状态 0:下架；1：上架
+    private Integer summaryStatus;
+
+    private static final long serialVersionUID = 1L;
+}
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/dto/BoeaiCourseParamsReq.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/dto/BoeaiCourseParamsReq.java
@@ -0,0 +1,15 @@
+package com.xboe.module.course.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author Huang Run
+ * @date 2025年11月19日
+ */
+@Data
+public class BoeaiCourseParamsReq implements Serializable {
+    List<BoeaiCourseDto> boeaiCourseReqList;
+}
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/dto/BoeaiSubtitleRsp.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/dto/BoeaiSubtitleRsp.java
@@ -0,0 +1,80 @@
+package com.xboe.module.course.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author
+ * 视频字幕表
+ */
+@Data
+public class BoeaiSubtitleRsp implements Serializable {
+    /**
+     * 主键ID
+     */
+    private Long id;
+
+    /**
+     * 关联视频ID
+     */
+    private String videoId;
+
+    /**
+     * 字幕语言（如 zh-CN, en-US）
+     */
+    private String language;
+
+    /**
+     * WebVTT字幕文件URL（OSS地址）
+     */
+    private String subtitleUrl;
+
+    /**
+     * 是否原始字幕 0-翻译 1-原始
+     */
+    private Byte isOriginal;
+
+    /**
+     * 源语言/翻译来源（如 zh-CN）
+     */
+    private String sourceLanguage;
+
+    /**
+     * 翻译引擎（llm/google/deepl）
+     */
+    private String translateEngine;
+
+    /**
+     * 状态（0-待生成 1-生成中 2-已完成 3-失败）
+     */
+    private Boolean status;
+
+    /**
+     * 创建时间
+     */
+    private Date createdAt;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedAt;
+
+    /**
+     * 字幕数据（JSON 数组格式，包含时间戳和翻译文本）
+     */
+    private String subtitleData;
+
+    /**
+     * WebVTT 格式字幕内容
+     */
+    private String vttContent;
+
+    /**
+     * 错误信息
+     */
+    private String errorMsg;
+    private static final long serialVersionUID = 1L;
+
+}
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/dto/BoeaiVideoResourceDto.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/dto/BoeaiVideoResourceDto.java
@@ -0,0 +1,88 @@
+package com.xboe.module.course.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * @author
+ * @date 2025年11月18日
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class BoeaiVideoResourceDto {
+    /**
+     *
+     */
+
+    private Long id;
+
+    /**
+     * 视频业务ID
+     */
+    private String videoId;
+    /**
+     * 课程ID
+     */
+    private String courseId;
+
+    /**
+     * 视频标题
+     */
+    private String title;
+
+    /**
+     * 原始视频URL
+     */
+    private String originalUrl;
+
+    /**
+     * 视频时长(秒)
+     */
+    private Integer duration;
+
+    /**
+     * 文件大小(字节)
+     */
+    private Long fileSize;
+
+    /**
+     * 视频格式 mp4/avi等
+     */
+    private String format;
+
+    /**
+     * 状态 0-待处理 1-处理中 2-已完成 3-失败
+     */
+    private Integer status;
+
+    /**
+     * 是否已审核 0-否 1-是
+     */
+    private Integer isReviewed;
+
+    /**
+     * 审核人ID
+     */
+    private String reviewerId;
+
+    /**
+     * 审核时间
+     */
+    private Date reviewedAt;
+
+    /**
+     *
+     */
+    private Date createdAt;
+
+    /**
+     *
+     */
+    private Date updatedAt;
+}
--- 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
@@ -1,6 +1,7 @@
 package com.xboe.module.course.entity;

 import java.time.LocalDateTime;
+import java.util.List;

 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -33,7 +34,10 @@ public class Course extends BaseEntity {
    
    /**所有的设备*/
    public static int DEVICE_ALL=3;
-    
+
+    /**仅内网*/
+    public static int DEVICE_INTERNAL=4;
+
    /**未提交，草稿*/
    public static final int STATUS_NONE=1;
    
@@ -213,6 +217,47 @@ public class Course extends BaseEntity {
    @Column(name = "device",length = 1)
    private Integer device;

+
+    /**
+     * 0：关闭；1：打开；
+     * */
+   // @Column(name = "ai_set",length = 1)
+    @Transient
+    private Integer aiSet;
+    /**
+     * 摘要 0:上架；1：下架；
+     * */
+    //@Column(name = "ai_abstract",length = 1)
+    @Transient
+    private Integer aiAbstract;
+    /**
+     * 文稿 0:上架；1：下架；
+     * */
+   // @Column(name = "ai_draft",length = 1)
+    @Transient
+    private Integer aiDraft;
+    /**
+     * 翻译 0:上架；1：下架；
+     * */
+    //@Column(name = "ai_translate",length = 1)
+    @Transient
+    private Integer aiTranslate;
+    @Transient
+    private Integer languageStatus;
+    /**
+     * 语言 zh-CN,en-US,ja-JP,ko-KR
+     * */
+    //Column(name = "language_code",length = 120)
+    @Transient
+    private List<String> languageCode;
+
+    //摘要
+    @Transient
+    private String summaryContent;
+    //摘要状态 0:下架；1：上架
+    @Transient
+    private Integer summaryStatus;
+
    /**
     * 课程状态，多人审核机制，所以这里并没有审核通过与不通过的状态了
     * 课程状态  1:未提交(草稿);2:已提交;3: 审核未通过，5审核完成
--- 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
@@ -8,9 +8,12 @@ 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;
+
 /**
 * 课程内容表
 * */
@@ -93,6 +96,9 @@ public class CourseContent extends BaseEntity {
    /**用于学习时的状态显示，非存储字段*/
    @Transient
    private Integer status;
+
+    @Transient
+    List<BoeaiSubtitleRsp> boeaiSubtitleRspList;
    
    public CourseContent() {
    	
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/CourseTeacher.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/CourseTeacher.java
@@ -49,4 +49,12 @@ public class CourseTeacher extends IdBaseEntity {
    @Transient
    private String code;

+    /**供应商*/
+    @Transient
+    private String supplier;
+
+    /**讲师类型 1 内部讲师  2外部讲师*/
+    @Transient
+    private Integer teacherType;
+
 }
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/CourseTeacherDeletedRecord.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/CourseTeacherDeletedRecord.java
@@ -0,0 +1,43 @@
+package com.xboe.module.course.entity;
+
+import com.xboe.core.SysConstant;
+import com.xboe.core.orm.IdBaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * 课程任课教师删除记录
+ */
+@Data
+@Entity
+@EqualsAndHashCode(callSuper = false)
+@Table(name = SysConstant.TABLE_PRE + "course_teacher_deleted_record")
+public class CourseTeacherDeletedRecord extends IdBaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 课程id
+     */
+    @Column(name = "course_id", nullable = false, length = 20)
+    private String courseId;
+
+    /**
+     * 教师id，实际上就是aid
+     *
+     */
+    @Column(name = "teacher_id", nullable = false, length = 20)
+    private String teacherId;
+
+    /**
+     * 教师姓名
+     *
+     */
+    @Column(name = "teacher_name", length = 30)
+    private String teacherName;
+
+}
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/ModifyLog.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/ModifyLog.java
@@ -0,0 +1,45 @@
+package com.xboe.module.course.entity;
+
+import com.xboe.core.SysConstant;
+import com.xboe.core.orm.IdBaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * 讲师删除记录表
+ * 为了监控PngCode-SZX-1227问题临时创建的表
+ *
+ * @author guo jia
+ */
+@Data
+@Entity
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+@Table(name = SysConstant.TABLE_PRE + "modify_log")
+public class ModifyLog extends IdBaseEntity {
+
+    /**
+     * 请求ID
+     */
+    private String requestId;
+
+    /**
+     * 位置
+     */
+    private String location;
+
+    /**
+     * 请求body
+     */
+    private String body;
+
+    /**
+     * 备注信息
+     */
+    private String remark;
+
+}
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseService.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseService.java
@@ -341,8 +341,6 @@ public interface ICourseService {
    List<Course> mobiledelList(Integer num,CourseQueryDto courseQueryDto);


-
-
-
-
+    List<Course> findByIds(List<String> courseIds);
+    void deletedStudyResourceBatchByCourseIdAndType(String courseId,Integer courseType);
 }
--- 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
@@ -1,5 +1,6 @@
 package com.xboe.module.course.service.impl;

+import java.io.IOException;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -14,13 +15,29 @@ import java.util.stream.Stream;
 import javax.annotation.Resource;
 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 com.xboe.api.ThirdApi;
 import com.xboe.core.orm.*;
+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.school.study.dao.StudyCourseDao;
 import com.xboe.school.study.entity.StudyCourse;
 import org.apache.commons.lang3.StringUtils;
+import org.elasticsearch.client.RequestOptions;
+import org.elasticsearch.client.RestHighLevelClient;
+import org.elasticsearch.index.query.BoolQueryBuilder;
+import org.elasticsearch.index.query.QueryBuilders;
+import org.elasticsearch.index.reindex.DeleteByQueryRequest;
 import org.hibernate.mapping.IdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
@@ -34,24 +51,6 @@ import com.xboe.common.beans.KeyValue;
 import com.xboe.common.utils.IDGenerator;
 import com.xboe.common.utils.StringUtil;
 import com.xboe.core.event.IEventDataSender;
-import com.xboe.module.course.dao.CourseContentDao;
-import com.xboe.module.course.dao.CourseCrowdDao;
-import com.xboe.module.course.dao.CourseDao;
-import com.xboe.module.course.dao.CourseExamDao;
-import com.xboe.module.course.dao.CourseHRBPAuditDao;
-import com.xboe.module.course.dao.CourseHomeWorkDao;
-import com.xboe.module.course.dao.CourseSectionDao;
-import com.xboe.module.course.dao.CourseTeacherDao;
-import com.xboe.module.course.dao.CourseUpdateLogDao;
-import com.xboe.module.course.dto.CourseFullDto;
-import com.xboe.module.course.dto.CourseQueryDto;
-import com.xboe.module.course.dto.RankingDto;
-import com.xboe.module.course.entity.Course;
-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.ICourseFullTextSearch;
 import com.xboe.module.course.service.ICourseService;
 import com.xboe.module.interaction.service.ICourseGradeService;
@@ -115,8 +114,18 @@ public class CourseServiceImpl implements ICourseService {
    @Autowired(required = false)
    private IEventDataSender eventSender;

+    @Resource
+    RestHighLevelClient restHighLevelClient;
+
+    @Resource
+    private CourseTeacherDeletedRecordDao courseTeacherDeletedRecordDao;
+
+    @Resource
+    private ModifyLogDao modifyLogDao;
+
+    @Value("${kjb.aicoreUrl}")
+    private String aicoreUrl;

-  
    /**
     * 生成过滤条件
     *
@@ -173,6 +182,8 @@ public class CourseServiceImpl implements ICourseService {
                filters.add(FieldFilters.in("device", Course.DEVICE_MOBILE, Course.DEVICE_ALL));
            } else if (dto.getDevice() == Course.DEVICE_ALL) {
                filters.add(FieldFilters.eq("device", Course.DEVICE_ALL));
+            } else if (dto.getDevice() == Course.DEVICE_INTERNAL) {
+                filters.add(FieldFilters.eq("device", Course.DEVICE_INTERNAL));
            }

        }
@@ -269,13 +280,13 @@ public class CourseServiceImpl implements ICourseService {
 ////		Set<String>list=new HashSet<>();
 ////		if(s!=null&&!s.isEmpty()){
 ////			list=Arrays.stream(s.split(",")).collect(Collectors.toSet());
-////		}else {
+////        }else {
 ////			Set<String> ss = getSeache(dto);
 ////			String courseSearch=String.join(",",ss);
 ////			redisTemplate.opsForValue().set("course_search",courseSearch);
 ////			//设置过期时间为1分钟
 ////			redisTemplate.expire("course_search", 1, TimeUnit.MINUTES);
-////		}
+////        }
 //		Set<String> list = getSeache(dto);
 //		//有权限的查询，也同时查询出创建人的数据，在权限上
 //        if(TempFilterConfig.Manager_CourseFile_ByOrgIds) {
@@ -355,8 +366,9 @@ public class CourseServiceImpl implements ICourseService {
 //				// 使用distinct()配合自定义的去重条件
 //				.filter(distinctByKey(c -> c.getId()))
 //				.collect(Collectors.toList());
-////		PageList<Course> rs=courseDao.findPage(pageIndex, pageSize, filters, oc);
-////		long endTime = System.nanoTime();
+
+    /// /		PageList<Course> rs=courseDao.findPage(pageIndex, pageSize, filters, oc);
+    /// /		long endTime = System.nanoTime();
 //		//log.info("查询出的条数:"+rs.getCount());
 //		if(!mergedList.isEmpty()){
 //			//去掉未发布的课程
@@ -413,30 +425,30 @@ public class CourseServiceImpl implements ICourseService {
        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("dto为" + dto);
+                if (dto.getIsCreateCourse() != null && dto.getIsCreateCourse()) {
                    listByFilters2.removeIf(e -> {
                        //去掉未发布的课程
                        if (!e.getPublished() && seache.contains(e.getId()) && !finalStrings.contains(e.getOrgId()) && !dto.getOrgAid().equals(e.getSysCreateAid())) {
                            return true;
                        }
                        //去掉所有条件都不符合的课程
-                        if(!seache.contains(e.getId())&&!dto.getReadIds().contains(e.getId())&& !finalStrings.contains(e.getOrgId()) && !dto.getOrgAid().equals(e.getSysCreateAid())){
+                        if (!seache.contains(e.getId()) && !dto.getReadIds().contains(e.getId()) && !finalStrings.contains(e.getOrgId()) && !dto.getOrgAid().equals(e.getSysCreateAid())) {
                            return true;
                        }
                        return false;
                    });
                    //将需要隐藏的做标记
                    listByFilters2.forEach(e -> {
-                        if ((seache.contains(e.getId())||dto.getReadIds().contains(e.getOrgId())) && !finalStrings.contains(e.getOrgId()) && !dto.getOrgAid().equals(e.getSysCreateAid())) {
+                        if ((seache.contains(e.getId()) || dto.getReadIds().contains(e.getOrgId())) && !finalStrings.contains(e.getOrgId()) && !dto.getOrgAid().equals(e.getSysCreateAid())) {
                            e.setIsPermission(false);
                        } else {
                            e.setIsPermission(true);
                        }
                    });
                    listByFilters2.sort(Comparator.comparing(Course::getIsPermission).reversed());
-                }else{
-                    List<Course> collect = listByFilters2.stream().filter(e ->dto.getReadIds().contains(e.getOrgId())||dto.getOrgAid().equals(e.getSysCreateAid())||finalStrings.contains(e.getOrgId())).collect(Collectors.toList());
+                } else {
+                    List<Course> collect = listByFilters2.stream().filter(e -> dto.getReadIds().contains(e.getOrgId()) || dto.getOrgAid().equals(e.getSysCreateAid()) || finalStrings.contains(e.getOrgId())).collect(Collectors.toList());
                    List<Course> paginate = paginate(collect, pageIndex, pageSize);
                    PageList<Course> rs = new PageList<>();
                    rs.setCount(collect.size());
@@ -448,10 +460,47 @@ public class CourseServiceImpl implements ICourseService {
        List<Course> paginate = paginate(listByFilters2, pageIndex, pageSize);
        PageList<Course> rs = new PageList<>();
        rs.setCount(listByFilters2.size());
+        rs.setPageSize(pageSize);
        rs.setList(paginate);
+        if (!paginate.isEmpty()) {
+            log.info("-----KJB------ getCourse");
+            for (Course course : paginate) {
+                this.getCourseFromKJB(course);
+            }
+        }
        return rs;
    }

+    public void getCourseFromKJB(Course course){
+        String courseId = course.getId();
+        log.info("------------KJB---获取课程信息---------: courseId = " + courseId);
+        //String url = env.getProperty("kjb.url") + "/api/course/getCourseFromKJB?courseId=" + courseId;
+        String url = aicoreUrl + "/aiVideo/getCourseList";
+
+        JSONObject jsonObject = new JSONObject();
+        JSONArray courseIds = new JSONArray();
+        courseIds.add(courseId);
+        jsonObject.put("courseIds", courseIds);
+        String result = HttpUtils.sendMessage(jsonObject.toJSONString(), url);
+        log.info("---KJB --getCourseList 接口返回结果result: "+result);
+        JSONObject jsonResult  = JSONObject.parseObject(result);
+        String data = jsonResult.getString("rows");
+
+        List<BoeaiCourseDto> boeaiCourseDto = JSON.parseArray(data, BoeaiCourseDto.class);
+        //List<BoeaiCourseDto> aiVideoResourceRsp = Collections.singletonList(JSON.parseObject(data, BoeaiCourseDto.class));
+        if(boeaiCourseDto != null && !boeaiCourseDto.isEmpty()){
+            log.info("KJB摘要信息："+boeaiCourseDto.get(0).getSummaryContent());
+            course.setSummaryContent(boeaiCourseDto.get(0).getSummaryContent());
+            course.setSummaryStatus(boeaiCourseDto.get(0).getSummaryStatus());
+            course.setAiSet(boeaiCourseDto.get(0).getAiSet());
+            course.setAiAbstract(boeaiCourseDto.get(0).getAiAbstract());
+            course.setAiDraft(boeaiCourseDto.get(0).getAiDraft());
+            course.setAiTranslate(boeaiCourseDto.get(0).getAiTranslate());
+            course.setLanguageStatus(boeaiCourseDto.get(0).getLanguageStatus());
+            course.setLanguageCode(boeaiCourseDto.get(0).getLanguageCode() == null ? new ArrayList<>() :Arrays.asList(boeaiCourseDto.get(0).getLanguageCode().split(",")));
+        }
+    }
+
    private Set<String> getSeache(CourseQueryDto dto) {
        //需要设置为隐藏的课程id
        Set<String> list = new HashSet<>();
@@ -853,12 +902,14 @@ public class CourseServiceImpl implements ICourseService {
                    log.error("未配置事件消息发送的实现");
                }
            }
+
+            // 删除ES数据
+            deletedStudyResourceBatchByCourseIdAndType(id, c.getType());
        } else {
            //彻底删除，课件设置为无课程状态
            courseDao.setDeleted(id);
        }
        //记录删除日志信息
-
    }

    @Override
@@ -905,6 +956,7 @@ public class CourseServiceImpl implements ICourseService {
            for (CourseTeacher ct : full.getTeachers()) {
                ct.setCourseId(c.getId());
                courseTeacherDao.save(ct);
+                addBoeCourseTeacherModifyLog(ct, "M1位置讲师名修改", JSONUtil.toJsonStr(ct), null);
            }
        }
        if (full.getCrowds() != null && !full.getCrowds().isEmpty()) {
@@ -987,12 +1039,15 @@ public class CourseServiceImpl implements ICourseService {
        c.setSysVersion(courseDao.getVersion(c.getId()));
        full.getCourse().setSysVersion(c.getSysVersion());

+        // 兼容处理，记录下删除的关联数据
+        createCourseTeacherDeletedRecord(c.getId());
        //先清空教师信息， 教师信息如果不一样了，也要加入到日志中
        courseTeacherDao.deleteByField("courseId", c.getId());
        if (full.getTeachers() != null && !full.getTeachers().isEmpty()) {
            for (CourseTeacher ct : full.getTeachers()) {
                ct.setCourseId(c.getId());
                courseTeacherDao.saveOrUpdate(ct);
+                addBoeCourseTeacherModifyLog(ct, "M2位置讲师名修改", JSONUtil.toJsonStr(ct), null);
            }
        }
        //先清空受众信息,受众信息如果不一样了，也要加入到日志中
@@ -1041,12 +1096,15 @@ public class CourseServiceImpl implements ICourseService {
        c.setSysVersion(courseDao.getVersion(c.getId()));
        full.getCourse().setSysVersion(c.getSysVersion());

+        // 兼容处理，记录下删除的关联数据
+        createCourseTeacherDeletedRecord(c.getId());
        //先清空教师信息， 教师信息如果不一样了，也要加入到日志中
        courseTeacherDao.deleteByField("courseId", c.getId());
        if (full.getTeachers() != null && !full.getTeachers().isEmpty()) {
            for (CourseTeacher ct : full.getTeachers()) {
                ct.setCourseId(c.getId());
                courseTeacherDao.saveOrUpdate(ct);
+                addBoeCourseTeacherModifyLog(ct, "M3位置讲师名修改", JSONUtil.toJsonStr(ct), null);
            }
        }
        //先清空受众信息,受众信息如果不一样了，也要加入到日志中
@@ -1076,12 +1134,15 @@ public class CourseServiceImpl implements ICourseService {
        c.setPublishTime(LocalDateTime.now());
        courseDao.update(c);

+        // 兼容处理，记录下删除的关联数据
+        createCourseTeacherDeletedRecord(c.getId());
        //先清空教师信息， 教师信息如果不一样了，也要加入到日志中
        courseTeacherDao.deleteByField("courseId", c.getId());
        if (full.getTeachers() != null && !full.getTeachers().isEmpty()) {
            for (CourseTeacher ct : full.getTeachers()) {
                ct.setCourseId(c.getId());
                courseTeacherDao.saveOrUpdate(ct);
+                addBoeCourseTeacherModifyLog(ct, "M4位置讲师名修改", JSONUtil.toJsonStr(ct), null);
            }
        }
        //先清空受众信息,受众信息如果不一样了，也要加入到日志中
@@ -1567,6 +1628,13 @@ public class CourseServiceImpl implements ICourseService {
        return list;
    }

+    @Override
+    public List<Course> findByIds(List<String> courseIds) {
+        QueryBuilder query = QueryBuilder.from(Course.class);
+        query.addFilter(FieldFilters.in("id", courseIds));
+        return courseDao.findList(query.builder());
+    }
+

    @Override
    public int countWaitAudit(String aid) {
@@ -1978,5 +2046,54 @@ public class CourseServiceImpl implements ICourseService {
        return courseDao.findListByHql("Select new Course(id,studys,score) from Course where id in(?1)", ids);
    }

+    @Override
+    public void deletedStudyResourceBatchByCourseIdAndType(String courseId, Integer courseType) {
+        DeleteByQueryRequest request = new DeleteByQueryRequest("new_study_resource");
+        BoolQueryBuilder boolQueryBuilder = new BoolQueryBuilder();
+        boolQueryBuilder.must(QueryBuilders.matchQuery("courseId", courseId));
+        boolQueryBuilder.must(QueryBuilders.matchQuery("courseType", courseType));
+        request.setQuery(boolQueryBuilder);
+        try {
+            restHighLevelClient.deleteByQuery(request, RequestOptions.DEFAULT);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 删除boe_course_teacher数据时把删除的数据储存到boe_course_teacher_deleted_record表
+     * boe_course_teacher表没有deleted字段，兼容处理
+     *
+     * @param courseId 课程ID
+     */
+    private void createCourseTeacherDeletedRecord(String courseId) {
+        List<CourseTeacherDeletedRecord> courseTeacherList = courseTeacherDao.findList(FieldFilters.eq("courseId", courseId)).stream().map(ct -> {
+            CourseTeacherDeletedRecord courseTeacherDeletedRecord = new CourseTeacherDeletedRecord();
+            courseTeacherDeletedRecord.setCourseId(ct.getCourseId());
+            courseTeacherDeletedRecord.setTeacherId(ct.getTeacherId());
+            courseTeacherDeletedRecord.setTeacherName(ct.getTeacherName());
+            return courseTeacherDeletedRecord;
+        }).collect(Collectors.toList());
+
+        if (CollUtil.isNotEmpty(courseTeacherList)) {
+            courseTeacherDeletedRecordDao.saveList(courseTeacherList);
+        }
+    }
+
+    /**
+     * 增加boe_course_teacher的teacher_name字段被改为"BOE教师"的监控
+     */
+    private void addBoeCourseTeacherModifyLog(CourseTeacher ct, String location, String body, String remark) {
+        try {
+            if (ct == null) {
+                return;
+            }
+            if (Objects.equals(ct.getTeacherName(), "BOE教师")) {
+                modifyLogDao.insert(null, location, body, remark);
+            }
+        } catch (Exception e) {
+            log.error("创建boe_course_teacher记录失败", e);
+        }
+    }

 }
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/utils/HttpUtils.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/utils/HttpUtils.java
@@ -0,0 +1,50 @@
+package com.xboe.module.course.utils;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+
+import java.nio.charset.StandardCharsets;
+
+/**
+ * @author
+ * @date 2025年11月18日
+ */
+@Slf4j
+public class HttpUtils {
+    public static String sendMessage(String message,String url) {
+        log.info("----------------发送消息开始 -------");
+        //log.info("----------------发送消息url -------{}",url);
+        log.info("----------------发送消息参数 -------{}",message);
+        // POST 请求
+        try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
+            // POST 请求
+            HttpPost httpPost = new HttpPost(url);
+            //HttpPost httpPost = new HttpPost("https://jsonplaceholder.typicode.com/posts");
+            httpPost.setEntity(new StringEntity(message, StandardCharsets.UTF_8));
+            httpPost.setHeader("Content-Type", "application/json; charset=utf-8");
+            httpPost.setHeader("Accept", "application/json");
+            CloseableHttpResponse response = httpClient.execute(httpPost);
+
+            HttpEntity responseEntity = response.getEntity();
+            String responseBody = "";
+            if (responseEntity != null) {
+                responseBody = EntityUtils.toString(responseEntity, StandardCharsets.UTF_8);
+                System.out.println("Response Body: " + responseBody);
+            }
+            log.info("---------------发送消息响应 -------{}",responseBody);
+            return responseBody;
+//				System.out.println("状态码: " + response.getCode());
+//				System.out.println("响应体: " + EntityUtils.toString(response.getEntity()));
+
+        } catch (Exception e) {
+            log.error("KJB-发送消息错误",e);
+            throw new RuntimeException(e);
+        }
+    }
+}
--- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/AloneExamServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/AloneExamServiceImpl.java
@@ -8,6 +8,8 @@ import java.util.Map;

 import javax.annotation.Resource;

+import com.boe.feign.api.courseweb.reps.ExamStudyRecordParam;
+import com.xboe.api.ThirdApi;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -37,7 +39,10 @@ public class AloneExamServiceImpl implements IAloneExamService{
 	
 	@Resource
 	AloneExamDao aeDao;
-	
+	@Resource
+	private ThirdApi thirdApi;
+
+
 	@Override
 	@Transactional
 	public void save(AloneExamAnswer aea){
@@ -101,7 +106,18 @@ public class AloneExamServiceImpl implements IAloneExamService{
 //				//这种情况汶是不存在的
 //			}
 		}
-	}
+
+        try {
+            ExamStudyRecordParam param = new ExamStudyRecordParam();
+            param.setTestId(aea.getTestId());
+            param.setAid(aea.getAid());
+            thirdApi.syncExamStudyRecord(param);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+
+    }

 	@Override
 	@Transactional
--- a/servers/boe-server-all/src/main/java/com/xboe/module/popup/entity/Popup.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/popup/entity/Popup.java
@@ -1,5 +1,6 @@
 package com.xboe.module.popup.entity;

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

    /**
     * 结束时间
     * */
    @Column(name = "end_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime endTime;


--- 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
@@ -1,18 +1,33 @@
 package com.xboe.school.study.api;

+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
+import java.util.stream.Collectors;

+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.dto.AiVideoResourceRsp;
+import com.xboe.module.course.dto.BoeaiSubtitleRsp;
+import com.xboe.module.course.utils.HttpUtils;
 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.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;
@@ -95,6 +110,9 @@ public class StudyCourseApi extends ApiBaseController{
 	@Autowired
 	StringRedisTemplate redisTemplate;

+	@Value("${kjb.aicoreUrl}")
+	private String aicoreUrl;
+
 	/**
 	 * 用于查询课程的学习记录
 	 * @param pager
@@ -198,12 +216,19 @@ public class StudyCourseApi extends ApiBaseController{
 		List<CourseContent> cclist=contentService.getByCourseId(cid);
 		List<CourseSection> sectionlist=sectionService.getByCourseId(cid);
 		List<CourseTeacher> teachers=courseService.findTeachersByCourseId(cid);
+
+		for (CourseContent cc : cclist) {
+			log.info("根据视频信息查询AI字幕数据：cc = " + cc.toString());
+			this.getVtt( cid , cc);
+		}
 		
 		//获取教师的介绍信息,因为一门课程 的教师不会太多，所以这里简单直接遍历查询，后续再优化
 		for(CourseTeacher ct : teachers) {
 			Teacher t = teacherService.get(ct.getTeacherId());
 			if(t!=null) {
 				ct.setRemark(t.getDescription());
+				ct.setSupplier(t.getSupplier());
+				ct.setTeacherType(t.getTeacherType());
 			}
 			if(redisTemplate.opsForValue().get(ct.getTeacherId())==null){
 				List<String>list=new ArrayList<>();
@@ -212,20 +237,44 @@ public class StudyCourseApi extends ApiBaseController{
 				redisTemplate.opsForValue().set(teacherVo.get(0).getTeacherId(), teacherVo.get(0).getStatus());
 				//设置过期时间为1天
 				redisTemplate.expire(teacherVo.get(0).getTeacherId(), 24 * 60 * 60, TimeUnit.SECONDS);
-				if (Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1")){
+				if (Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1") && (  t==null ||  t.getTeacherType() == 1)){
 					ct.setTeacherName("BOE教师");
 				}
 			}
-			if (Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1")){
+			if (Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1") && (  t==null ||  t.getTeacherType() == 1)){
 				ct.setTeacherName("BOE教师");
 			}
 		}

+
 		rs.put("isCrowd",pass);
 		rs.put("contents",cclist);
 		rs.put("sections",sectionlist);
 		rs.put("teachers",teachers);
-		
+		// 未选择仅内网时isPermission = false，不用区分内外网
+		boolean isPermission = false;
+		if(course.getDevice() ==4){
+			CommonSearchVo searcher = new CommonSearchVo();
+			searcher.setPid(637L);
+			searcher.setType(1);
+			List<Dict> dictList = thirdApi.getDictItems(searcher);
+			if(dictList != null && dictList.size() > 0){
+				List<String> dicts =  dictList.stream().map(Dict::getValue).collect(Collectors.toList());
+				// 选择仅内网 并且字典中配置了此课程资源归属，那么只能内网观看 返回 truw
+				isPermission = dicts.contains(course.getOrgId());
+			}
+		}
+		rs.put("isPermission",isPermission);
+
+		CommonSearchVo warn = new CommonSearchVo();
+		warn.setCode("course_warn");
+		warn.setType(1);
+		List<Dict> warns = thirdApi.getDictItems(warn);
+		if(warns != null && warns.size() > 0){
+			rs.put("warn",warns.get(0).getValue());
+			rs.put("warnTitle",warns.get(0).getName());
+		}
+
 		//检查是否已报名
 		StudyCourse sc=service.findByCourseIdAndAid(cid, aid);
 		if(pass==true && sc==null) {
@@ -251,12 +300,71 @@ public class StudyCourseApi extends ApiBaseController{
 			rs.put("progress", sc.getProgress());
 			//查询上次学习的是什么资源。查询用户的学习情况
 			List<StudyCourseItem> items=studyService.findByStudyId(sc.getId());
+			// 和内容匹配，根据内容的视频时长，计算学习进度
+			if(CollectionUtil.isNotEmpty(items) && CollectionUtil.isNotEmpty(cclist)){
+				// 根据ID转换map
+				Map<String, CourseContent> contentMap = cclist.stream().collect(Collectors.toMap(CourseContent::getId, Function.identity()));
+				for (StudyCourseItem item : items) {
+					CourseContent content = contentMap.get(item.getContentId());
+					if(null == content){
+						continue;
+					}
+
+					if(null==item.getLastStudyTime()
+							|| item.getLastStudyTime()<=0
+							|| null==content.getDuration()
+							|| content.getDuration()<=0){
+						continue;
+					}
+
+					BigDecimal lastStudyTime = new BigDecimal(item.getLastStudyTime());
+					BigDecimal duration = new BigDecimal(content.getDuration());
+					BigDecimal progress = lastStudyTime.divide(duration, 10, RoundingMode.HALF_UP);
+					if(progress.compareTo(BigDecimal.ZERO) < 0){
+						progress = BigDecimal.ZERO;
+					}else if(progress.compareTo(BigDecimal.ONE) > 0){
+						progress = BigDecimal.ONE;
+					}
+
+					item.setProgressVideo(progress);
+				}
+			}
+
 			rs.put("contentStudys",items);//学习的内容
 		}
 		
 		return success(rs);
 	}

+	public void getVtt(String couirseId, CourseContent cc){
+		log.info("------KJB --------- getVtt couirseId = " + couirseId + " videoId = " + cc.getId());
+		String url = aicoreUrl + "/aiVideo/getVideoVtt";
+		JSONObject message = new JSONObject();
+		message.put("courseId", couirseId);
+		message.put("videoId", cc.getId());
+		String result = HttpUtils.sendMessage(message.toJSONString(), url);
+		if(StringUtils.isBlank(result)){
+			log.error("未获取到AI字幕信息");
+			return;
+		}
+		//将返回string 转为json对象
+		JSONObject jsonObject = JSONObject.parseObject(result);
+		String data = jsonObject.getString("data");
+		//json字符串转为实体对象
+		AiVideoResourceRsp aiVideoResourceRsp = JSON.parseObject(data, AiVideoResourceRsp.class);
+		log.info("aiVideoResourceRsp:"+aiVideoResourceRsp);
+		//循环json对象
+		if(aiVideoResourceRsp != null){
+			cc.setBoeaiSubtitleRspList(aiVideoResourceRsp.getBoeaiSubtitleRspList());
+//			for (int i = 0; i < rows.size(); i++) {
+//				JSONObject row = rows.getJSONObject(i);
+//				//将json对象转为实体对象 CourseContentVtt
+//				BoeaiSubtitleRsp vtt = row.toJavaObject(BoeaiSubtitleRsp.class);
+//				boeaiSubtitleRspList.add(vtt);
+//			}
+		}
+	}
+
 	/**
 	 * 在打开课程详细页面的时候，调用此接口，返回学习课程信息，上次学习的位置。<br/>
 	 * 如果没有就返回空<br>
@@ -343,6 +451,8 @@ public class StudyCourseApi extends ApiBaseController{
 			}
 			//追加学习时长
 			studyService.appendStudyDuration(sci.getStudyId(),item.getId(),sci.getContentId(),sci.getDuration());
+
+			log.info(" 1 在线课学习记录 sci.getStudyId() = "+ sci.getStudyId() + " , sci.getCourseId() = " + sci.getCourseId() );
 			List<StudyCourse> allUserList = thirdApi.getStudyCourseList(sci.getStudyId() ,sci.getCourseId(), token);
 			log.info("在线课学习记录"+allUserList);
 			return success(item.getId());
@@ -527,8 +637,8 @@ public class StudyCourseApi extends ApiBaseController{
 		}
 		try {
 			studyService.finishVideoStudyItem(itemId, studyId,courseId,cnum,token);
-			List<StudyCourse> allUserList = thirdApi.getStudyCourseList(studyId ,courseId, token);
-			log.info("在线课学习记录"+allUserList);
+//			List<StudyCourse> allUserList = thirdApi.getStudyCourseList(studyId ,courseId, token);
+//			log.info("在线课学习记录"+allUserList);
 			return success(true);
 		}catch(Exception e) {
 			log.error("记录内容学习完成错误",e);
@@ -573,7 +683,7 @@ public class StudyCourseApi extends ApiBaseController{
 	@Deprecated
 	@RequestMapping(value="/appendtime",method = {RequestMethod.GET,RequestMethod.POST})
 	public JsonResponse<String> appendTime(StudyTime studyTime, HttpServletRequest request){
-		
+
 		if(StringUtils.isBlank(studyTime.getStudyId())){
 			return error("参数错误");
 		}
@@ -603,7 +713,91 @@ public class StudyCourseApi extends ApiBaseController{
 			return error("记录学习时长错误",e.getMessage());
 		}
 	}
-	
+
+	/**
+	 * appendtime 于 study-video-time 合并
+	 * */
+	/*@RequestMapping(value="/updateStudyVideoTime1",method = {RequestMethod.GET,RequestMethod.POST})
+	public JsonResponse<String> updateStudyVideoTime1(StudyTimeVo studyTime, HttpServletRequest request){
+
+		//  0 study-video-time ,  1 appendtime
+		if (studyTime.getType() == 0){
+			if(StringUtils.isBlank(studyTime.getItemId())){
+				return error("参数错误");
+			}
+			if(studyTime.getVideoTime()==null){
+				return error("无时间点");
+			}
+			//检查是否已存在
+			try {
+				studyService.updateLastTime(studyTime.getItemId(),studyTime.getVideoTime(), getCurrent().getAccountId());
+				if (studyTime.getContentId() != null && studyTime.getCourseId() != null && studyTime.getProgressVideo() != null){
+					contentService.updateProcessVideo(studyTime.getContentId(), studyTime.getCourseId(), studyTime.getProgressVideo());
+				}
+				return success("true");
+			}catch(Exception e) {
+				log.error("updateStudyVideoTime type =0 记录最后学习时间错误",e);
+				return error("updateStudyVideoTime type =0 记录最后学习时间失败 ",e.getMessage());
+			}
+		}else if(studyTime.getType() == 1){
+			if(StringUtils.isBlank(studyTime.getStudyId())){
+				return error("参数错误");
+			}
+			if(StringUtils.isBlank(studyTime.getCourseId())){
+				return error("未指定课程");
+			}
+			if(StringUtils.isBlank(studyTime.getContentId())){
+				return error("未指定资源内容");
+			}
+
+			String token = request.getHeader("Xboe-Access-Token");
+			if (StringUtils.isEmpty(token)) {
+				token = request.getHeader("token");
+			}
+			try {
+				studyService.updateStudyDuration(studyTime.getStudyId(),null,studyTime.getContentId(),studyTime.getVideoTime(),studyTime.getCourseId());
+				List<StudyCourse> allUserList = thirdApi.getStudyCourseList(studyTime.getStudyId() ,studyTime.getCourseId(), token);
+				log.info("updateStudyVideoTime type =1 在线课学习记录 = " + allUserList);
+				return success(studyTime.getId());
+			}catch(Exception e) {
+				log.error("updateStudyVideoTime type =1 记录学习时长错误",e);
+				return error("updateStudyVideoTime type =1 记录学习时长错误 ",e.getMessage());
+			}
+		}else{
+			return error("type不能为空");
+		}
+	}*/
+
+	@RequestMapping(value="/updateStudyVideoTime",method = {RequestMethod.GET,RequestMethod.POST})
+	public JsonResponse<String> updateStudyVideoTime(StudyTimeVo studyTime, HttpServletRequest request){
+        try {
+            if(StringUtils.isBlank(studyTime.getItemId())){
+                return error("参数错误");
+            }
+            if(studyTime.getVideoTime()==null){
+                return error("无时间点");
+            }
+            if(StringUtils.isBlank(studyTime.getStudyId())){
+                return error("参数错误");
+            }
+            if(StringUtils.isBlank(studyTime.getCourseId())){
+                return error("未指定课程");
+            }
+            if(StringUtils.isBlank(studyTime.getContentId())){
+                return error("未指定资源内容");
+            }
+            studyService.updateStudyDuration(studyTime.getStudyId(),studyTime.getItemId(),studyTime.getContentId(),studyTime.getVideoTime(),studyTime.getCourseId());
+            if (studyTime.getContentId() != null && studyTime.getCourseId() != null && studyTime.getProgressVideo() != null){
+                contentService.updateProcessVideo(studyTime.getContentId(), studyTime.getCourseId(), studyTime.getProgressVideo());
+            }
+
+        } catch (Exception e) {
+			log.error("updateStudyVideoTime",e);
+			return error("学习时长记录失败",e.getMessage(),null);
+        }
+		return success("true");
+    }
+
 	/**获取最后一次的学习内容*/
 	@GetMapping("/last-study")
 	public JsonResponse<Map<String,Object>> lastStudy(){
--- a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseESApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseESApi.java
@@ -3,9 +3,16 @@ package com.xboe.school.study.api;
 import java.io.IOException;
 import java.time.ZoneOffset;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;

+import cn.hutool.core.collection.CollectionUtil;
+import com.xboe.module.course.entity.Course;
+import com.xboe.module.course.service.ICourseService;
+import org.apache.commons.compress.utils.Lists;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -42,6 +49,15 @@ public class StudyCourseESApi extends ApiBaseController{
 	@Autowired
 	IStudyCourseService service;

+	@Autowired
+	ICourseService courseService;
+
+	@Value("${xboe.upload.file.http_path}")
+	private String httpPath;
+
+	@Value("${xboe.image.course.default}")
+	private String defaultCourseImage;
+
 	@Resource
 	private PhpOnlineStudyRecordScheduledTasks phpOnlineStudyRecordScheduledTasks;

@@ -54,13 +70,61 @@ public class StudyCourseESApi extends ApiBaseController{
 		try {
 			dto.setAccountId(getCurrent().getAccountId());
 			PageList<CourseStudyDto> rs=search.search(page.getStartRow(),page.getPageSize(), dto);
+
+			handleCourseImage(rs);
+
 			return success(rs);
 		}catch(Exception e) {
 			log.error("查询报名学习ES失败",e);
 			return error("查询失败",e.getMessage());
 		}
 	}
-	
+
+	private void handleCourseImage(PageList<CourseStudyDto> rs) {
+		if (rs == null || CollectionUtil.isEmpty(rs.getList())) {
+			return;
+		}
+
+		List<String> emptyImageCourseIds = Lists.newArrayList();
+		for(CourseStudyDto courseStudyDto : rs.getList()) {
+			if(StringUtils.isBlank(courseStudyDto.getCourseImage())) {
+				// 过滤课程类型
+				if(courseStudyDto.getCourseType()==10
+					|| courseStudyDto.getCourseType()==20){
+					emptyImageCourseIds.add(courseStudyDto.getCourseId());
+				}else{
+					log.warn("课程图片为空，课程id为：{}，课程类型:{}",courseStudyDto.getCourseId(),courseStudyDto.getCourseType());
+				}
+			}
+		}
+
+		if(CollectionUtil.isEmpty(emptyImageCourseIds)){
+			return;
+		}
+
+		List<Course> courseList = courseService.findByIds(emptyImageCourseIds);
+		if(CollectionUtil.isNotEmpty(courseList)){
+			// courseList转换成map
+			Map<String, Course> courseMap = courseList.stream().collect(Collectors.toMap(Course::getId, course -> course));
+
+			// 赋值ES图片
+			for(CourseStudyDto courseStudyDto : rs.getList()) {
+				if(emptyImageCourseIds.contains(courseStudyDto.getCourseId())) {
+					Course currentCourse = courseMap.get(courseStudyDto.getCourseId());
+					if(null!=currentCourse){
+						if(StringUtils.isNotBlank(currentCourse.getCoverImg())){
+							// 拼接域名
+							courseStudyDto.setCourseImage(httpPath + currentCourse.getCoverImg());
+						}else{
+							// 赋值默认图片
+							courseStudyDto.setCourseImage(defaultCourseImage);
+						}
+					}
+				}
+			}
+		}
+	}
+
 	@RequestMapping(value="/list-by-ids",method = {RequestMethod.POST})
 	public JsonResponse<List<StudyCourse>> search(@RequestBody List<String> ids){
 		if(ids.isEmpty()) {
--- a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseTask.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseTask.java
@@ -0,0 +1,262 @@
+package com.xboe.school.study.api;
+
+import com.xboe.api.ThirdApi;
+import com.xboe.school.study.entity.StudyCourse;
+import com.xboe.school.study.service.IStudyService;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.connection.RedisConnection;
+import org.springframework.data.redis.core.Cursor;
+import org.springframework.data.redis.core.ScanOptions;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+import java.util.function.BiConsumer;
+
+/**
+ * @author by lyc
+ * @date 2025/3/3
+ */
+@Component
+@Slf4j
+@RequiredArgsConstructor
+public class StudyCourseTask {
+
+    private final IStudyService studyService;
+    private final StringRedisTemplate redisTemplate;
+    @Resource
+    private ThirdApi thirdApi;
+
+    /**
+     * 定时任务
+     * 获取redis 中学习结束的数据更新入库
+     * */
+    @XxlJob("saveStudyCourseItemLastTime2")
+    public void saveStudyCourseItemLastTime2() {
+        // 1. 定义匹配模式（匹配所有目标key）
+        final String KEY_PATTERN = "studyContentId:*:last_active";
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss");
+        // 2. 使用SCAN安全遍历（避免阻塞）
+        ScanOptions options = ScanOptions.scanOptions()
+            .match(KEY_PATTERN)
+            .count(100) // 分页大小
+            .build();
+
+        try (RedisConnection connection = Objects.requireNonNull(redisTemplate.getConnectionFactory()).getConnection()) {
+            Cursor<byte[]> cursor = connection.scan(options);
+            // 3. 遍历处理符合条件的key
+            while (cursor.hasNext()) {
+                String redisKey = new String(cursor.next());
+                // 4. 获取剩余TTL（秒）
+                Long ttl = redisTemplate.getExpire(redisKey, TimeUnit.SECONDS);
+
+                // 5. 过滤条件：剩余时间 >= 29天23小时30分钟（转换为秒）
+                // 总需时间 = (30天 - 30分钟) = 29天23小时30分钟 = 2590200秒
+                // 5分钟 300秒 || 2592000 - 300 = 2591700
+                if (ttl <= 2590200) {
+                    try {
+                        // 6. 提取studyContentId
+                        String[] parts = redisKey.split(":");
+                        if (parts.length < 2) continue;
+                        String studyContentId = parts[1];
+                        // 7. 获取存储的时间点（示例逻辑）
+                        String redisValue = redisTemplate.opsForValue().get(redisKey);
+                        if (redisValue == null) continue;
+                        String[] partValues = redisValue.split("&");
+                        int lastStudyTime = Integer.parseInt(partValues[0]);
+                        LocalDateTime timestamp = null;
+                        if (partValues.length >= 2){
+                            timestamp = LocalDateTime.parse(partValues[1], formatter);
+                        }
+                        // 8. 更新数据库（调用已有服务方法）
+                        studyService.updateStudyCourseItemLastTime(studyContentId, lastStudyTime, timestamp);
+                        // 9. 删除Redis键（原子操作）
+                        redisTemplate.delete(redisKey);
+                        log.info("处理成功 key: {}, lastStudyTime: {}", redisKey, lastStudyTime);
+                    } catch (Exception e) {
+                        log.error("处理失败 key: {}", redisKey, e);
+                    }
+                }
+            }
+            cursor.close();
+        } catch (Exception e) {
+            log.error("定时任务执行异常", e);
+        }
+
+      /*  // 新增日志逻辑
+        if (ttl <= 172800) {
+            studyService.saveCourseExpireLog(
+                    studyContentId,
+                    lastStudyTime,
+                    redisKey,
+                    ttl,
+                    "system_job"
+            );
+        }*/
+
+    }
+
+
+    @XxlJob("saveStudyCourseItemLastTime")
+    public void saveStudyCourseItemLastTime() {
+        // 1. 定义匹配模式（匹配所有目标key）
+        final String KEY_PATTERN = "studyId:*:courseId:*:courseContentId:*:studyItemId:*";
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss");
+        // 2. 使用SCAN安全遍历（避免阻塞）
+        ScanOptions options = ScanOptions.scanOptions()
+                .match(KEY_PATTERN)
+                .count(100) // 分页大小
+                .build();
+
+        try (RedisConnection connection = Objects.requireNonNull(redisTemplate.getConnectionFactory()).getConnection()) {
+            Cursor<byte[]> cursor = connection.scan(options);
+            // 3. 遍历处理符合条件的key
+            while (cursor.hasNext()) {
+                String redisKey = new String(cursor.next());
+                log.info("-定时任务 saveStudyCourseItemLastTime ---redisKey = " + redisKey);
+                // 4. 获取剩余TTL（秒）
+                Long ttl = redisTemplate.getExpire(redisKey, TimeUnit.SECONDS);
+
+                // 5. 过滤条件：剩余时间 >= 29天23小时30分钟（转换为秒）
+                // 总需时间 = (30天 - 30分钟) = 29天23小时30分钟 = 2590200秒
+                // 5分钟 300秒 || 2592000 - 300 = 2591700
+                if (ttl <= 2590200) {
+                    try {
+                        // 6. 提取studyContentId
+                        String[] parts = redisKey.split(":");
+                        if (parts.length < 7) continue;
+                        String studyId = parts[1];
+                        String courseId = parts[3];
+                        String courseContentId = parts[5];
+                        String studyItemId = parts[7];
+                        // 7. 获取存储的时间点（示例逻辑）
+                        String redisValue = redisTemplate.opsForValue().get(redisKey);
+                        log.info("-定时任务 saveStudyCourseItemLastTime ---redisValue = " + redisValue);
+                        if (redisValue == null) continue;
+                        String[] partValues = redisValue.split("&");
+                        int studyVideoTtime = Integer.parseInt(partValues[0]);
+                        int appendtime = Integer.parseInt(partValues[1]);
+                        LocalDateTime timestamp = null;
+                        if (partValues.length >= 2){
+                            timestamp = LocalDateTime.parse(partValues[2], formatter);
+                        }
+                        // 8. 更新数据库（调用已有服务方法）
+                        studyService.newAppendStudyDuration(studyId,null,courseContentId,appendtime,timestamp);
+                        log.info("-定时任务 saveStudyCourseItemLastTime ---studyItemId = " + studyItemId);
+                        if (studyItemId != null && !studyItemId.equals("null")){
+                            log.info("-定时任务 saveStudyCourseItemLastTime --- boolean studyItemId = " + (studyItemId != null));
+                            // 8. 更新数据库（调用已有服务方法）
+                            studyService.updateStudyCourseItemLastTime(studyItemId, studyVideoTtime, timestamp);
+                        }
+                        List<StudyCourse> allUserList = thirdApi.getStudyCourseList(studyId , courseId, null);
+                        log.info("处理成功 allUserList: {}", allUserList);
+                        // 9. 删除Redis键（原子操作）
+                        redisTemplate.delete(redisKey);
+                        log.info("处理成功 key: {}, lastStudyTime: {}", redisKey, appendtime);
+                    } catch (Exception e) {
+                        log.error("处理失败 key: {}", redisKey, e);
+                    }
+                }
+            }
+            cursor.close();
+        } catch (Exception e) {
+            log.error("定时任务执行异常", e);
+        }
+
+
+    }
+
+
+    @XxlJob("saveStudyCourseItemLastTime1")
+    public void saveStudyCourseItemLastTime1() {
+        // 定义需要处理的键模式集合
+        processKeys("studyContentId:*:last_active", this::handleLastActiveKey);
+        processKeys("studyId:*:courseId:*:courseContentId:*", this::handleDurationKey);
+    }
+
+    private void processKeys(String keyPattern, BiConsumer<String, String> keyHandler) {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss");
+        ScanOptions options = ScanOptions.scanOptions()
+                .match(keyPattern)
+                .count(100)
+                .build();
+
+        try (RedisConnection connection = Objects.requireNonNull(redisTemplate.getConnectionFactory()).getConnection()) {
+            Cursor<byte[]> cursor = connection.scan(options);
+            while (cursor.hasNext()) {
+                String redisKey = new String(cursor.next());
+                Long ttl = redisTemplate.getExpire(redisKey, TimeUnit.SECONDS);
+
+                if (ttl != null && ttl <= 2590200) {
+                    try {
+                        String redisValue = redisTemplate.opsForValue().get(redisKey);
+                        if (redisValue != null) {
+                            // 调用对应的处理方法
+                            keyHandler.accept(redisKey, redisValue);
+                        }
+                        redisTemplate.delete(redisKey);
+                        log.info("Key processed: {}", redisKey);
+                    } catch (Exception e) {
+                        log.error("Process failed [{}]", redisKey, e);
+                    }
+                }
+            }
+            cursor.close();
+        } catch (Exception e) {
+            log.error("Key processing error: {}", keyPattern, e);
+        }
+    }
+
+    // 处理 last_active 类型键
+    private void handleLastActiveKey(String redisKey, String redisValue) {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss");
+        String[] parts = redisKey.split(":");
+        String studyContentId = parts[1];
+
+        String[] values = redisValue.split("&");
+        int lastStudyTime = Integer.parseInt(values[0]);
+        LocalDateTime timestamp = values.length >= 2 ?
+            LocalDateTime.parse(values[1], formatter) : null;
+
+        studyService.updateStudyCourseItemLastTime(studyContentId, lastStudyTime, timestamp);
+    }
+
+    // 处理 duration 类型键
+    private void handleDurationKey(String redisKey, String redisValue) {
+        String[] parts = redisKey.split(":");
+        String studyId = parts[1];
+        String courseId = parts[3];
+        String courseContentId = parts[5];
+
+        String[] values = redisValue.split("&");
+        int duration = Integer.parseInt(values[0]);
+        LocalDateTime timestamp = values.length >= 2 ?
+            LocalDateTime.parse(values[1], DateTimeFormatter.ISO_LOCAL_DATE_TIME) : null;
+
+        studyService.newAppendStudyDuration(studyId, null, courseContentId, duration, timestamp);
+
+        // 保留第三方调用
+        List<StudyCourse> allUserList = thirdApi.getStudyCourseList(studyId, courseId, null);
+        log.info("Study records synced: {}", allUserList.size());
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
--- a/servers/boe-server-all/src/main/java/com/xboe/school/study/entity/StudyCourseItem.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/entity/StudyCourseItem.java
@@ -1,10 +1,12 @@
 package com.xboe.school.study.entity;

+import java.math.BigDecimal;
 import java.time.LocalDateTime;

 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;

 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.xboe.core.SysConstant;
@@ -128,5 +130,12 @@ public class StudyCourseItem extends IdEntity {
     */
    @Column(name = "status",length=1)
    private Integer status;
-    
+
+    /**
+     * 视频播放进度
+     * */
+//    @Column(name = "progress_video")
+    @Transient
+    private BigDecimal progressVideo;
+
 }
--- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/IStudyService.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/IStudyService.java
@@ -1,5 +1,6 @@
 package com.xboe.school.study.service;

+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;

@@ -7,7 +8,6 @@ import com.xboe.common.PageList;
 import com.xboe.school.study.dto.StudyContentDto;
 import com.xboe.school.study.entity.StudyCourseItem;
 import com.xboe.school.study.entity.StudyTime;
-import com.xboe.system.user.entity.User;

 /**
 * 学习情况处理,比较综合一个处理类
@@ -35,11 +35,12 @@ public interface IStudyService {
 	
 	/**
 	 * 更新最后的学习时间，及学习时间点
+	 *
 	 * @param studyContentId
 	 * @param lastStudyTime
 	 * @param aid
 	 */
-	void updateLastTime(String studyContentId,int lastStudyTime,String aid);
+	void updateLastTime(String studyContentId, int lastStudyTime, String aid);

 	/**
 	 * 资源学习记录
@@ -99,4 +100,9 @@ public interface IStudyService {

    List<StudyCourseItem> getList(String courseId, String contentId, String name, Integer status);

+	void updateStudyCourseItemLastTime(String studyContentId, int lastStudyTime, LocalDateTime timestamp);
+
+	void updateStudyDuration(String studyId,String studyItemId, String contentId, Integer videoTime,String courseId);
+
+	void newAppendStudyDuration(String studyId, String studyItemId, String courseContentId, int duration, LocalDateTime timestamp);
 }
--- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyExamServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyExamServiceImpl.java
@@ -10,6 +10,7 @@ import com.xboe.module.course.entity.CourseExam;
 import com.xboe.school.study.dao.StudyCourseDao;
 import com.xboe.school.study.dao.StudyCourseItemDao;
 import com.xboe.school.study.dao.StudyExamDao;
+import com.xboe.school.study.entity.StudyCourse;
 import com.xboe.school.study.entity.StudyCourseItem;
 import com.xboe.school.study.entity.StudyExam;
 import com.xboe.school.study.service.IStudyExamService;
@@ -170,15 +171,32 @@ public class StudyExamServiceImpl implements IStudyExamService{
 			}
 			builder.addGroupBy("studyId");
 			List<StudyExam> list1 = dao.findList(builder.builder());
-			log.info("------------QueryBuilder list1.size = " + list1.size() + ",0 = " + list1.get(0));
-
-			for(StudyExam item : list1){
-				log.info("-----------------CourseId = " + item.getCourseId() + " , StudyId = " + item.getStudyId() + " , StudentId = " + item.getStudentId());
-				int totalContent = courseContentDao.getCount(item.getCourseId());
-				log.info("----------准备判断进度-------totalContent = " + totalContent);
-				scDao.finishCheck1(item.getStudyId(),item.getCourseId(),totalContent);
-				log.info("----------判断进度完毕----------------------");
+			if(list1 != null && list1.size() > 0){
+				log.info("----------StudyExam--QueryBuilder list1.size = " + list1.size() + ",0 = " + list1.get(0));
+				for(StudyExam item : list1){
+					log.info("--------------StudyExam---CourseId = " + item.getCourseId() + " , StudyId = " + item.getStudyId() + " , StudentId = " + item.getStudentId());
+					int totalContent = courseContentDao.getCount(item.getCourseId());
+					log.info("--------StudyExam--准备判断进度-------totalContent = " + totalContent);
+					scDao.finishCheck1(item.getStudyId(),item.getCourseId(),totalContent);
+					log.info("--------StudyExam--判断进度完毕----------------------");
+				}
+			}else{
+				QueryBuilder builder1 = QueryBuilder.from(StudyCourse.class);
+				if (StringUtils.isEmpty(courseId)){
+				 	return;
+				}
+				builder1.addFilter(FieldFilters.eq("courseId", courseId));
+				List<StudyCourse> list2 = scDao.findList(builder1.builder());
+				log.info("------------StudyCourse list2.size = " + list2.size() + ",0 = " + list2.get(0));
+				for(StudyCourse item : list2){
+					log.info("-------------StudyCourse----CourseId = " + item.getCourseId() + " , StudyId = " + item.getId() + " , StudentId = " + item.getAid());
+					int totalContent = courseContentDao.getCount(item.getCourseId());
+					log.info("--------StudyCourse--准备判断进度-------totalContent = " + totalContent);
+					scDao.finishCheck1(item.getId(),item.getCourseId(),totalContent);
+					log.info("--------StudyCourse--判断进度完毕----------------------");
+				}
 			}
+
 		} catch (Exception exception) {
 			exception.printStackTrace();
 			log.info("------异常----------------------：" +exception.getMessage());
--- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java
@@ -1,5 +1,6 @@
 package com.xboe.school.study.service.impl;

+import java.time.Duration;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
@@ -9,12 +10,9 @@ import java.util.Map;

 import javax.transaction.Transactional;

-import com.xboe.module.article.entity.Article;
-import com.xboe.module.interaction.entity.Shares;
-import com.xboe.school.study.entity.StudyCourse;
-import com.xboe.system.user.entity.User;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;

 import com.xboe.common.OrderCondition;
@@ -51,7 +49,10 @@ public class StudyServiceImpl implements IStudyService{
 	
 	@Autowired
 	UserDao userDao;
-	
+	@Autowired
+	StringRedisTemplate redisTemplate;
+
+
 	@Override
 	public StudyCourseItem checkHas(String studyId,String contentId) {
 		List<StudyCourseItem> items = scItemDao.findList(FieldFilters.eq("studyId", studyId),FieldFilters.eq("contentId", contentId));
@@ -115,34 +116,74 @@ public class StudyServiceImpl implements IStudyService{
 		//增加内容的学习时长
 		if(StringUtils.isNotBlank(studyItemId)) {
 			//直接根据id更新
-//			String hql="Update StudyCourseItem set studyDuration=studyDuration+"+duration+",status=(case when status<2 then 2 else status end) where id=?1";
-//			scItemDao.update(hql,studyItemId);
 			String sql="Update boe_study_course_item set study_duration=study_duration+"+duration+",status=(case when status<2 then 2 else status end) where id=?1";
 			scItemDao.sqlUpdate(sql,studyItemId);
-			//scItemDao.updateMultiFieldById(studyItemId, UpdateBuilder.create("studyDuration", "studyDuration+"+duration,FieldUpdateType.EXPRESSION));
-			
+
 		}else {
-			//根据学习id和课程内容id更新
-//			scItemDao.update(UpdateBuilder.from(StudyCourseItem.class)
-//					.addUpdateField("studyDuration", "studyDuration+"+duration,FieldUpdateType.EXPRESSION)
-//					.addFilter(FieldFilters.eq("studyId", studyId))  
-//					.addFilter(FieldFilters.eq("contentId", courseContentId))
-//					.builder());
-//			
-//			String hql="Update StudyCourseItem set studyDuration=studyDuration+"+duration+",status=(case when status<2 then 2 else status end) where studyId=?1 and contentId=?2";
-//			scItemDao.update(hql,studyId,courseContentId);
 			String sql="Update boe_study_course_item set study_duration=study_duration+"+duration+",status=(case when status<2 then 2 else status end) where study_id=?1 and content_id=?2";
 			scItemDao.sqlUpdate(sql,studyId,courseContentId);
 		}
 		
-		//追加课程的学习时长
-		//scDao.updateMultiFieldById(studyId, UpdateBuilder.create("totalDuration", "totalDuration+"+duration,FieldUpdateType.EXPRESSION));
-		
 		String sql="Update boe_study_course set total_duration=total_duration+"+duration+",status=(case when status<2 then 2 else status end),progress=(case when progress=0 then 1 else progress end),last_time = '"+LocalDateTime.now()+"' where id=?1";
 		scDao.sqlUpdate(sql,studyId);
-		
 	}

+	@Override
+	@Transactional
+	public void newAppendStudyDuration(String studyId,String studyItemId,String courseContentId, int duration,LocalDateTime timestamp) {
+
+		//增加内容的学习时长
+		if(StringUtils.isNotBlank(studyItemId)) {
+			//直接根据id更新
+			String sql="Update boe_study_course_item set study_duration=study_duration+"+duration+",status=(case when status<2 then 2 else status end) where id=?1";
+			scItemDao.sqlUpdate(sql,studyItemId);
+
+		}else {
+			String sql="Update boe_study_course_item set study_duration=study_duration+"+duration+",status=(case when status<2 then 2 else status end) where study_id=?1 and content_id=?2";
+			scItemDao.sqlUpdate(sql,studyId,courseContentId);
+		}
+
+		String sql="Update boe_study_course set total_duration=total_duration+"+duration+",status=(case when status<2 then 2 else status end),progress=(case when progress=0 then 1 else progress end),last_time = '"+timestamp+"' where id=?1";
+		scDao.sqlUpdate(sql,studyId);
+	}
+
+	// 更新 前端传输已学习时长
+	@Override
+	public void updateStudyDuration(String studyId,String studyItemId,String courseContentId, Integer videoTime,String courseId) {
+
+		LocalDateTime now = LocalDateTime.now();
+		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss");
+
+		String key = "studyId:" + studyId + ":courseId:" + courseId + ":courseContentId:" + courseContentId + ":studyItemId:" + studyItemId;
+		String currentValue = redisTemplate.opsForValue().get(key);
+		Integer lastDuration = 0;
+		Integer oldVideoTime = 0;
+		Integer sum = 10; // 原appendtime改为固定10秒调用一次接口
+		if (currentValue != null) {
+			String[] partValues = currentValue.split("&");
+			oldVideoTime = Integer.parseInt(partValues[0]);
+			lastDuration = Integer.parseInt(partValues[1]);
+			sum += lastDuration;
+			if(oldVideoTime > videoTime){
+				videoTime = oldVideoTime;// 取最大值最终入库
+			}
+		};
+
+		String value = videoTime + "&" + sum + "&" + now.format(formatter); // study_video_time & appendtime & time
+		log.info("-study-video-time-----value = " + value);
+
+		// 20250303 优化 多次更新改一次更新
+		// 更新Redis中的最后活跃时间（带30秒过期）
+		redisTemplate.opsForValue().set(
+				key,
+				value,
+				Duration.ofSeconds(2592000)
+		);
+		log.info("- 合并 updateStudyDuration -redis保存---value = " + value);
+//		Duration.ofDays(30)  也就是 2592000秒
+	}
+
+
 	@Override
 	@Transactional
 	public void appendStudyDuration(StudyTime st) {
@@ -165,7 +206,21 @@ public class StudyServiceImpl implements IStudyService{

 	@Override	
 	public List<StudyCourseItem> findByStudyId(String studyId) {
-		return scItemDao.findList(OrderCondition.desc("lastTime"),FieldFilters.eq("studyId", studyId));
+		List<StudyCourseItem> list = scItemDao.findList(OrderCondition.desc("lastTime"),FieldFilters.eq("studyId", studyId));
+		for (StudyCourseItem item : list){
+			log.info("-- studyIndex -查询上次学习的是什么资源。mysql查询---------------- item = " + item);
+			String redisKey = "studyId:" + studyId + ":courseId:" + item.getCourseId() + ":courseContentId:" + item.getContentId() + ":studyItemId:" + item.getId();
+			log.info("-- studyIndex -查询上次学习的是什么资源。查询用户的学习情况---------------- redisKey = " + redisKey);
+			String redisValue = redisTemplate.opsForValue().get(redisKey);
+			log.info("-- studyIndex -查询上次学习的是什么资源。查询用户的学习情况---------------- redisValue = " + redisValue);
+			if (redisValue != null) {
+				String[] values = redisValue.split("&");
+				int duration = Integer.parseInt(values[0]);
+				item.setLastStudyTime(duration);
+				log.info("-- studyIndex -----set 结果---------------- LastStudyTime = " + item.getLastStudyTime());
+			}
+		}
+		return list;
 	}

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

 	// 更新 前端传输已学习时长
 	@Override
-	@Transactional
 	public void updateLastTime(String studyContentId, int lastStudyTime,String aid) {
+		LocalDateTime now = LocalDateTime.now();
+		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss");
+		String value = lastStudyTime + "&" + now.format(formatter); // 使用ISO8601时间格式
+		log.info("-study-video-time-----value = " + value);
+		// 20250303 优化 多次更新改一次更新
+		// 更新Redis中的最后活跃时间（带30秒过期）
+		redisTemplate.opsForValue().set(
+				"studyContentId:" + studyContentId + ":last_active",
+				value,
+				Duration.ofSeconds(2592000)
+		);
+		log.info("-study-video-time-redis保存---value = " + value);
+//		Duration.ofDays(30)  也就是 2592000秒
+	}
+
+	@Override
+	@Transactional
+	public void updateStudyCourseItemLastTime(String studyContentId, int lastStudyTime,LocalDateTime timestamp) {
+		log.info("-study-video-time-定时---studyContentId = " + studyContentId + ",lastStudyTime = " + lastStudyTime + ", timestamp = " + timestamp);
 		// 更新最后的学习时间点
 		LocalDateTime now=LocalDateTime.now();
 		UpdateBuilder update=UpdateBuilder.from(StudyCourseItem.class);
@@ -333,11 +410,12 @@ public class StudyServiceImpl implements IStudyService{
 		//只记录时间长的时候的处理
 		update.addFilter(FieldFilters.lt("lastStudyTime", lastStudyTime));
 		update.addUpdateField("lastStudyTime", lastStudyTime);
-		update.addUpdateField("lastTime", now);
+		update.addUpdateField("lastTime", timestamp==null ? now : timestamp);
 		scItemDao.update(update.builder());
-		//增加用户的学习时长,在api中调用
+		log.info("-study-video-time-mysql保存---studyContentId = " + studyContentId);
 	}

+
 	@Override
 	public Map<String,Object> getLast(String aid) {
 		//按lastTime排序，第一条,只是课件内容
--- a/servers/boe-server-all/src/main/java/com/xboe/school/vo/StudyTimeVo.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/vo/StudyTimeVo.java
@@ -0,0 +1,19 @@
+package com.xboe.school.vo;
+
+import com.xboe.school.study.entity.StudyTime;
+import lombok.Data;
+
+/** appendtime 于 study-video-time 合并
+ *  appendtime 参数 StudyTime
+ *  study-video-time 参数 是 StudyTimeVo
+ */
+@Data
+public class StudyTimeVo extends StudyTime {
+
+    private String itemId;
+    private Integer videoTime;
+//    private String contentId; // 已继承
+//    private String courseId; // 已继承
+    private Float progressVideo;
+    private Integer type; // 0 study-video-time ,  1 appendtime
+}
--- a/servers/boe-server-all/src/main/resources/application-dev.yml
+++ b/servers/boe-server-all/src/main/resources/application-dev.yml
@@ -1,159 +1,105 @@
+boe:
+  domain: http://192.168.0.253
 spring:
-  # application.yml
  servlet:
    multipart:
-      max-file-size: 500MB
-      max-request-size: 500MB
-  redis:
-    database: 1
-    host: 192.168.0.101
-    password: boe@123
-    port: 6379
-    lettuce:
-      pool:
-        max-active: 8
-        min-idle: 0
-        max-idle: 30
-        max-wait: 10000ms
-        shutdown-timeout: 100ms
-  jpa:
-    database: MYSQL
-    properties:
-      hibernate:
-        naming_strategy: org.hibernate.cfg.EJB3NamingStrategy
-        dialect: org.hibernate.dialect.MySQL5InnoDBDialect
-        current_session_context_class: org.springframework.orm.hibernate5.SpringSessionContext
-    show-sql: true
-    hibernate:
-      ddl-auto: update
-  datasource:
-    driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.0.101:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
-    username: root
-    password: boe#1234A
+      max-file-size: 1000MB
+      max-request-size: 1000MB
  web:
    resources:
-      static-locations: file:E:/Projects/BOE/10/static
-server:
-  port: 9090
-  servlet:
-    multipart:
-      max-file-size: 500MB
-      max-request-size: 500MB
-    session:
-      timeout: 30m
-    encoding:
-      charset: UTF-8
-      enabled: true
-      force: true
-  tomcat:
-    uri-encoding: UTF-8
-    servlet:
-    multipart:
-      maxFileSize: 1024MB
-      maxRequestSize: 1024MB
-  mvc:
-    static-path-pattern: /cdn/**
-
-#logging.level.org.hibernate.SQL=DEBUG
-#logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
-#logging.config=classpath:log/logback-@profileActive@.xml
-
-# logging:
-#   config: classpath:log/logback-${spring.profiles.active}.xml
-#   level:
-#     org:
-#       hibernate:
-#         SQL: DEBUG
-#         type:
-#           descriptor:
-#             sql:
-#               BasicBinder: TRACE
-
-xcaching:
-  specs:
-    favorites:
-      timeout: 10s
-    praises:
-      timeout: 10s
-    shares:
-      timeout: 10s
-
+      static-locations: file:E:/Projects/BOE/java/static
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 192.168.0.253:8848
+      config:
+        server-addr: 192.168.0.253:8848
+  redis:
+    database: 1
+    host: 192.168.0.253
+    password: boe@123
+    port: 6379
+  jpa:
+    hibernate:
+      ddl-auto: none
+  datasource:
+    driverClassName: com.mysql.jdbc.Driver
+    url: jdbc:mysql://192.168.0.253:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+    username: root
+    password: boe#1234A
+    type: com.zaxxer.hikari.HikariDataSource
+    hikari:
+      auto-commit: true
+      minimum-idle: 5
+      idle-timeout: 60000
+      connection-timeout: 30000
+      max-lifetime: 1800000
+      maximum-pool-size: 20
+logging:
+  level:
+    org:
+      hibernate:
+        SQL: ERROR
+  config: classpath:log/logback-@profileActive@.xml
 xboe:
  api:
    cross_filter: true
-  local:
-    dev: true
  upload:
    file:
-      temp_path: D:/Projects/BOE/10/static/temp
+      temp_path: /tmp
      save_path: /home/www/elearning/upload
-      http_path: http://127.0.0.1/upload
+      http_path: http://192.168.0.253/upload
  externalinterface:
    url:
-      system: http://localhost:9091
+      system: http://127.0.0.1:9091
  old:
    base:
-      url: http://192.168.0.101
-  server:
-    userbasic:
-      url: http://192.168.0.101/userbasic
+      url: http://192.168.0.253
  stat:
    base:
      url: http://127.0.0.1:9080
+  server:
+    userbasic:
+      url: http://192.168.0.253/userbasic
  elasticsearch:
    server:
-      ip: 192.168.0.101
+      ip: 192.168.0.253
      port: 9200
      user:
      password:
  email:
-    url: http://192.168.0.101/api/b1/email/send
+    url: http://192.168.0.253/api/b1/email/send
    from: boeu_learning@boe.com.cn
    user:
    security:
-
-jasypt:
-  encryptor:
-    algorithm: PBEWithMD5AndDES
-    iv-generator-classname: org.jasypt.iv.NoIvGenerator
-
-boe:
-  domain: http://127.0.0.1
-
-ok:
-  http:
-    connect-timeout: 30
-    read-timeout: 30
-    write-timeout: 30
-    max-idle-connections: 200
-    keep-alive-duration: 300
-
-
-
-orgTree:
-  orgTreeList: ${boe.domain}/userbasic/org/list
-  orgChildTreeList: ${boe.domain}/userbasic/org/childOrgs
-
-userBasic:
-  searchUserList: ${boe.domain}/userbasic/user/list
-  getUserBasicInfo: ${boe.domain}/userbasic/user/getUserBasicInfo
-  getTeacherIds: ${boe.domain}/userbasic/user/getTeacherInfo
-
-audience:
-  usersByAudienceList: ${boe.domain}/userbasic/audience/memberList
-  getOrgUsers: ${boe.domain}/userbasic/user/getOrgUsers
-
-statApi:
-  userdynamicList: ${boe.domain}/statApi/xboe/m/stat/userdynamic/list
-
-infrasApi:
-  dict: ${boe.domain}/infrasApi/dict/list
-
-manageApi:
-  stu:
-    offcourse: ${boe.domain}/manageApi/stu/offcourse/getOffCourseId
-  editExam: ${boe.domain}/manageApi/admin/project/editExam
-  getStudyStatus: ${boe.domain}/manageApi/stu/project/completeStatus
-coursesuilt:
-  getStudyStatus: ${boe.domain}/manageApi/stu/project/completeStatus
+  jasypt:
+    encryptor:
+      algorithm: PBEWithMD5AndDES
+      iv-generator-classname: org.jasypt.iv.NoIvGenerator
+  image:
+    course:
+      default: http://192.168.0.253/pc/images/bgimg/course.png
+xxl:
+  job:
+    accessToken: 65ddc683-22f5-83b4-de3a-3c97a0a29af0
+    admin:
+      addresses: http://192.168.0.253/jobAdmin
+    executor:
+      appname: java-servers-job-api
+      port: 9995
+      address:
+      ip:
+      logpath: /var/log/xxl-job/dw/
+      logretentiondays: 30
+aop-log-record:
+  #是否开启日志记录
+  enabled: true
+  #不进行拦截的包或者类
+  excludeClassNames:
+  activemq:
+    broker-url: tcp://192.168.0.253:61616
+    user: admin
+    password: admin
+  elasticsearch:
+    host: 192.168.0.253
+    port: 9200
--- a/servers/boe-server-all/src/main/resources/application-pre.yml
+++ b/servers/boe-server-all/src/main/resources/application-pre.yml
@@ -108,7 +108,9 @@ xboe:
    from: boeu_learning@boe.com.cn
    user:
    security:
-
+  image:
+    course:
+      default: http://10.251.132.75/pc/images/bgimg/course.png
 jasypt:
  encryptor:
    algorithm: PBEWithMD5AndDES
--- a/servers/boe-server-all/src/main/resources/application-prod.yml
+++ b/servers/boe-server-all/src/main/resources/application-prod.yml
@@ -74,6 +74,9 @@ xboe:
    encryptor:
      algorithm: PBEWithMD5AndDES
      iv-generator-classname: org.jasypt.iv.NoIvGenerator
+  image:
+    course:
+      default: https://u.boe.com/pc/images/bgimg/course.png
 xxl:
  job:
    accessToken: 65ddc683-22f5-83b4-de3a-3c97a0a29af0
--- a/servers/boe-server-all/src/main/resources/application-test.yml
+++ b/servers/boe-server-all/src/main/resources/application-test.yml
@@ -84,7 +84,7 @@ xboe:
    file:
      temp_path: /tmp
      save_path: /home/www/elearning/upload
-      http_path: http://10.251.186.27/upload
+      http_path: https://u-pre.boe.com/upload
  externalinterface:
    url:
      system: http://localhost:9091
@@ -108,7 +108,9 @@ xboe:
    from: boeu_learning@boe.com.cn
    user:
    security:
-
+  image:
+    course:
+      default: https://u-pre.boe.com/pc/images/bgimg/course.png
 jasypt:
  encryptor:
    algorithm: PBEWithMD5AndDES
@@ -117,6 +119,9 @@ jasypt:
 boe:
  domain: http://10.251.186.27

+kjb:
+  aicoreUrl: http://10.251.186.27:8088
+
 ok:
  http:
    connect-timeout: 30
--- a/servers/boe-server-all/src/main/resources/application.yml
+++ b/servers/boe-server-all/src/main/resources/application.yml
@@ -73,4 +73,5 @@ coursesuilt:
  updateOrSaveCourse: ${boe.domain}/manageApi/admin/teacherRecord/updateOrSaveCourse
  syncCourseStudent: ${boe.domain}/manageApi/admin/teacherRecord/syncCourseStudent
  syncOnLineScore: ${boe.domain}/manageApi/admin/teacherRecord/syncOnLineScore
-  updateOnLineStatua: ${boe.domain}/manageApi/admin/teacherRecord/updateOnLineStatua
+  updateOnLineStatua: ${boe.domain}/manageApi/admin/teacherRecord/updateOnLineStatua
+  delOnLineById: ${boe.domain}/manageApi/admin/teacherRecord/delOnLineById
--- a/servers/boe-server-basic/src/main/resources/application-dev.yml
+++ b/servers/boe-server-basic/src/main/resources/application-dev.yml
@@ -1,13 +1,13 @@
-# application-dev.yml
+# application-pro.yml
 spring:
  redis:
-    database: 2
-    port: 6379
-    host: 192.168.0.101
+    database: 1
+    host: 192.168.0.253
    password: boe@123
+    port: 6379
  jpa:
    hibernate:
-      ddl-auto: none
+      ddl-auto: update
    open-in-view: false
    properties:
      hibernate:
@@ -16,41 +16,46 @@ spring:
    driverClassName: com.mysql.jdbc.Driver
    db1:
      driverClassName: com.mysql.jdbc.Driver
-      jdbc-url: jdbc:mysql://192.168.0.101:3306/boe_basic?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+      jdbc-url: jdbc:mysql://192.168.0.253:3306/boe_basic?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
      username: root
      password: boe#1234A
    db2:
      driverClassName: com.mysql.jdbc.Driver
-      jdbc-url: jdbc:mysql://192.168.0.101:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+      jdbc-url: jdbc:mysql://192.168.0.253:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
      username: root
      password: boe#1234A
-    web:
-      resources:
-        static-locations: file:E:/Projects/BOE/java/static
+
+  web:
+    resources:
+      static-locations: file:E:/Projects/BOE/java/static

 logging:
  level:
    org:
      hibernate:
-        SQL: DEBUG
-        type:
-          descriptor:
-            sql:
-              BasicBinder: TRACE
+        SQL: ERROR
+        # type:
+        #   descriptor:
+        #     sql:
+        #       BasicBinder: TRACE
  config: classpath:log/logback-dev.xml

+
+
 xboe:
+  api:
+    cross_filter: true
  upload:
    file:
-      temp_path: E:/Projects/BOE/java/static/temp
-      save_path: E:/Projects/BOE/java/static/upload
-      http_path: http://localhost:9090/upload
+      temp_path: /tmp
+      save_path: /home/www/elearning/upload
+      http_path: http://192.168.0.253/upload
  inner:
    data:
      sync:
-        baseurl: http://localhost:9090
+        baseurl: http://127.0.0.1:9090

 jasypt:
  encryptor:
    algorithm: PBEWithMD5AndDES
-    iv-generator-classname: org.jasypt.iv.NoIvGenerator
+    iv-generator-classname: org.jasypt.iv.NoIvGenerator
Author	SHA1	Message	Date
huangrun	80b444c188	kjb接口添加配置	2025-11-21 14:27:21 +08:00
huangrun	b0a0725373	管理端端添加课程AI设置信息	2025-11-21 11:27:43 +08:00
huangrun	59e42cda4f	管理端端添加课程AI设置信息	2025-11-21 10:34:49 +08:00
huangrun	ec6d9100c2	学员端添加课程摘要信息	2025-11-20 16:04:46 +08:00
huangrun	562a4cc862	学员端添加课程摘要信息	2025-11-20 15:13:02 +08:00
huangrun	ae11017d67	学员端添加课程摘要信息	2025-11-20 14:43:11 +08:00
huangrun	fd473445de	学员端添加课程摘要信息	2025-11-20 14:38:56 +08:00
huangrun	bfdbd4d38e	学员端添加课程摘要信息	2025-11-20 14:36:45 +08:00
huangrun	640786391d	学员端添加课程摘要信息	2025-11-20 13:51:02 +08:00
huangrun	71b00372f6	参数添加字段	2025-11-19 20:07:00 +08:00
huangrun	2e4b04d1d1	AI字幕数据查询	2025-11-19 19:33:21 +08:00
huangrun	bffb85848f	AI字幕数据查询	2025-11-19 18:07:46 +08:00
huangrun	a9e34e42b9	AI字幕数据查询	2025-11-19 17:49:38 +08:00
huangrun	84bd63ec0e	AI字幕数据查询	2025-11-19 17:07:58 +08:00
huangrun	1aba83a1b8	参数添加字段	2025-11-19 15:28:06 +08:00
huangrun	2b1211c83d	参数添加字段	2025-11-19 14:34:30 +08:00
huangrun	fe3e8df37c	请求头指定编码	2025-11-19 12:43:52 +08:00
huangrun	8d9b360654	修改远程接口地址	2025-11-19 11:38:35 +08:00
huangrun	3379acdd1e	实体字段添加非表字段注解	2025-11-19 10:41:36 +08:00
huangrun	9a3b394e03	添加接口日志打印	2025-11-19 09:57:37 +08:00
huangrun	7beb046d6d	添加接口调用	2025-11-18 19:20:38 +08:00
joshen	07b501742f	Merge remote-tracking branch 'nyx/20251103-1282-fix-gj' into release-20250328-master # Conflicts: # servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFileApi.java	2025-11-04 16:58:24 +08:00
Caojr	748f7c5913	szx-1282 修改失败提示语	2025-11-04 14:09:26 +08:00
Caojr	5954d54e44	szx-1282 视频解码失败返回	2025-11-04 13:33:12 +08:00
Caojr	4ede914452	szx-1279 增加监控表	2025-11-03 17:53:26 +08:00
Caojr	00527271b6	szx-1283 撤回修改	2025-11-03 16:07:12 +08:00
Caojr	308a16f4b4	szx-1283 修改ffmpeg路径	2025-11-03 15:39:03 +08:00
Caojr	302a673515	szx-1283 修改ffmpeg路径	2025-11-03 15:13:21 +08:00
Caojr	49b69db0bf	szx-1283 修改ffmpeg路径	2025-11-03 15:06:27 +08:00
Caojr	8a0b05079a	szx-1283 修改依赖	2025-11-03 11:51:31 +08:00
Caojr	eaab48607d	szx-1283 修改依赖	2025-11-03 11:45:32 +08:00
Caojr	309599f43f	增加异常日志	2025-11-03 10:57:42 +08:00
Caojr	20e3b001d5	szx-1277 增加boe_course_teacher删除记录逻辑	2025-10-30 14:37:40 +08:00
Caojr	a37f90aeaa	szx-1277 增加参数	2025-10-30 12:08:59 +08:00
Caojr	e767345c1e	szx-1277 hrbp审核接口修改course服务调用接	2025-10-30 11:45:21 +08:00
Caojr	6fe6f7c6e5	临时注释多余的completeStatus接口调用	2025-10-10 10:15:11 +08:00
670788339	249a8d81a6	JsonFormat	2025-08-28 10:32:53 +08:00
670788339	7abb00772b	显示考试成绩	2025-08-26 14:39:37 +08:00
670788339	04e11f2e71	还原	2025-08-22 14:18:35 +08:00
670788339	2feb149e92	在线课程管理不显示考试成绩	2025-08-22 14:11:34 +08:00
670788339	16fa9cb028	在线课程管理不显示考试成绩	2025-08-22 10:36:14 +08:00
670788339	cac466ba73	修复无考试在线进度	2025-08-19 16:15:34 +08:00
670788339	30d2a0cde2	Merge branch 'master-0720-lyc' into release-20250328-master	2025-07-23 17:04:29 +08:00
670788339	541e542d9b	仅内网只可看调整	2025-07-23 16:08:59 +08:00
670788339	aa04e16209	仅内网只可看调整	2025-07-23 16:03:03 +08:00
670788339	57e22492e5	仅内网只可PC看	2025-07-23 15:42:47 +08:00
670788339	1917647a99	仅内网只可PC看	2025-07-21 17:43:18 +08:00
670788339	f5f7ab3bc5	字典调整	2025-07-21 13:27:35 +08:00
670788339	413a2ebc33	字典调整	2025-07-21 09:57:33 +08:00
670788339	22db916abf	仅内网可见-学员端	2025-07-21 09:37:25 +08:00
670788339	8ce284ea7e	仅内网可见-学员端	2025-07-21 09:27:12 +08:00
670788339	c485757061	仅内网可见-学员端	2025-07-21 09:21:58 +08:00
670788339	9a00b41cde	仅内网可见-学员端	2025-07-21 09:17:13 +08:00
670788339	59beaa5b74	仅内网可见-学员端	2025-07-21 09:07:58 +08:00
670788339	9b9e97a8d4	仅内网可见-学员端	2025-07-21 08:44:16 +08:00
670788339	200ec38038	仅内网可见	2025-07-20 17:13:29 +08:00
670788339	7613f30ca7	仅内网可见	2025-07-20 15:22:36 +08:00
670788339	248e0799bd	仅内网可见	2025-07-20 13:48:21 +08:00
joshen	618b0b3f62	Merge remote-tracking branch 'yx/master-20250414-lyc' into release-20250328-master	2025-05-13 15:37:05 +08:00
670788339	5836b147c4	在线删除同步授课记录	2025-04-29 15:58:37 +08:00
670788339	fb1d11ebab	取消lastStudyTime更新条件	2025-04-21 15:18:48 +08:00
670788339	add1d6abb2	取消lastStudyTime更新条件	2025-04-21 13:59:06 +08:00
670788339	eafe17b99a	studyindex 日志	2025-04-21 13:46:55 +08:00
670788339	d1b6573c25	studyindex调试	2025-04-21 11:40:22 +08:00
670788339	1039f80aec	调试	2025-04-18 11:15:36 +08:00
670788339	efc0605115	调试	2025-04-18 11:05:18 +08:00
670788339	d938425151	日志	2025-04-18 10:54:36 +08:00
670788339	00510562ca	日志	2025-04-18 10:40:50 +08:00
670788339	3e70e71e5a	合并影响的其他接口	2025-04-18 10:19:06 +08:00
670788339	24011a4470	合并影响的其他接口	2025-04-18 10:06:53 +08:00
670788339	8948165296	合并影响的其他接口	2025-04-18 09:49:59 +08:00
670788339	076b1828ad	合并	2025-04-18 09:16:47 +08:00
670788339	95312696f6	studyindex缓存获取duration	2025-04-17 13:36:30 +08:00
670788339	1aca002b8f	合并测试	2025-04-14 16:10:18 +08:00
670788339	50bdc39ce8	appendtime 于 study-video-time 合并	2025-04-14 14:08:01 +08:00
joshen	4fff780970	Merge branch '250408-bugfix-shl' into release-20250328-master # Conflicts: # servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseService.java	2025-04-09 18:16:07 +08:00
sunhonglai	47813ea565	增加面授课删除	2025-04-08 17:43:37 +08:00
670788339	5aa62de3cb	@Transient	2025-04-03 09:09:58 +08:00
joshen	a309bc1ddf	Merge branch '250331-bugfix-shl-newmaster' into release-20250328-master	2025-04-02 16:57:24 +08:00
sunhonglai	6af4cdfc75	修改测试环境配置	2025-04-01 13:52:20 +08:00
sunhonglai	2a2759768b	修改个人中心我的报名图片不显示问题	2025-04-01 12:42:32 +08:00
sunhonglai	74bcec72bc	修改学习时长取值	2025-04-01 09:59:59 +08:00
sunhonglai	b8c171bf86	Merge branch '250331-bugfix-shl-newmaster' into 250331-bugfix-shl # Conflicts: # servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java	2025-04-01 09:51:14 +08:00
sunhonglai	175e7f6c28	查询课程和修改课程学习上报进度，增加视频播放进度的处理	2025-04-01 08:32:41 +08:00
sunhonglai	5705bb8529	查询课程和修改课程学习上报进度，增加视频播放进度的处理	2025-03-31 13:14:14 +08:00
sunhonglai	87e5dd81f8	查询课程和修改课程学习上报进度，增加视频播放进度的处理	2025-03-31 11:27:13 +08:00
joshen	9924769bc8	Merge remote-tracking branch 'yx/master-20250227-lyc' into release-20250328-master	2025-03-29 12:38:10 +08:00
670788339	d4964ca7f1	日志	2025-03-29 12:22:11 +08:00
670788339	efdfa6f00c	study-video-time 最后修改时间调整	2025-03-29 10:51:08 +08:00
joshen	ceb30f7f1d	Merge remote-tracking branch 'yx/master-20250227-lyc' into release-20250328-master # Conflicts: # servers/boe-server-all/src/main/java/com/xboe/module/course/entity/CourseTeacher.java # servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java	2025-03-28 15:32:27 +08:00
joshen	60d891edcf	Merge remote-tracking branch 'yx/250324-casebugfix-zsh'	2025-03-26 16:54:25 +08:00
emcchui	b9f00f2602	SZX-927：学员端-个人设置-手机号未同步到	2025-03-25 08:47:19 +08:00
emcchui	77884d3e7e	SZX-927：学员端-个人设置-手机号未同步到	2025-03-25 08:39:48 +08:00
emcchui	3a9a8d86af	SZX-927：学员端-个人设置-手机号未同步到	2025-03-24 18:10:41 +08:00
emcchui	3a139925c9	SZX-927：学员端-个人设置-手机号未同步到	2025-03-24 17:41:22 +08:00
emcchui	fdc0c7959e	SZX-927：学员端-个人设置-手机号未同步到	2025-03-24 16:27:50 +08:00
sunhonglai	a1352ec813	修改后端返回分页结果	2025-03-24 09:23:06 +08:00
670788339	c9db78ea94	在线课-外部讲师补充	2025-03-21 09:42:02 +08:00
670788339	f33de0c326	在线课-外部讲师	2025-03-20 20:57:49 +08:00
670788339	4be72391ad	在线课-外部讲师报错添加讲师类型	2025-03-20 17:37:04 +08:00
670788339	500fb090fb	在线课-外部讲师报错添加讲师类型	2025-03-19 13:17:06 +08:00
670788339	ee95435d01	在线课-外部讲师报错添加供应商	2025-03-19 13:08:54 +08:00
670788339	76f0d1933a	在线课-外部讲师报错	2025-03-19 11:56:48 +08:00
670788339	3d9b26982c	在线课-外部讲师报错	2025-03-18 11:49:53 +08:00
emcchui	a65fa797cc	dev	2025-03-16 13:29:06 +08:00
emcchui	feba3237ab	dev	2025-03-16 13:27:05 +08:00
670788339	58d6f49006	考试提交调用加catch	2025-03-13 10:03:21 +08:00
670788339	c8ffdd561f	考试提交调用course项目同步	2025-03-10 16:03:10 +08:00
670788339	98611edcaa	考试提交调用course项目同步	2025-03-10 16:02:19 +08:00
670788339	8aea21bde7	参数转换	2025-03-10 14:32:21 +08:00
670788339	a79f6b43b2	日志	2025-03-10 14:22:03 +08:00
670788339	81ea19f0f3	study-video-time redis优化	2025-03-03 17:49:49 +08:00