修改注解

2025-12-07 01:46:47 +08:00 · 2025-04-07 15:09:04 +08:00
25 changed files with 103 additions and 788 deletions
--- 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
@@ -45,7 +45,10 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
 import java.util.concurrent.ForkJoinPool;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
@@ -95,8 +98,7 @@ public class ThirdApi {
    private String syncOnLineScore;
    @Value("${coursesuilt.updateOnLineStatua}")
    private String updateOnLineStatua;
-    @Value("${coursesuilt.delOnLineById}")
-    private String delOnLineById;
+

    //获取例外人员的id
    public List<String> getUserId() {
@@ -396,28 +398,4 @@ 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);
-    }
-
-    //获取字典信息
-    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/module/course/api/CourseAuditApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseAuditApi.java
@@ -358,10 +358,8 @@ public class CourseAuditApi  extends ApiBaseController{
 				//修改在线课开课状态=已开课
 				String token = request.getHeader("Xboe-Access-Token");
 				CourseParam param = new CourseParam();
-				param.setId(c.getId());
-                param.setOrgId(c.getOrgId());
-                param.setOrgName(c.getOrgName());
-				thirdApi.updateOrSaveCourse(param,token);
+				param.setId(courseId);
+				thirdApi.updateOnLineStatua(param,token);
 			}
 			return success(true);
 		} catch (Exception e) {
--- 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
@@ -278,7 +278,7 @@ public class CourseFileApi extends ApiBaseController {
                    }
                }
            } catch (Exception e) {
-                log.error("读取视频时长错误", e);
+                log.error("读取视频时长错误");
 //                e.printStackTrace();
            }
        }
--- 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,14 +2,11 @@

 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;
@@ -172,48 +169,19 @@ 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
@@ -918,7 +886,7 @@ public class CourseManageApi extends ApiBaseController{
 	 * @return
 	 */
 	@PostMapping("/delete")
-	public JsonResponse<Boolean> delete(String id,Boolean erasable,String title,String remark, HttpServletRequest request){
+	public JsonResponse<Boolean> delete(String id,Boolean erasable,String title,String remark){
 		if(StringUtils.isBlank(id)){
 			return badRequest("参数错误");
 		}
@@ -933,11 +901,6 @@ 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/dao/CourseTeacherDeletedRecordDao.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/dao/CourseTeacherDeletedRecordDao.java
@@ -1,9 +0,0 @@
-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
@@ -1,20 +0,0 @@
-package com.xboe.module.course.dao;
-
-import com.xboe.core.orm.BaseDao;
-import com.xboe.module.course.entity.ModifyLog;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public class ModifyLogDao extends BaseDao<ModifyLog> {
-
-    public void insert(String requestId, String location, String body, String remark) {
-        ModifyLog entity = new ModifyLog();
-        entity.setRequestId(requestId);
-        entity.setLocation(location);
-        entity.setBody(body);
-        entity.setRemark(remark);
-
-        save(entity);
-    }
-
-}
--- 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
@@ -33,10 +33,7 @@ public class Course extends BaseEntity {
    
    /**所有的设备*/
    public static int DEVICE_ALL=3;
-
-    /**仅内网*/
-    public static int DEVICE_INTERNAL=4;
-
+    
    /**未提交，草稿*/
    public static final int STATUS_NONE=1;
    
--- 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
@@ -1,43 +0,0 @@
-package com.xboe.module.course.entity;
-
-import com.xboe.core.SysConstant;
-import com.xboe.core.orm.IdBaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import 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
@@ -1,45 +0,0 @@
-package com.xboe.module.course.entity;
-
-import com.xboe.core.SysConstant;
-import com.xboe.core.orm.IdBaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
-/**
- * 讲师删除记录表
- * 为了监控PngCode-SZX-1227问题临时创建的表
- *
- * @author guo jia
- */
-@Data
-@Entity
-@ToString(callSuper = true)
-@EqualsAndHashCode(callSuper = true)
-@Table(name = SysConstant.TABLE_PRE + "modify_log")
-public class ModifyLog extends IdBaseEntity {
-
-    /**
-     * 请求ID
-     */
-    private String requestId;
-
-    /**
-     * 位置
-     */
-    private String location;
-
-    /**
-     * 请求body
-     */
-    private String body;
-
-    /**
-     * 备注信息
-     */
-    private String remark;
-
-}
--- 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,6 +341,8 @@ 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,6 +1,5 @@
 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,21 +14,11 @@ 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.xboe.api.ThirdApi;
 import com.xboe.core.orm.*;
-import com.xboe.module.course.dao.*;
-import com.xboe.module.course.entity.*;
 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.data.redis.core.StringRedisTemplate;
@@ -45,9 +34,24 @@ 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;
@@ -111,15 +115,8 @@ public class CourseServiceImpl implements ICourseService {
    @Autowired(required = false)
    private IEventDataSender eventSender;

-    @Resource
-    RestHighLevelClient restHighLevelClient;
-
-    @Resource
-    private CourseTeacherDeletedRecordDao courseTeacherDeletedRecordDao;
-
-    @Resource
-    private ModifyLogDao modifyLogDao;

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

        }
@@ -274,13 +269,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) {
@@ -360,9 +355,8 @@ 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()){
 //			//去掉未发布的课程
@@ -419,30 +413,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());
@@ -860,14 +854,12 @@ public class CourseServiceImpl implements ICourseService {
                    log.error("未配置事件消息发送的实现");
                }
            }
-
-            // 删除ES数据
-            deletedStudyResourceBatchByCourseIdAndType(id, c.getType());
        } else {
            //彻底删除，课件设置为无课程状态
            courseDao.setDeleted(id);
        }
        //记录删除日志信息
+
    }

    @Override
@@ -914,7 +906,6 @@ public class CourseServiceImpl implements ICourseService {
            for (CourseTeacher ct : full.getTeachers()) {
                ct.setCourseId(c.getId());
                courseTeacherDao.save(ct);
-                addBoeCourseTeacherModifyLog(ct, "M1位置讲师名修改", JSONUtil.toJsonStr(ct), null);
            }
        }
        if (full.getCrowds() != null && !full.getCrowds().isEmpty()) {
@@ -997,15 +988,12 @@ 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);
            }
        }
        //先清空受众信息,受众信息如果不一样了，也要加入到日志中
@@ -1054,15 +1042,12 @@ 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);
            }
        }
        //先清空受众信息,受众信息如果不一样了，也要加入到日志中
@@ -1092,15 +1077,12 @@ 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);
            }
        }
        //先清空受众信息,受众信息如果不一样了，也要加入到日志中
@@ -1586,13 +1568,6 @@ 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) {
@@ -2004,54 +1979,5 @@ 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/popup/entity/Popup.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/popup/entity/Popup.java
@@ -1,6 +1,5 @@
 package com.xboe.module.popup.entity;

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

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


--- 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
@@ -10,14 +10,11 @@ import java.util.stream.Collectors;

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

@@ -70,61 +54,13 @@ 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
@@ -1,7 +1,5 @@
 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;
@@ -12,13 +10,10 @@ 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
@@ -31,15 +26,13 @@ public class StudyCourseTask {

    private final IStudyService studyService;
    private final StringRedisTemplate redisTemplate;
-    @Resource
-    private ThirdApi thirdApi;

    /**
     * 定时任务
     * 获取redis 中学习结束的数据更新入库
     * */
-    @XxlJob("saveStudyCourseItemLastTime2")
-    public void saveStudyCourseItemLastTime2() {
+    @XxlJob("saveStudyCourseItemLastTime")
+    public void saveStudyCourseItemLastTime() {
        // 1. 定义匹配模式（匹配所有目标key）
        final String KEY_PATTERN = "studyContentId:*:last_active";
        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss");
@@ -66,6 +59,7 @@ 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;
@@ -75,15 +69,19 @@ 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) {
@@ -104,159 +102,5 @@ 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());
-    }
-
-
-
-
-
-
-
-
-
-
-
-

 }
--- 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
@@ -134,7 +134,6 @@ public class StudyCourseItem extends IdEntity {
    /**
     * 视频播放进度
     * */
-//    @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
@@ -101,8 +101,4 @@ 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,7 +10,6 @@ import com.xboe.module.course.entity.CourseExam;
 import com.xboe.school.study.dao.StudyCourseDao;
 import com.xboe.school.study.dao.StudyCourseItemDao;
 import com.xboe.school.study.dao.StudyExamDao;
-import com.xboe.school.study.entity.StudyCourse;
 import com.xboe.school.study.entity.StudyCourseItem;
 import com.xboe.school.study.entity.StudyExam;
 import com.xboe.school.study.service.IStudyExamService;
@@ -171,32 +170,15 @@ public class StudyExamServiceImpl implements IStudyExamService{
 			}
 			builder.addGroupBy("studyId");
 			List<StudyExam> list1 = dao.findList(builder.builder());
-			if(list1 != null && list1.size() > 0){
-				log.info("----------StudyExam--QueryBuilder list1.size = " + list1.size() + ",0 = " + list1.get(0));
-				for(StudyExam item : list1){
-					log.info("--------------StudyExam---CourseId = " + item.getCourseId() + " , StudyId = " + item.getStudyId() + " , StudentId = " + item.getStudentId());
-					int totalContent = courseContentDao.getCount(item.getCourseId());
-					log.info("--------StudyExam--准备判断进度-------totalContent = " + totalContent);
-					scDao.finishCheck1(item.getStudyId(),item.getCourseId(),totalContent);
-					log.info("--------StudyExam--判断进度完毕----------------------");
-				}
-			}else{
-				QueryBuilder builder1 = QueryBuilder.from(StudyCourse.class);
-				if (StringUtils.isEmpty(courseId)){
-				 	return;
-				}
-				builder1.addFilter(FieldFilters.eq("courseId", courseId));
-				List<StudyCourse> list2 = scDao.findList(builder1.builder());
-				log.info("------------StudyCourse list2.size = " + list2.size() + ",0 = " + list2.get(0));
-				for(StudyCourse item : list2){
-					log.info("-------------StudyCourse----CourseId = " + item.getCourseId() + " , StudyId = " + item.getId() + " , StudentId = " + item.getAid());
-					int totalContent = courseContentDao.getCount(item.getCourseId());
-					log.info("--------StudyCourse--准备判断进度-------totalContent = " + totalContent);
-					scDao.finishCheck1(item.getId(),item.getCourseId(),totalContent);
-					log.info("--------StudyCourse--判断进度完毕----------------------");
-				}
-			}
+			log.info("------------QueryBuilder list1.size = " + list1.size() + ",0 = " + list1.get(0));

+			for(StudyExam item : list1){
+				log.info("-----------------CourseId = " + item.getCourseId() + " , StudyId = " + item.getStudyId() + " , StudentId = " + item.getStudentId());
+				int totalContent = courseContentDao.getCount(item.getCourseId());
+				log.info("----------准备判断进度-------totalContent = " + totalContent);
+				scDao.finishCheck1(item.getStudyId(),item.getCourseId(),totalContent);
+				log.info("----------判断进度完毕----------------------");
+			}
 		} catch (Exception exception) {
 			exception.printStackTrace();
 			log.info("------异常----------------------：" +exception.getMessage());
--- 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
@@ -116,74 +116,34 @@ 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) {
@@ -206,21 +166,7 @@ public class StudyServiceImpl implements IStudyService{

 	@Override	
 	public List<StudyCourseItem> findByStudyId(String 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;
+		return scItemDao.findList(OrderCondition.desc("lastTime"),FieldFilters.eq("studyId", studyId));
 	}

 	@Override
@@ -282,12 +228,11 @@ public class StudyServiceImpl implements IStudyService{
 				return pageList;
 			}
 		}
-
 		String sql = "select a.id, a.course_id, a.course_name, a.aname, " +
-				"IFNULL(b.finish_time, '0') as finish_time, IFNULL(b.progress, 0) as progress, IFNULL(b.status, 1) as status,b.score " +
+				"IFNULL(b.finish_time, '0') as finish_time, IFNULL(b.progress, 0) as progress, IFNULL(b.status, 1) as status " +
 				"from (select id, course_id, course_name, aname, 0, 1 from boe_study_course where course_id = '" + courseId + "' and aname like '%"+name+"%') a " +
 				"left join " +
-				"(select bsc.id, bsc.course_id, bsc.course_name, bsc.aname, item.finish_time, item.progress, item.status,MAX(item.score) score " +
+				"(select bsc.id, bsc.course_id, bsc.course_name, bsc.aname, item.finish_time, item.progress, item.status " +
 				"from boe_study_course bsc left join boe_study_course_item item on item.course_id = bsc.course_id and item.study_id = bsc.id " +
 				"where bsc.course_id = '" + courseId + "' and item.content_id = '" + contentId + "' and item.aname like '%"+name+"%' group by bsc.id) b " +
 				"on a.course_id = b.course_id and a.id = b.id " +
@@ -316,9 +261,6 @@ public class StudyServiceImpl implements IStudyService{
 			sc.setProgress(Integer.valueOf(objs[5].toString()));
 			sc.setStatus(Integer.valueOf(objs[6].toString()));
 			sc.setAname(objs[3].toString());
-			if(objs[7] != null){
-				sc.setScore(Float.valueOf(objs[7].toString()));
-			}
 			item.add(sc);
 		}
 		log.info("资源完成情况人员"+item);
@@ -415,7 +357,6 @@ public class StudyServiceImpl implements IStudyService{
 		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
@@ -1,19 +0,0 @@
-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
@@ -76,9 +76,6 @@ xboe:
    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
--- a/servers/boe-server-all/src/main/resources/application-pre.yml
+++ b/servers/boe-server-all/src/main/resources/application-pre.yml
@@ -108,9 +108,7 @@ 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,9 +74,6 @@ 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: https://u-pre.boe.com/upload
+      http_path: http://10.251.186.27/upload
  externalinterface:
    url:
      system: http://localhost:9091
@@ -108,9 +108,7 @@ 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
--- a/servers/boe-server-all/src/main/resources/application.yml
+++ b/servers/boe-server-all/src/main/resources/application.yml
@@ -73,5 +73,4 @@ 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
-  delOnLineById: ${boe.domain}/manageApi/admin/teacherRecord/delOnLineById
+  updateOnLineStatua: ${boe.domain}/manageApi/admin/teacherRecord/updateOnLineStatua