hz/java-servers
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git synced 2025-12-13 04:46:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'yx/master-20250414-lyc' into test

Browse Source
This commit is contained in:
joshen
2025-04-18 09:50:46 +08:00
parent e28e4523ab 8948165296
commit 03c12f7bc9
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -277,7 +277,7 @@ public class StudyCourseApi extends ApiBaseController{
} }
// 查询redis上面的key，并解析value获取到lastStudyTime // 查询redis上面的key，并解析value获取到lastStudyTime
String lastActive = redisTemplate.opsForValue().get("studyContentId:" + item.getId() + ":last_active"); /*String lastActive = redisTemplate.opsForValue().get("studyContentId:" + item.getId() + ":last_active");
if (StringUtil.isNotBlank(lastActive)) { if (StringUtil.isNotBlank(lastActive)) {
String[] parts = lastActive.split("&"); String[] parts = lastActive.split("&");
if (parts.length == 2) { if (parts.length == 2) {
@@ -287,8 +287,8 @@ public class StudyCourseApi extends ApiBaseController{
item.setLastStudyTime(lastStudyTimeRedis); item.setLastStudyTime(lastStudyTimeRedis);
} }
} }
} }*/
item.setLastStudyTime(item.getStudyDuration());
BigDecimal lastStudyTime = new BigDecimal(item.getLastStudyTime()); BigDecimal lastStudyTime = new BigDecimal(item.getLastStudyTime());
BigDecimal duration = new BigDecimal(content.getDuration()); BigDecimal duration = new BigDecimal(content.getDuration());
BigDecimal progress = lastStudyTime.divide(duration, 10, RoundingMode.HALF_UP); BigDecimal progress = lastStudyTime.divide(duration, 10, RoundingMode.HALF_UP);

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

@@ -203,8 +203,10 @@ public class StudyServiceImpl implements IStudyService{
public List<StudyCourseItem> findByStudyId(String studyId) { public List<StudyCourseItem> findByStudyId(String studyId) {
List<StudyCourseItem> list = 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){ for (StudyCourseItem item : list){
String redisKey = "studyId:" + studyId + ":courseId:" + item.getCourseId() + ":courseContentId:" + item.getContentId(); String redisKey = "studyId:" + studyId + ":courseId:" + item.getCourseId() + ":courseContentId:" + item.getContentId() + ":studyItemId:" + item.getId();
log.info("-- studyIndex -查询上次学习的是什么资源。查询用户的学习情况---------------- redisKey = " + redisKey);
String redisValue = redisTemplate.opsForValue().get(redisKey); String redisValue = redisTemplate.opsForValue().get(redisKey);
log.info("-- studyIndex -查询上次学习的是什么资源。查询用户的学习情况---------------- redisValue = " + redisValue);
if (redisValue != null) { if (redisValue != null) {
String[] values = redisValue.split("&"); String[] values = redisValue.split("&");
int duration = Integer.parseInt(values[0]); int duration = Integer.parseInt(values[0]);