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

Merge branch 'zcwy0525-llf' into dev0525

Browse Source 
# Conflicts:
#	servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyAssessApi.java
#	servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java
#	servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyExamApi.java
This commit is contained in:
zhaolongfei
2024-05-29 11:25:40 +08:00
parent b74141a036 0f882deca9
commit 5f223d9183
4 changed files with 3 additions and 8 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/StudyAssessApi.java
View File

@@ -30,10 +30,8 @@ public class StudyAssessApi extends ApiBaseController{
@Autowired @Autowired
IStudyAssessService sassessService; IStudyAssessService sassessService;
@Resource @Resource
private ThirdApi thirdApi; private ThirdApi thirdApi;
@PostMapping("/save") @PostMapping("/save")
public JsonResponse<StudyAssess> save(@RequestBody StudyAssess assess, HttpServletRequest request){ public JsonResponse<StudyAssess> save(@RequestBody StudyAssess assess, HttpServletRequest request){
if(StringUtils.isBlank(assess.getCourseId())) { if(StringUtils.isBlank(assess.getCourseId())) {
@@ -51,8 +49,8 @@ public class StudyAssessApi extends ApiBaseController{
assess.setStudentId(cu.getAccountId()); assess.setStudentId(cu.getAccountId());
assess.setStudentName(cu.getName()); assess.setStudentName(cu.getName());
sassessService.save(assess,token); sassessService.save(assess,token);
List<StudyCourse> allUserList = thirdApi.getStudyCourseList(assess.getStudyId(),assess.getCourseId(), token); List<StudyCourse> allUserList = thirdApi.getStudyCourseList(assess.getStudyId() ,assess.getCourseId(), token);
log.info("allUserList:{}",allUserList); log.info("在线课学习记录"+allUserList);
return success(assess); return success(assess);
}catch(Exception e) { }catch(Exception e) {
log.error("保存课程评估信息错误",e); log.error("保存课程评估信息错误",e);

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

@@ -349,8 +349,7 @@ public class StudyCourseApi extends ApiBaseController{
studyService.saveStudyInfo(sci,token); studyService.saveStudyInfo(sci,token);
//学习记录成功后处理 //学习记录成功后处理
studyService.appendStudyDuration(sci.getStudyId(),sci.getStudyItemId(),sci.getContentId(),sci.getDuration()); studyService.appendStudyDuration(sci.getStudyId(),sci.getStudyItemId(),sci.getContentId(),sci.getDuration());
List<StudyCourse> allUserList = thirdApi.getStudyCourseList(sci.getStudyId() ,sci.getCourseId(), token);
List<StudyCourse> allUserList = thirdApi.getStudyCourseList(sci.getStudyId(), sci.getCourseId(), token);
log.info("在线课学习记录"+allUserList); log.info("在线课学习记录"+allUserList);
//System.out.println("在线课学习记录"+allUserList); //System.out.println("在线课学习记录"+allUserList);
return success(sci.getStudyItemId()); return success(sci.getStudyItemId());

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

@@ -38,7 +38,6 @@ public class StudyExamApi extends ApiBaseController{
@Autowired @Autowired
StringRedisTemplate redisTemplate; StringRedisTemplate redisTemplate;
@Resource @Resource
private ThirdApi thirdApi; private ThirdApi thirdApi;

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

@@ -51,7 +51,6 @@ public class StudyHomeWorkApi extends ApiBaseController{
shw.setStudentId(cu.getAccountId()); shw.setStudentId(cu.getAccountId());
shw.setStudentName(cu.getName()); shw.setStudentName(cu.getName());
shw.setEndTime(LocalDateTime.now()); shw.setEndTime(LocalDateTime.now());
shomeworkService.save(shw,token); shomeworkService.save(shw,token);
List<StudyCourse> allUserList = thirdApi.getStudyCourseList(shw.getStudyId() ,shw.getCourseId(), token); List<StudyCourse> allUserList = thirdApi.getStudyCourseList(shw.getStudyId() ,shw.getCourseId(), token);
log.info("在线课学习记录"+allUserList); log.info("在线课学习记录"+allUserList);