修改注解

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

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

@@ -8,9 +8,11 @@ import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.boe.feign.api.courseweb.entity.ExamTestDto;
 import com.boe.feign.api.courseweb.entity.ProjectStudyDto;
+import com.boe.feign.api.courseweb.remote.ExternalRemoteClient;
 import com.boe.feign.api.courseweb.remote.OffCourseRemoteClient;
 import com.boe.feign.api.courseweb.remote.ProjectAdminRemoteClient;
 import com.boe.feign.api.courseweb.remote.ProjectRemoteClient;
+import com.boe.feign.api.courseweb.reps.ExamStudyRecordParam;
 import com.boe.feign.api.infrastructure.entity.CommonSearchVo;
 import com.boe.feign.api.infrastructure.entity.Dict;
 import com.boe.feign.api.infrastructure.remote.DictRemoteClient;
@@ -73,6 +75,8 @@ public class ThirdApi {
 
     @Resource
     private ProjectRemoteClient projectRemoteClient;
+    @Resource
+    ExternalRemoteClient externalRemoteClient;
 
     @Resource
     private DictRemoteClient dictRemoteClient;
@@ -262,11 +266,19 @@ public class ThirdApi {
     }
 
     public List<StudyCourse> getStudyCourseList(String studyId, String courseId, String token) {
+        log.info(" 1  studyId = "+ studyId + " ,courseId = " + courseId );
+        if ( studyId == null || courseId == null ){
+            log.error(" 在线课学习记录 参数不能为空 ");
+            return new ArrayList<>();
+        }
         StudyCourseVo studyCourseVo = new StudyCourseVo();
         studyCourseVo.setStudyId(studyId);
         studyCourseVo.setCourseId(courseId);
         ProjectStudyDto projectStudyDto = new ProjectStudyDto();
-        BeanUtil.copyProperties(studyCourseVo, studyCourseVo);
+//        BeanUtil.copyProperties(studyCourseVo, studyCourseVo);
+        projectStudyDto.setStudyId(Long.parseLong(studyId));
+        projectStudyDto.setCourseId(Long.parseLong(courseId));
+        log.info(" 12 在线课学习记录 studyId = "+ projectStudyDto.getStudyId() + " ,courseId = " + projectStudyDto.getCourseId() );
         projectRemoteClient.updateStudyStatus(projectStudyDto);
         return new ArrayList<>();
     }
@@ -382,4 +394,8 @@ public class ThirdApi {
                         .body()).orElseThrow(() -> new RuntimeException("token校验失败"));
         log.info("updateOrSaveCourse = " + resp);
     }
+
+    public void syncExamStudyRecord(ExamStudyRecordParam param) {
+        externalRemoteClient.syncExamStudyRecord(param);
+    }
 }

servers/boe-server-all/src/main/java/com/xboe/data/service/impl/DataUserSyncServiceImpl.java

@@ -2,11 +2,16 @@ package com.xboe.data.service.impl;
 
 import java.time.LocalDateTime;
 
+import javax.annotation.Resource;
 import javax.transaction.Transactional;
 
 import com.boe.feign.api.serverall.entity.UserData;
+import com.xboe.constants.CacheName;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.Cache;
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.retry.annotation.Recover;
 import org.springframework.retry.annotation.Retryable;
 import org.springframework.stereotype.Service;
@@ -39,6 +44,9 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService {
     @Autowired
     TeacherDao teacherDao;
 
+    @Resource
+    private CacheManager cacheManager;
+
 
     @Override
     @Transactional
@@ -59,6 +67,8 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService {
                 a.setDeleted(user.getDeleted());
             }
             a.setLoginName(user.getCode());
+            a.setMobile(user.getMobile());
+            a.setEmail(user.getEmail());
             log.info("更新账号code");
             accountDao.update(a);
         } else {
@@ -71,14 +81,18 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService {
             a.setRegTime(LocalDateTime.now());
             a.setSysId(user.getKid());
             a.setStatus(1);
+            a.setMobile(user.getMobile());
+            a.setEmail(user.getEmail());
             accountDao.save(a);
             log.info("账号不存在，新添加账号【" + user.getId() + "】");
         }
+
         if (u != null) {
             //更新部分用户字段
             u.setDepartId(user.getDepartId());
             u.setDepartName(user.getDepartName());
             u.setName(user.getName());
+            u.setMobileNo(user.getMobile());
             //2022-12-8 去掉用户类型的更新，因为返回的数据都是学员，
             //u.setUserType(user.getUserType());
             if (user.getLearningDuration() > 0) { //不大于0才会更新
@@ -106,9 +120,17 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService {
             } else {
                 u.setShowHome(true);//band16以下，及其它无bandLevel的信息
             }
+            u.setMobileNo(user.getMobile());
             userDao.save(u);
             log.info("添加新用户");
         }
+
+        Cache cache = cacheManager.getCache(CacheName.NAME_USER);
+        if(cache != null) {
+            cache.evict(CacheName.KEY_ACCOUNT + user.getId());
+            cache.evict(CacheName.KEY_USER + user.getId());
+        }
+
         //对机构的判断，不为空时才会处理，为空时不处理
         if (StringUtils.isNotBlank(user.getDepartId())) {
             org = orgDao.get(user.getDepartId());

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

@@ -56,4 +56,5 @@ public class CourseTeacher extends IdBaseEntity {
     /**讲师类型 1 内部讲师  2外部讲师*/
     @Transient
     private Integer teacherType;
+
 }

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

@@ -448,6 +448,7 @@ public class CourseServiceImpl implements ICourseService {
         List<Course> paginate = paginate(listByFilters2, pageIndex, pageSize);
         PageList<Course> rs = new PageList<>();
         rs.setCount(listByFilters2.size());
+        rs.setPageSize(pageSize);
         rs.setList(paginate);
         return rs;
     }

servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/AloneExamServiceImpl.java

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

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

@@ -1,9 +1,14 @@
 package com.xboe.school.study.api;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.nacos.shaded.com.google.common.util.concurrent.RateLimiter;
 import com.xboe.api.ThirdApi;
 import com.xboe.constants.CacheName;
@@ -253,6 +258,49 @@ public class StudyCourseApi extends ApiBaseController{
 			rs.put("progress", sc.getProgress());
 			//查询上次学习的是什么资源。查询用户的学习情况
 			List<StudyCourseItem> items=studyService.findByStudyId(sc.getId());
+			// 和内容匹配，根据内容的视频时长，计算学习进度
+			if(CollectionUtil.isNotEmpty(items) && CollectionUtil.isNotEmpty(cclist)){
+				// 根据ID转换map
+				Map<String, CourseContent> contentMap = cclist.stream().collect(Collectors.toMap(CourseContent::getId, Function.identity()));
+				for (StudyCourseItem item : items) {
+					CourseContent content = contentMap.get(item.getContentId());
+					if(null == content){
+						continue;
+					}
+
+					if(null==item.getLastStudyTime()
+							|| item.getLastStudyTime()<=0
+							|| null==content.getDuration()
+							|| content.getDuration()<=0){
+						continue;
+					}
+
+					// 查询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);
+					if(progress.compareTo(BigDecimal.ZERO) < 0){
+						progress = BigDecimal.ZERO;
+					}else if(progress.compareTo(BigDecimal.ONE) > 0){
+						progress = BigDecimal.ONE;
+					}
+
+					item.setProgressVideo(progress);
+				}
+			}
+
 			rs.put("contentStudys",items);//学习的内容
 		}
 		
@@ -345,6 +393,8 @@ public class StudyCourseApi extends ApiBaseController{
 			}
 			//追加学习时长
 			studyService.appendStudyDuration(sci.getStudyId(),item.getId(),sci.getContentId(),sci.getDuration());
+
+			log.info(" 1 在线课学习记录 sci.getStudyId() = "+ sci.getStudyId() + " , sci.getCourseId() = " + sci.getCourseId() );
 			List<StudyCourse> allUserList = thirdApi.getStudyCourseList(sci.getStudyId() ,sci.getCourseId(), token);
 			log.info("在线课学习记录"+allUserList);
 			return success(item.getId());

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

@@ -1,18 +1,9 @@
 package com.xboe.school.study.api;
 
 import java.io.IOException;
-import java.time.LocalDateTime;
 import java.time.ZoneOffset;
-import java.util.ArrayList;
 import java.util.List;
 
-import cn.hutool.core.collection.CollectionUtil;
-import com.alibaba.fastjson2.JSON;
-import com.xboe.core.orm.FieldFilters;
-import com.xboe.core.orm.QueryBuilder;
-import com.xboe.module.course.dao.CourseDao;
-import com.xboe.module.course.dto.RankingDto;
-import com.xboe.module.course.entity.Course;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -51,9 +42,6 @@ public class StudyCourseESApi extends ApiBaseController{
 	@Autowired
 	IStudyCourseService service;
 
-	@Resource
-	private CourseDao courseDao;
-
 	@Resource
 	private PhpOnlineStudyRecordScheduledTasks phpOnlineStudyRecordScheduledTasks;
 
@@ -66,58 +54,6 @@ public class StudyCourseESApi extends ApiBaseController{
 		try {
 			dto.setAccountId(getCurrent().getAccountId());
 			PageList<CourseStudyDto> rs=search.search(page.getStartRow(),page.getPageSize(), dto);
-			List<CourseStudyDto> list = rs.getList();
-			List<String> emptyIds = new ArrayList<>();
-			log.info("test data gengxin CourseStudyDto list ==> {}", JSON.toJSONString(list));
-			if(CollectionUtil.isNotEmpty(list)){
-				log.info("test data gengxin CourseStudyDto isNotEmpty list ==> {}", JSON.toJSONString(list));
-				//todo 过滤数据
-				for(CourseStudyDto courseStudyDto : list){
-					log.info("test data gengxin CourseStudyDto isNotEmpty item ==> {}", JSON.toJSONString(courseStudyDto));
-					//在线课 录播课
-					if(courseStudyDto.getCourseType() == 20 || courseStudyDto.getCourseType() == 21){
-						if(StringUtils.isBlank(courseStudyDto.getCourseImage())){
-							emptyIds.add(courseStudyDto.getCourseId());
-						}
-					}
-				}
-				//todo 图片空返回结果
-				List<CourseStudyDto> emptyImgCourseStudyDtos = new ArrayList();
-
-				//在线课查询
-				if(CollectionUtil.isNotEmpty(emptyIds)){
-					QueryBuilder query = QueryBuilder.from(Course.class);
-					query.addFields("id","name","type","coverImg");
-					//todo 确认下 是否是这个字段
-					query.addFilter(FieldFilters.in("id",emptyIds));
-					query.addFilter(FieldFilters.eq("enabled",true));
-					query.addFilter(FieldFilters.eq("deleted",false));
-					List<Object[]> listFields = courseDao.findListFields(query.builder());
-					log.info("test data gengxin CourseStudyDto isNotEmpty listFields ==> {}", JSON.toJSONString(listFields));
-					if(CollectionUtil.isNotEmpty(listFields)){
-						for(Object[] objs : listFields) {
-							CourseStudyDto CourseStudyDtoResult=new CourseStudyDto();
-							CourseStudyDtoResult.setId((String) objs[0]);
-							CourseStudyDtoResult.setCourseName((String)objs[1]);
-							CourseStudyDtoResult.setCourseType((Integer) objs[2]);
-							CourseStudyDtoResult.setCourseImage((String)objs[3]);
-							emptyImgCourseStudyDtos.add(CourseStudyDtoResult);
-						}
-					}
-					log.info("test data gengxin CourseStudyDto isNotEmpty emptyImgCourseStudyDtos ==> {}", JSON.toJSONString(emptyImgCourseStudyDtos));
-
-					//todo 进行赋值处理 最外层
-					emptyImgCourseStudyDtos.forEach(item -> {
-						list.forEach(subjectItem -> {
-							if(item.getCourseId().equals(subjectItem.getCourseId())){
-								//赋值
-								subjectItem.setCourseImage(item.getCourseImage());
-							}
-						});
-					});
-					log.info("test data gengxin CourseStudyDto isNotEmpty result ==> {}", JSON.toJSONString(list));
-				}
-			}
 			return success(rs);
 		}catch(Exception e) {
 			log.error("查询报名学习ES失败",e);

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

@@ -0,0 +1,106 @@
+package com.xboe.school.study.api;
+
+import com.xboe.school.study.service.IStudyService;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.connection.RedisConnection;
+import org.springframework.data.redis.core.Cursor;
+import org.springframework.data.redis.core.ScanOptions;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author by lyc
+ * @date 2025/3/3
+ */
+@Component
+@Slf4j
+@RequiredArgsConstructor
+public class StudyCourseTask {
+
+    private final IStudyService studyService;
+    private final StringRedisTemplate redisTemplate;
+
+    /**
+     * 定时任务
+     * 获取redis 中学习结束的数据更新入库
+     * */
+    @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");
+        // 2. 使用SCAN安全遍历（避免阻塞）
+        ScanOptions options = ScanOptions.scanOptions()
+            .match(KEY_PATTERN)
+            .count(100) // 分页大小
+            .build();
+
+        try (RedisConnection connection = Objects.requireNonNull(redisTemplate.getConnectionFactory()).getConnection()) {
+            Cursor<byte[]> cursor = connection.scan(options);
+            // 3. 遍历处理符合条件的key
+            while (cursor.hasNext()) {
+                String redisKey = new String(cursor.next());
+                // 4. 获取剩余TTL（秒）
+                Long ttl = redisTemplate.getExpire(redisKey, TimeUnit.SECONDS);
+
+                // 5. 过滤条件：剩余时间 >= 29天23小时30分钟（转换为秒）
+                // 总需时间 = (30天 - 30分钟) = 29天23小时30分钟 = 2590200秒
+                // 5分钟 300秒 || 2592000 - 300 = 2591700
+                if (ttl <= 2590200) {
+                    try {
+                        // 6. 提取studyContentId
+                        String[] parts = redisKey.split(":");
+                        if (parts.length < 2) continue;
+                        String studyContentId = parts[1];
+
+                        // 7. 获取存储的时间点（示例逻辑）
+                        String redisValue = redisTemplate.opsForValue().get(redisKey);
+                        if (redisValue == null) continue;
+                        String[] partValues = redisValue.split("&");
+                        int lastStudyTime = Integer.parseInt(partValues[0]);
+                        LocalDateTime timestamp = null;
+                        if (partValues.length >= 2){
+                            timestamp = LocalDateTime.parse(partValues[1], formatter);
+                        }
+
+                        // 8. 更新数据库（调用已有服务方法）
+                        studyService.updateStudyCourseItemLastTime(studyContentId, lastStudyTime, timestamp);
+
+                        // 9. 删除Redis键（原子操作）
+                        redisTemplate.delete(redisKey);
+
+                        log.info("处理成功 key: {}, lastStudyTime: {}", redisKey, lastStudyTime);
+                    } catch (Exception e) {
+                        log.error("处理失败 key: {}", redisKey, e);
+                    }
+                }
+
+            }
+            cursor.close();
+        } catch (Exception e) {
+            log.error("定时任务执行异常", e);
+        }
+
+      /*  // 新增日志逻辑
+        if (ttl <= 172800) {
+            studyService.saveCourseExpireLog(
+                    studyContentId,
+                    lastStudyTime,
+                    redisKey,
+                    ttl,
+                    "system_job"
+            );
+        }*/
+
+    }
+
+
+
+}

servers/boe-server-all/src/main/java/com/xboe/school/study/entity/StudyCourseItem.java

@@ -1,10 +1,12 @@
 package com.xboe.school.study.entity;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.xboe.core.SysConstant;
@@ -128,5 +130,11 @@ public class StudyCourseItem extends IdEntity {
      */
     @Column(name = "status",length=1)
     private Integer status;
-    
+
+    /**
+     * 视频播放进度
+     * */
+    @Transient
+    private BigDecimal progressVideo;
+
 }

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

@@ -1,5 +1,6 @@
 package com.xboe.school.study.service;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
@@ -7,7 +8,6 @@ import com.xboe.common.PageList;
 import com.xboe.school.study.dto.StudyContentDto;
 import com.xboe.school.study.entity.StudyCourseItem;
 import com.xboe.school.study.entity.StudyTime;
-import com.xboe.system.user.entity.User;
 
 /**
  * 学习情况处理,比较综合一个处理类
@@ -35,11 +35,12 @@ public interface IStudyService {
 	
 	/**
 	 * 更新最后的学习时间，及学习时间点
+	 *
 	 * @param studyContentId
 	 * @param lastStudyTime
 	 * @param aid
 	 */
-	void updateLastTime(String studyContentId,int lastStudyTime,String aid);
+	void updateLastTime(String studyContentId, int lastStudyTime, String aid);
 
 	/**
 	 * 资源学习记录
@@ -99,4 +100,5 @@ public interface IStudyService {
 
     List<StudyCourseItem> getList(String courseId, String contentId, String name, Integer status);
 
+	void updateStudyCourseItemLastTime(String studyContentId, int lastStudyTime, LocalDateTime timestamp);
 }

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

@@ -1,5 +1,6 @@
 package com.xboe.school.study.service.impl;
 
+import java.time.Duration;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
@@ -9,12 +10,9 @@ import java.util.Map;
 
 import javax.transaction.Transactional;
 
-import com.xboe.module.article.entity.Article;
-import com.xboe.module.interaction.entity.Shares;
-import com.xboe.school.study.entity.StudyCourse;
-import com.xboe.system.user.entity.User;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 
 import com.xboe.common.OrderCondition;
@@ -51,7 +49,10 @@ public class StudyServiceImpl implements IStudyService{
 	
 	@Autowired
 	UserDao userDao;
-	
+	@Autowired
+	StringRedisTemplate redisTemplate;
+
+
 	@Override
 	public StudyCourseItem checkHas(String studyId,String contentId) {
 		List<StudyCourseItem> items = scItemDao.findList(FieldFilters.eq("studyId", studyId),FieldFilters.eq("contentId", contentId));
@@ -324,8 +325,26 @@ public class StudyServiceImpl implements IStudyService{
 
 	// 更新 前端传输已学习时长
 	@Override
-	@Transactional
 	public void updateLastTime(String studyContentId, int lastStudyTime,String aid) {
+		LocalDateTime now = LocalDateTime.now();
+		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss");
+		String value = lastStudyTime + "&" + now.format(formatter); // 使用ISO8601时间格式
+		log.info("-study-video-time-----value = " + value);
+		// 20250303 优化 多次更新改一次更新
+		// 更新Redis中的最后活跃时间（带30秒过期）
+		redisTemplate.opsForValue().set(
+				"studyContentId:" + studyContentId + ":last_active",
+				value,
+				Duration.ofSeconds(2592000)
+		);
+		log.info("-study-video-time-redis保存---value = " + value);
+//		Duration.ofDays(30)  也就是 2592000秒
+	}
+
+	@Override
+	@Transactional
+	public void updateStudyCourseItemLastTime(String studyContentId, int lastStudyTime,LocalDateTime timestamp) {
+		log.info("-study-video-time-定时---studyContentId = " + studyContentId + ",lastStudyTime = " + lastStudyTime + ", timestamp = " + timestamp);
 		// 更新最后的学习时间点
 		LocalDateTime now=LocalDateTime.now();
 		UpdateBuilder update=UpdateBuilder.from(StudyCourseItem.class);
@@ -333,9 +352,9 @@ public class StudyServiceImpl implements IStudyService{
 		//只记录时间长的时候的处理
 		update.addFilter(FieldFilters.lt("lastStudyTime", lastStudyTime));
 		update.addUpdateField("lastStudyTime", lastStudyTime);
-		update.addUpdateField("lastTime", now);
+		update.addUpdateField("lastTime", timestamp==null ? now : timestamp);
 		scItemDao.update(update.builder());
-		//增加用户的学习时长,在api中调用
+		log.info("-study-video-time-mysql保存---studyContentId = " + studyContentId);
 	}
 
 	@Override