From b42284b5119e4c996c018446560d1f3236c154a4 Mon Sep 17 00:00:00 2001 From: "lims1@hunktimes.com" Date: Tue, 8 Aug 2023 10:19:39 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=8F=97=E4=BC=97-=E4=BE=8B?= =?UTF-8?q?=E5=A4=96=20boe=5Fstudy=5Fcourse=20=E5=8F=96=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/course/api/CoursePortalApi.java | 11 +++++------ .../xboe/school/study/api/StudyCourseApi.java | 19 +++++++++---------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CoursePortalApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CoursePortalApi.java index 20466c3a..d318ccdb 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CoursePortalApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CoursePortalApi.java @@ -264,24 +264,24 @@ public class CoursePortalApi extends ApiBaseController{ // StudyCourse sc = new StudyCourse(); // sc.setCourseId(course.getId()); // sc.setAid(aid); - log.error("=--------- 开始查询是否学习过此课程 ---------------------------------course.getId()= "+ course.getId() + ",aid = " + aid ); + log.debug("=--------- 开始查询是否学习过此课程 ---------------------------------course.getId()= "+ course.getId() + ",aid = " + aid ); // PageList rs1= studyCourseService.findPage(1,10, sc, OrderCondition.desc("id"),null); StudyCourse studyCourse = studyCourseService.findByCourseIdAndAid(course.getId(), aid); - log.error("=--------- 开始查询是否学习过此课程 ---------------------------------course.getId()= "+ course.getId() + ",aid = " + aid +",studyCourse = " + studyCourse); + log.debug("=--------- 开始查询是否学习过此课程 ---------------------------------course.getId()= "+ course.getId() + ",aid = " + aid +",studyCourse = " + studyCourse); boolean pass = false; if(!preview) { log.error("=--------- 开始查询受众信息 ---------------------------------aid = " + aid); String token = request.getHeader("XBOE-Access-Token"); - log.error("=--------- 获取token token = " + token); + log.debug("=--------- 获取token token = " + token); if (!courseCrowdList.isEmpty()) { for (CourseCrowd c : courseCrowdList) { //同一个受众，同一个只会有一条记录，所以这里就直接查询了 // List hasItem = userGroupService.findByGroupIdAndAid(c.getGroupId(),aid); - log.error("=--------- 开始调研用户中心受众接口 groupId = " + c.getGroupId()); + log.debug("=--------- 开始调研用户中心受众接口 groupId = " + c.getGroupId()); List allAudienceList = thirdApi.getAllAudienceList(AuditListParam.builder().audienceId(c.getGroupId()).pageSize(1000).pageNo(1).build(), token); List userIdList = allAudienceList.stream().map(AuditList::getUserId).collect(Collectors.toList()); - log.error("=--------- allAudienceList: " +allAudienceList); + log.debug("=--------- allAudienceList: " +allAudienceList); /* List userDynamicList = thirdApi.getAllUserdynamicList(UserdynamicParam.builder().aid(Long.parseLong(aid)).pageSize(1000).pageIndex(1).build(), token); log.error("=--------- 开始查询课程信息信息 ---------------------------------userDynamicList = " + userDynamicList); @@ -305,7 +305,6 @@ public class CoursePortalApi extends ApiBaseController{ } log.debug("=--------- 是否有权限查看此课程: " +pass); - log.error("=--------- 是否有权限查看此课程: " +pass); List cclist=contentService.getByCourseId(id); List sectionlist=sectionService.getByCourseId(id); List teachers=courseService.findTeachersByCourseId(id); diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java index ef4ad170..8022fc88 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java @@ -1,10 +1,7 @@ package com.xboe.school.study.api; import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; import com.xboe.api.ThirdApi; @@ -168,23 +165,25 @@ public class StudyCourseApi extends ApiBaseController{ rs.put("crowds",courseCrowdList); } + StudyCourse studyCourse = service.findByCourseIdAndAid(course.getId(), aid); + log.error("=--------- 开始查询是否学习过此课程 ---------------------------------course.getId()= "+ course.getId() + ",aid = " + aid +",studyCourse = " + studyCourse); boolean pass = false; if (!courseCrowdList.isEmpty()) { log.debug("=---studyIndex------ 开始查询受众信息 ---------------------------------"); - log.error("=----studyIndex----- 开始查询受众信息 ---------------------------------"); String token = request.getHeader("XBOE-Access-Token"); for (CourseCrowd c : courseCrowdList) { //同一个受众，同一个只会有一条记录，所以这里就直接查询了 // List hasItem = userGroupService.findByGroupIdAndAid(c.getGroupId(),aid); - log.error("=--------- 开始调研用户中心受众接口 groupId = " + c.getGroupId()); + log.debug("=--------- 开始调研用户中心受众接口 groupId = " + c.getGroupId()); List allAudienceList = thirdApi.getAllAudienceList(AuditListParam.builder().audienceId(c.getGroupId()).pageSize(1000).pageNo(1).build(), token); List userIdList = allAudienceList.stream().map(AuditList::getUserId).collect(Collectors.toList()); - log.error("=--------- allAudienceList: " +allAudienceList); - List userDynamicList = thirdApi.getAllUserdynamicList(UserdynamicParam.builder().aid(Long.parseLong(aid)).pageSize(1000).pageIndex(1).build(), token); + log.debug("=--------- allAudienceList: " +allAudienceList); + + /*List userDynamicList = thirdApi.getAllUserdynamicList(UserdynamicParam.builder().aid(Long.parseLong(aid)).pageSize(1000).pageIndex(1).build(), token); log.error("=--------- 开始查询课程信息信息 ---------------------------------userDynamicList = " + userDynamicList); List dynamicList = userDynamicList.stream().map(UserDynamic::getContentId).map(Long::parseLong).collect(Collectors.toList()); - log.error(cid + "=--------- 开始查询课程信息信息 ---------------------------------dynamicList = " + dynamicList); - if (userIdList.contains(Long.parseLong(aid)) || dynamicList.contains(cid)) { + log.error(cid + "=--------- 开始查询课程信息信息 ---------------------------------dynamicList = " + dynamicList);*/ + if (userIdList.contains(Long.parseLong(aid)) || !Objects.isNull(studyCourse)) { pass = true; break; }