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

修改

Browse Source
This commit is contained in:
zhaolongfei
2024-05-28 19:58:44 +08:00
parent 36fd3628bb
commit a090325202
5 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,6 +2,8 @@ package com.xboe.school.study.api;
import java.util.List;
import com.xboe.api.ThirdApi;
import com.xboe.school.study.entity.StudyCourse;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -18,6 +20,7 @@ import com.xboe.school.study.service.IStudyAssessService;
import lombok.extern.slf4j.Slf4j;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@Slf4j
@@ -27,7 +30,8 @@ public class StudyAssessApi extends ApiBaseController{
@Autowired
IStudyAssessService sassessService;
@Resource
private ThirdApi thirdApi;
@PostMapping("/save")
public JsonResponse<StudyAssess> save(@RequestBody StudyAssess assess, HttpServletRequest request){
if(StringUtils.isBlank(assess.getCourseId())) {
@@ -45,6 +49,8 @@ public class StudyAssessApi extends ApiBaseController{
assess.setStudentId(cu.getAccountId());
assess.setStudentName(cu.getName());
sassessService.save(assess,token);
List<StudyCourse> allUserList = thirdApi.getStudyCourseList(assess.getStudyId() ,assess.getCourseId(), token);
log.info("在线课学习记录"+allUserList);
return success(assess);
}catch(Exception e) {
log.error("保存课程评估信息错误",e);

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

@@ -6,6 +6,8 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import com.xboe.api.ThirdApi;
import com.xboe.school.study.entity.StudyCourse;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate;
@@ -23,6 +25,7 @@ import com.xboe.school.study.service.IStudyExamService;
import lombok.extern.slf4j.Slf4j;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@Slf4j
@@ -35,7 +38,8 @@ public class StudyExamApi extends ApiBaseController{
@Autowired
StringRedisTemplate redisTemplate;
@Resource
private ThirdApi thirdApi;
/**2024.04.24
* 矫正学员课程进度及完成状态
@@ -93,7 +97,8 @@ public class StudyExamApi extends ApiBaseController{
//执行完毕 清除redis记录
redisTemplate.delete(key);
List<StudyCourse> allUserList = thirdApi.getStudyCourseList(exam.getStudyId() ,exam.getCourseId(), token);
log.info("在线课学习记录"+allUserList);
return success(exam);
}catch(Exception e) {
log.error("保存答卷信息错误",e);

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

@@ -3,6 +3,8 @@ package com.xboe.school.study.api;
import java.time.LocalDateTime;
import java.util.List;
import com.xboe.api.ThirdApi;
import com.xboe.school.study.entity.StudyCourse;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -19,6 +21,7 @@ import com.xboe.school.study.service.IStudyHomeWorkService;
import lombok.extern.slf4j.Slf4j;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@Slf4j
@@ -28,7 +31,8 @@ public class StudyHomeWorkApi extends ApiBaseController{
@Autowired
IStudyHomeWorkService shomeworkService;
@Resource
private ThirdApi thirdApi;
@PostMapping("/save")
public JsonResponse<StudyHomeWork> save(@RequestBody StudyHomeWork shw, HttpServletRequest request){
if(StringUtils.isBlank(shw.getCourseId())) {
@@ -49,7 +53,8 @@ public class StudyHomeWorkApi extends ApiBaseController{
shw.setEndTime(LocalDateTime.now());
shomeworkService.save(shw,token);
List<StudyCourse> allUserList = thirdApi.getStudyCourseList(shw.getStudyId() ,shw.getCourseId(), token);
log.info("在线课学习记录"+allUserList);
return success(shw);
}catch(Exception e) {
log.error("保存答卷信息错误",e);

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

@@ -59,7 +59,8 @@ public class StudyAssessServiceImpl implements IStudyAssessService{
assess.setStudyItemId(sci.getId());
dao.save(assess);
//检查是否全部学习完成
int totalContent=courseContentDao.count(FieldFilters.eq("courseId", assess.getCourseId()),FieldFilters.eq("deleted",false));
// int totalContent=courseContentDao.count(FieldFilters.eq("courseId", assess.getCourseId()),FieldFilters.eq("deleted",false));
int totalContent = courseContentDao.getCount(assess.getCourseId());
scDao.finishCheck(assess.getStudyId(),assess.getCourseId(),totalContent,token);
}else {
//转为评估只有一条，所以这里显示一条,不能再增加

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

@@ -51,8 +51,7 @@ public class StudyExamServiceImpl implements IStudyExamService{
@Autowired
StringRedisTemplate redisTemplate;
@Resource
private ThirdApi thirdApi;
@Override
@Transactional
public String save(StudyExam exam,String token) {
@@ -131,8 +130,7 @@ public class StudyExamServiceImpl implements IStudyExamService{
scItemDao.updateFieldById(exam.getStudyId(), "score",100.0f);
}
}
List<StudyCourse> allUserList = thirdApi.getStudyCourseList(exam.getStudyId() ,exam.getCourseId(), token);
log.info("在线课学习记录"+allUserList);
//执行完毕 清除redis记录
// redisTemplate.delete(key);
return "";