Merge branch 'zcwy-master' into zcwy0912

This commit is contained in:
joshen@zcwytd.com
2023-10-18 19:39:02 +08:00
4 changed files with 12 additions and 23 deletions

View File

@@ -103,7 +103,11 @@ public class Cases extends BaseEntity {
@Column(name = "favorites", nullable = false)
private Integer favorites;
@Column(name = "recommends", nullable = false)
private Long recommends;
// 推荐量
@Column(name = "recommends1", nullable = false)
private Long recommends1;
// 引用量

View File

@@ -868,6 +868,7 @@ public class CasesServiceImpl implements ICasesService {
cases.setShares(0);
cases.setFavorites(0);
cases.setCites(0);
cases.setRecommends(0L);
cases.setRecommends1(0L);
StringBuffer stringBuffer = new StringBuffer();
List<String> majorIds = cases.getMajorIds();

View File

@@ -214,21 +214,10 @@ public class StudyServiceImpl implements IStudyService{
}
// 更新 前端传输已学习时长
@Override
@Transactional
public void updateLastTime(String studyContentId, int lastStudyTime,String aid) {
// 获取时长
StudyCourseItem sci = scItemDao.findOne(FieldFilters.eq("id", studyContentId),FieldFilters.eq("aid", aid));
Integer endTime = sci.getLastStudyTime();
// 间隔时长
int abs = 0;
if(lastStudyTime - endTime < 0){
//从头开始
abs = lastStudyTime;
}else{
// 获取时长
abs = lastStudyTime - endTime;
}
// 更新最后的学习时间点
LocalDateTime now=LocalDateTime.now();
UpdateBuilder update=UpdateBuilder.from(StudyCourseItem.class);
@@ -239,14 +228,6 @@ public class StudyServiceImpl implements IStudyService{
update.addUpdateField("lastTime", now);
scItemDao.update(update.builder());
//增加用户的学习时长,在api中调用
// 添加学习时长
String contentId = sci.getContentId();
UpdateBuilder updSc=UpdateBuilder.from(StudyCourse.class);
// 追加总时长
String sql="Update boe_study_course set total_duration=total_duration+"+abs+",status=(case when status<2 then 2 else status end),progress=(case when progress=0 then 1 else progress end) where id=?1";
scDao.sqlUpdate(sql,contentId);
}
@Override