From d1b6573c258dadd17aa018d2af42657720a041ab Mon Sep 17 00:00:00 2001
From: 670788339 <670788339@qq.com>
Date: Mon, 21 Apr 2025 11:40:22 +0800
Subject: [PATCH] =?UTF-8?q?studyindex=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xboe/school/study/api/StudyCourseApi.java   | 13 -------------
 .../school/study/service/impl/StudyServiceImpl.java |  3 ++-
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git 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
index fec2414d..386a24d5 100644
--- 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
@@ -276,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);
-							}
-						}
-					}*/
-					item.setLastStudyTime(item.getStudyDuration()==null? item.getLastStudyTime() : item.getStudyDuration());
 					BigDecimal lastStudyTime = new BigDecimal(item.getLastStudyTime());
 					BigDecimal duration = new BigDecimal(content.getDuration());
 					BigDecimal progress = lastStudyTime.divide(duration, 10, RoundingMode.HALF_UP);
diff --git 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
index a4d50d06..07261e5b 100644
--- 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
@@ -211,7 +211,8 @@ public class StudyServiceImpl implements IStudyService{
 			if (redisValue != null) {
 				String[] values = redisValue.split("&");
 				int duration = Integer.parseInt(values[0]);
-				item.setStudyDuration(duration);
+//				item.setStudyDuration(duration);
+				item.setLastStudyTime(duration);
 			}
 		}
 		return list;