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

课程受众-例外 boe_study_course 取值

Browse Source
This commit is contained in:
lims1@hunktimes.com
2023-08-08 10:19:39 +08:00
parent ee67b600d3
commit b42284b511
2 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
servers/boe-server-all/src/main/java/com/xboe/module/course/api/CoursePortalApi.java
View File

@@ -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<StudyCourse> 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<UserGroupItem> hasItem = userGroupService.findByGroupIdAndAid(c.getGroupId(),aid);
log.error("=--------- 开始调研用户中心受众接口 groupId = " + c.getGroupId());
log.debug("=--------- 开始调研用户中心受众接口 groupId = " + c.getGroupId());
List<AuditList> allAudienceList = thirdApi.getAllAudienceList(AuditListParam.builder().audienceId(c.getGroupId()).pageSize(1000).pageNo(1).build(), token);
List<Long> userIdList = allAudienceList.stream().map(AuditList::getUserId).collect(Collectors.toList());
log.error("=--------- allAudienceList: " +allAudienceList);
log.debug("=--------- allAudienceList: " +allAudienceList);
/*
List<UserDynamic> 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<CourseContent> cclist=contentService.getByCourseId(id);
List<CourseSection> sectionlist=sectionService.getByCourseId(id);
List<CourseTeacher> teachers=courseService.findTeachersByCourseId(id);

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

@@ -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<UserGroupItem> hasItem = userGroupService.findByGroupIdAndAid(c.getGroupId(),aid);
log.error("=--------- 开始调研用户中心受众接口 groupId = " + c.getGroupId());
log.debug("=--------- 开始调研用户中心受众接口 groupId = " + c.getGroupId());
List<AuditList> allAudienceList = thirdApi.getAllAudienceList(AuditListParam.builder().audienceId(c.getGroupId()).pageSize(1000).pageNo(1).build(), token);
List<Long> userIdList = allAudienceList.stream().map(AuditList::getUserId).collect(Collectors.toList());
log.error("=--------- allAudienceList: " +allAudienceList);
List<UserDynamic> userDynamicList = thirdApi.getAllUserdynamicList(UserdynamicParam.builder().aid(Long.parseLong(aid)).pageSize(1000).pageIndex(1).build(), token);
log.debug("=--------- allAudienceList: " +allAudienceList);
/*List<UserDynamic> userDynamicList = thirdApi.getAllUserdynamicList(UserdynamicParam.builder().aid(Long.parseLong(aid)).pageSize(1000).pageIndex(1).build(), token);
log.error("=--------- 开始查询课程信息信息 ---------------------------------userDynamicList = " + userDynamicList);
List<Long> 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;
}