标签管理解绑标签

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

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

@@ -98,7 +98,8 @@ public class ThirdApi {
     private String syncOnLineScore;
     @Value("${coursesuilt.updateOnLineStatua}")
     private String updateOnLineStatua;
-
+    @Value("${coursesuilt.delOnLineById}")
+    private String delOnLineById;
 
     //获取例外人员的id
     public List<String> getUserId() {
@@ -398,4 +399,12 @@ public class ThirdApi {
     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);
+    }
 }

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

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

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

@@ -9,6 +9,8 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.xboe.api.ThirdApi;
 import com.xboe.module.course.dto.*;
+import com.xboe.module.course.entity.*;
+import com.xboe.module.course.service.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -28,19 +30,6 @@ import com.xboe.data.dto.UserOrgIds;
 import com.xboe.data.outside.IOutSideDataService;
 import com.xboe.data.service.IDataUserSyncService;
 import com.xboe.module.assistance.service.IEmailService;
-import com.xboe.module.course.entity.Course;
-import com.xboe.module.course.entity.CourseContent;
-import com.xboe.module.course.entity.CourseCrowd;
-import com.xboe.module.course.entity.CourseHRBPAudit;
-import com.xboe.module.course.entity.CourseSection;
-import com.xboe.module.course.entity.CourseTeacher;
-import com.xboe.module.course.entity.CourseUpdateLog;
-import com.xboe.module.course.service.ICourseContentService;
-import com.xboe.module.course.service.ICourseCrowdService;
-import com.xboe.module.course.service.ICourseHRBPAuditService;
-import com.xboe.module.course.service.ICourseSectionService;
-import com.xboe.module.course.service.ICourseService;
-import com.xboe.module.course.service.ICourseTeacherService;
 import com.xboe.module.excel.ExportsExcelSenderUtil;
 import com.xboe.standard.enums.BoedxContentType;
 import com.xboe.standard.enums.BoedxCourseType;
@@ -91,10 +80,10 @@ public class CourseManageApi extends ApiBaseController{
 	
 	@Resource
 	private ICourseHRBPAuditService hrbpAuditService;
-	
+	@Resource
+	private ICourseTagService tagService;
 	@Resource
 	IOutSideDataService outSideDataService;
-	
 	@Autowired
     IDataUserSyncService userSyncService;
 	@Resource
@@ -169,8 +158,12 @@ public class CourseManageApi extends ApiBaseController{
 		List<CourseSection> sectionlist=sectionService.getByCourseId(id);
 		List<CourseTeacher> teachers=courseService.findTeachersByCourseId(id);
 		List<CourseCrowd> crowds=courseService.findCrowdByCourseId(id);
+		if (StringUtils.isNotBlank(course.getTags())){
+			List<CourseTag> tagList = tagService.getTagsByIds(course.getTags());
+			rs.put("tagList", tagList);
+		}
+
 
-		//
 		rs.put("course",course);
 		rs.put("contents",cclist);
 		rs.put("sections",sectionlist);
@@ -886,7 +879,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 +894,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);

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

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

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

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

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

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

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

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

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

@@ -1,5 +1,6 @@
 package com.xboe.module.course.dto;
 
+import com.xboe.module.course.entity.CourseTag;
 import lombok.Data;
 
 import java.util.List;
@@ -140,4 +141,6 @@ public class CourseQueryDto {
      */
     private String userId;
 
+    private String tags;
+
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -342,4 +342,7 @@ public interface ICourseService {
 
 
     List<Course> findByIds(List<String> courseIds);
+    void deletedStudyResourceBatchByCourseIdAndType(String courseId,Integer courseType);
+
+    void getPhpCourseData();
 }

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

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

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;
@@ -15,11 +16,26 @@ import javax.annotation.Resource;
 import javax.management.Query;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
 import com.xboe.api.ThirdApi;
 import com.xboe.core.orm.*;
+import com.xboe.module.course.dto.CourseTagRelationDto;
+import com.xboe.module.course.entity.*;
+import com.xboe.module.course.service.ICourseTagService;
 import com.xboe.school.study.dao.StudyCourseDao;
 import com.xboe.school.study.entity.StudyCourse;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.http.client.HttpClient;
+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.data.redis.core.StringRedisTemplate;
@@ -47,12 +63,6 @@ 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;
@@ -92,7 +102,8 @@ public class CourseServiceImpl implements ICourseService {
 
     @Resource
     private CourseHRBPAuditDao courseHRBPAuditDao;
-
+    @Resource
+    private ICourseTagService courseTagService;
 
     @Resource
     private SysLogAuditDao logAuditDao;//审核日志记录
@@ -116,7 +127,8 @@ public class CourseServiceImpl implements ICourseService {
     @Autowired(required = false)
     private IEventDataSender eventSender;
 
-
+    @Resource
+    RestHighLevelClient restHighLevelClient;
   
     /**
      * 生成过滤条件
@@ -855,12 +867,14 @@ public class CourseServiceImpl implements ICourseService {
                     log.error("未配置事件消息发送的实现");
                 }
             }
+
+            // 删除ES数据
+            deletedStudyResourceBatchByCourseIdAndType(id,c.getType());
         } else {
             //彻底删除，课件设置为无课程状态
             courseDao.setDeleted(id);
         }
         //记录删除日志信息
-
     }
 
     @Override
@@ -967,7 +981,6 @@ public class CourseServiceImpl implements ICourseService {
 
         Course c = full.getCourse();//当前的课程信息
         Course nowCourse = courseDao.get(c.getId());//修改之前的课程信息
-
         StringBuffer stringBuffer = new StringBuffer("[");
         //追加日志内容
         appendUpdateLog(stringBuffer, nowCourse, c);
@@ -985,6 +998,21 @@ public class CourseServiceImpl implements ICourseService {
         if (c.getVisible() == null) {
             c.setVisible(true);
         }
+        if (c.getTags() != null && !c.getTags().isEmpty()){
+            CourseTagRelationDto courseTagRelationDto = new CourseTagRelationDto();
+            courseTagRelationDto.setCourseId(c.getId());
+            courseTagRelationDto.setSysType1(c.getSysType1());
+            courseTagRelationDto.setSysType2(c.getSysType2());
+            courseTagRelationDto.setSysType3(c.getSysType3());
+            String tags = c.getTags();
+            List<CourseTag> tagList = courseTagService.getTagsByIds(tags);
+            if (ObjectUtil.isNotEmpty(tagList)){
+                for (CourseTag tag : tagList) {
+                    courseTagRelationDto.setTagName(tag.getTagName());
+                    courseTagService.createTag(courseTagRelationDto);
+                }
+            }
+        }
         courseDao.update(c);
         c.setSysVersion(courseDao.getVersion(c.getId()));
         full.getCourse().setSysVersion(c.getSysVersion());
@@ -1986,6 +2014,119 @@ public class CourseServiceImpl implements ICourseService {
 
         return courseDao.findListByHql("Select new Course(id,studys,score) from Course where id in(?1)", ids);
     }
+    private class Result{
+        private Boolean success;
+        private Data data;
+        private class Data{
+            private List<Map<String,Object>> result;
 
+            public List<Map<String, Object>> getResult() {
+                return result;
+            }
 
+            public void setResult(List<Map<String, Object>> result) {
+                this.result = result;
+            }
+        }
+
+        public void setData(Data data) {
+            this.data = data;
+        }
+
+        public Boolean getSuccess() {
+            return success;
+        }
+
+        public void setSuccess(Boolean success) {
+            this.success = success;
+        }
+
+        public Data getData() {
+            return data;
+        }
+    }
+
+    @Override
+    public void getPhpCourseData() {
+        HttpRequest request = HttpUtil.createGet("https://u.boe.com/api/b1/new-employee/course-list");
+        HttpResponse response = request.execute();
+        String body = response.body();
+        Result result = JSON.parseObject(body,Result.class);
+        log.info("php课程数据获取成功");
+        List<Map<String,Object>> phpCourseDataList = result.getData().getResult();
+        for (Map<String, Object> phpCourseData : phpCourseDataList){
+            log.info("开始同步数据:"+phpCourseData.get("course_name"));
+        }
+        List<Map<String,Object>> phpStudyCourseList = null;
+        // 查询数据库中是否存在php课程数据
+        for (int i = 0; i < phpCourseDataList.size(); i++) {
+            // 查询php的课程数据在数据库中是否已经存在
+            String phpCourseName = (String) phpCourseDataList.get(i).get("course_name");
+            Boolean exist = isCourseName(phpCourseName,"");
+            if (!exist){
+                log.info(phpCourseName+"不存在,开始同步");
+                Course newCourse = new Course();
+                // 设置学习人数
+                int studys = Integer.parseInt(phpCourseDataList.get(i).get("learned_number").toString());
+                newCourse.setStudys(studys);
+                // 设置系统版本
+                int version = Integer.parseInt(phpCourseDataList.get(i).get("version").toString());
+                newCourse.setSysVersion(version);
+                // 设置电脑端还是手机端可见
+                int pcDevice = Integer.parseInt(phpCourseDataList.get(i).get("is_display_pc").toString());
+                int mobileDevice = Integer.parseInt(phpCourseDataList.get(i).get("is_display_mobile").toString());
+                if (pcDevice == 1 &&  mobileDevice == 1){
+                    newCourse.setDevice(3);
+                } else if (pcDevice == 0 && mobileDevice == 1) {
+                    newCourse.setDevice(2);
+                }else if(pcDevice == 1 && mobileDevice == 0){
+                    newCourse.setDevice(1);
+                }
+                // 判断是否按照顺序学习
+                int orderStudy = Integer.parseInt(phpCourseDataList.get(i).get("mod_type").toString());
+                newCourse.setOrderStudy(orderStudy == 1 ? true : false);
+                // 设置课程简介
+                String summary = (String) phpCourseDataList.get(i).get("course_desc_nohtml");
+                newCourse.setSummary(summary);
+                // 设置课程类型
+                int courseType = Integer.parseInt(phpCourseDataList.get(i).get("course_type").toString());
+                newCourse.setType(courseType == 0 ? 20 : 30);
+                // 设置学习时长
+                int courseTime = Integer.parseInt(phpCourseDataList.get(i).get("course_period").toString());
+                newCourse.setStudyTime(courseTime);
+                // 设置课程封面
+                newCourse.setCoverImg("https://u.boe.com/pc/images/bgimg/course.png");
+                newCourse.setName(phpCourseName);
+                newCourse.setStatus(5);
+                newCourse.setComments(0);
+                newCourse.setDeleted(false);
+                newCourse.setEnabled(true);
+                newCourse.setFavorites(0);
+                newCourse.setIsTop(false);
+                newCourse.setViews(0);
+                newCourse.setPraises(0);
+                newCourse.setTrampleCount(0);
+                newCourse.setShares(0);
+                newCourse.setScore(0f);
+
+                courseDao.save(newCourse);
+            }else {
+                log.info(phpCourseName+"存在");
+            }
+        }
+
+    }
+    @Override
+    public void deletedStudyResourceBatchByCourseIdAndType(String courseId, Integer courseType) {
+        DeleteByQueryRequest request = new DeleteByQueryRequest("new_study_resource");
+        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();
+        }
+    }
 }

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

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

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

@@ -15,6 +15,7 @@ import com.xboe.constants.CacheName;
 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;
@@ -275,19 +276,6 @@ public class StudyCourseApi extends ApiBaseController{
 						continue;
 					}
 
-					// 查询redis上面的key，并解析value获取到lastStudyTime
-					String lastActive = redisTemplate.opsForValue().get("studyContentId:" + item.getId() + ":last_active");
-					if (StringUtil.isNotBlank(lastActive)) {
-						String[] parts = lastActive.split("&");
-						if (parts.length == 2) {
-							int lastStudyTimeRedis = Integer.parseInt(parts[0]);
-							log.info("study-video-time-redis获取---lastStudyTimeRedis = " + lastStudyTimeRedis);
-							if(lastStudyTimeRedis>0){
-								item.setLastStudyTime(lastStudyTimeRedis);
-							}
-						}
-					}
-
 					BigDecimal lastStudyTime = new BigDecimal(item.getLastStudyTime());
 					BigDecimal duration = new BigDecimal(content.getDuration());
 					BigDecimal progress = lastStudyTime.divide(duration, 10, RoundingMode.HALF_UP);
@@ -656,6 +644,90 @@ public class StudyCourseApi extends ApiBaseController{
 		}
 	}
 
+	/**
+	 * 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(){

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

@@ -1,5 +1,7 @@
 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;
@@ -10,10 +12,13 @@ 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
@@ -26,13 +31,15 @@ public class StudyCourseTask {
 
     private final IStudyService studyService;
     private final StringRedisTemplate redisTemplate;
+    @Resource
+    private ThirdApi thirdApi;
 
     /**
      * 定时任务
      * 获取redis 中学习结束的数据更新入库
      * */
-    @XxlJob("saveStudyCourseItemLastTime")
+    @XxlJob("saveStudyCourseItemLastTime2")
-    public void saveStudyCourseItemLastTime() {
+    public void saveStudyCourseItemLastTime2() {
         // 1. 定义匹配模式（匹配所有目标key）
         final String KEY_PATTERN = "studyContentId:*:last_active";
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss");
@@ -59,7 +66,6 @@ public class StudyCourseTask {
                         String[] parts = redisKey.split(":");
                         if (parts.length < 2) continue;
                         String studyContentId = parts[1];
-
                         // 7. 获取存储的时间点（示例逻辑）
                         String redisValue = redisTemplate.opsForValue().get(redisKey);
                         if (redisValue == null) continue;
@@ -69,19 +75,15 @@ public class StudyCourseTask {
                         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) {
@@ -102,5 +104,159 @@ public class StudyCourseTask {
     }
 
 
+    @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());
+    }
+
+
+
+
+
+
+
+
+
+
+
+
 
 }

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

@@ -101,4 +101,8 @@ 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);
 }

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

@@ -116,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) {
@@ -166,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
@@ -357,6 +411,7 @@ public class StudyServiceImpl implements IStudyService{
 		log.info("-study-video-time-mysql保存---studyContentId = " + studyContentId);
 	}
 
+
 	@Override
 	public Map<String,Object> getLast(String aid) {
 		//按lastTime排序，第一条,只是课件内容

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
+}

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

@@ -74,3 +74,4 @@ coursesuilt:
   syncCourseStudent: ${boe.domain}/manageApi/admin/teacherRecord/syncCourseStudent
   syncOnLineScore: ${boe.domain}/manageApi/admin/teacherRecord/syncOnLineScore
   updateOnLineStatua: ${boe.domain}/manageApi/admin/teacherRecord/updateOnLineStatua
+  delOnLineById: ${boe.domain}/manageApi/admin/teacherRecord/delOnLineById