From a0903252025ae1df42b8f9a82bb0151059f0f612 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Tue, 28 May 2024 19:58:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xboe/school/study/api/StudyAssessApi.java | 8 +++++++- .../java/com/xboe/school/study/api/StudyExamApi.java | 9 +++++++-- .../java/com/xboe/school/study/api/StudyHomeWorkApi.java | 9 +++++++-- .../study/service/impl/StudyAssessServiceImpl.java | 3 ++- .../school/study/service/impl/StudyExamServiceImpl.java | 6 ++---- 5 files changed, 25 insertions(+), 10 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyAssessApi.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyAssessApi.java index 3fdd301b..3d5fa7ef 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyAssessApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyAssessApi.java @@ -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 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 allUserList = thirdApi.getStudyCourseList(assess.getStudyId() ,assess.getCourseId(), token); + log.info("在线课学习记录"+allUserList); return success(assess); }catch(Exception e) { log.error("保存课程评估信息错误",e); diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyExamApi.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyExamApi.java index 953990fa..fd9fdd66 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyExamApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyExamApi.java @@ -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 allUserList = thirdApi.getStudyCourseList(exam.getStudyId() ,exam.getCourseId(), token); + log.info("在线课学习记录"+allUserList); return success(exam); }catch(Exception e) { log.error("保存答卷信息错误",e); diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyHomeWorkApi.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyHomeWorkApi.java index a67a474a..80397d74 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyHomeWorkApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyHomeWorkApi.java @@ -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 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 allUserList = thirdApi.getStudyCourseList(shw.getStudyId() ,shw.getCourseId(), token); + log.info("在线课学习记录"+allUserList); return success(shw); }catch(Exception e) { log.error("保存答卷信息错误",e); diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyAssessServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyAssessServiceImpl.java index 0058c8be..a772f277 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyAssessServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyAssessServiceImpl.java @@ -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 { //转为评估只有一条，所以这里显示一条,不能再增加 diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyExamServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyExamServiceImpl.java index 832f5128..4c3b377a 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyExamServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyExamServiceImpl.java @@ -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 allUserList = thirdApi.getStudyCourseList(exam.getStudyId() ,exam.getCourseId(), token); - log.info("在线课学习记录"+allUserList); + //执行完毕 清除redis记录 // redisTemplate.delete(key); return "";