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

Merge branch 'dev0731' into 'master'

Browse Source 
Dev0731

See merge request !11
This commit is contained in:
joshen
2023-08-09 20:07:50 +08:00
parent ea0a30b3dd c37819d6b0
commit 39ac8303db
2 changed files with 43 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -234,7 +234,7 @@ public class CoursePortalApi extends ApiBaseController{
* @return * @return
*/ */
@RequestMapping(value="/detail",method = {RequestMethod.GET,RequestMethod.POST}) @RequestMapping(value="/detail",method = {RequestMethod.GET,RequestMethod.POST})
public JsonResponse<Map<String,Object>> detail(String id,Boolean addView,Boolean crowd,Boolean preview, HttpServletRequest request){ public JsonResponse<Map<String,Object>> detail(String id,Boolean addView,Boolean crowd,Boolean preview, HttpServletRequest request,String audiences){
if(StringUtils.isBlank(id)) { if(StringUtils.isBlank(id)) {
return badRequest("参数错误，未指定课程"); return badRequest("参数错误，未指定课程");
} }
@@ -260,51 +260,36 @@ public class CoursePortalApi extends ApiBaseController{
if(preview==null) { if(preview==null) {
preview=true; preview=true;
} }
log.error("---------------课程的受众------------ courseCrowdList = " + courseCrowdList);
// StudyCourse sc = new StudyCourse();
// sc.setCourseId(course.getId());
// sc.setAid(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); StudyCourse studyCourse = studyCourseService.findByCourseIdAndAid(course.getId(), aid);
log.debug("=--------- 开始查询是否学习过此课程 ---------------------------------course.getId()= "+ course.getId() + ",aid = " + aid +",studyCourse = " + studyCourse); log.error("--------------------------- studyCourse = " + studyCourse);
// 无受众 所有人可看
// 此课程是否包含此aid用户
// 例外情况判断
boolean pass = false; boolean pass = false;
if(!preview) { if (!Objects.isNull(studyCourse)){
log.debug("=--------- 开始查询受众信息 ---------------------------------aid = " + aid); pass = true;
String token = request.getHeader("XBOE-Access-Token"); }
log.debug("=--------- 获取token token = " + token); if (Objects.isNull(studyCourse) && !courseCrowdList.isEmpty()) {
if (!courseCrowdList.isEmpty()) { List<String> audienceList = Arrays.asList(audiences.split(",")); // 此用户所在受众组
log.error("---------------参数------------ audienceList = " + audienceList);
for (CourseCrowd c : courseCrowdList) { for (CourseCrowd c : courseCrowdList) {
//同一个受众，同一个只会有一条记录，所以这里就直接查询了 for (String audience :audienceList){
// List<UserGroupItem> hasItem = userGroupService.findByGroupIdAndAid(c.getGroupId(),aid); if (c.getGroupId().equals(audience)) {
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.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(id + "=--------- 开始查询课程信息信息 ---------------------------------dynamicList = " + dynamicList);*/
if (userIdList.contains(Long.parseLong(aid)) || !Objects.isNull(studyCourse)) {
pass = true; pass = true;
break; break;
} }
} }
// if (!pass) { if (pass){
// //return badRequest("您无学习此课程的权限，请与管理员联系"); break;
// return wrap(JsonResponseStatus.NO_CONTENT, "您无学习此课程的权限，请与管理员联系",rs); }
// } }
}else { }else {
pass = true; pass = true;
} }
}
log.debug("=--------- 是否有权限查看此课程: " +pass);
log.error("=--------- 是否有权限查看此课程: " +pass);
List<CourseContent> cclist=contentService.getByCourseId(id); List<CourseContent> cclist=contentService.getByCourseId(id);
List<CourseSection> sectionlist=sectionService.getByCourseId(id); List<CourseSection> sectionlist=sectionService.getByCourseId(id);
List<CourseTeacher> teachers=courseService.findTeachersByCourseId(id); List<CourseTeacher> teachers=courseService.findTeachersByCourseId(id);

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

@@ -4,6 +4,7 @@ import java.time.LocalDateTime;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import cn.hutool.core.util.ArrayUtil;
import com.xboe.api.ThirdApi; import com.xboe.api.ThirdApi;
import com.xboe.api.vo.AuditList; import com.xboe.api.vo.AuditList;
import com.xboe.api.vo.AuditListParam; import com.xboe.api.vo.AuditListParam;
@@ -11,6 +12,7 @@ import com.xboe.api.vo.UserDynamic;
import com.xboe.api.vo.UserdynamicParam; import com.xboe.api.vo.UserdynamicParam;
import com.xboe.module.usergroup.entity.UserGroupItem; import com.xboe.module.usergroup.entity.UserGroupItem;
import com.xboe.module.usergroup.service.IUserGroupService; import com.xboe.module.usergroup.service.IUserGroupService;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
@@ -146,7 +148,7 @@ public class StudyCourseApi extends ApiBaseController{
* @return * @return
*/ */
@RequestMapping(value="/studyIndex",method = {RequestMethod.GET,RequestMethod.POST}) @RequestMapping(value="/studyIndex",method = {RequestMethod.GET,RequestMethod.POST})
public JsonResponse<Map<String,Object>> loadDetail(String cid,Boolean addView,Boolean crowd, HttpServletRequest request){ public JsonResponse<Map<String,Object>> loadDetail(String cid,Boolean addView,Boolean crowd, HttpServletRequest request,String audiences){
if(StringUtils.isBlank(cid)){ if(StringUtils.isBlank(cid)){
return error("无课程信息"); return error("无课程信息");
} }
@@ -164,27 +166,27 @@ public class StudyCourseApi extends ApiBaseController{
if(crowd!=null && crowd) { if(crowd!=null && crowd) {
rs.put("crowds",courseCrowdList); rs.put("crowds",courseCrowdList);
} }
log.error("---------------课程的受众------------ courseCrowdList = " + courseCrowdList);
StudyCourse studyCourse = service.findByCourseIdAndAid(course.getId(), aid); StudyCourse studyCourse = service.findByCourseIdAndAid(course.getId(), aid);
log.error("=--------- 开始查询是否学习过此课程 ---------------------------------course.getId()= "+ course.getId() + ",aid = " + aid +",studyCourse = " + studyCourse); log.error("--------------------------- studyCourse = " + studyCourse);
// 无受众 所有人可看
// 此课程是否包含此aid用户
// 例外情况判断
boolean pass = false; boolean pass = false;
if (!courseCrowdList.isEmpty()) { if (!Objects.isNull(studyCourse)){
log.debug("=---studyIndex------ 开始查询受众信息 ---------------------------------");
String token = request.getHeader("XBOE-Access-Token");
for (CourseCrowd c : courseCrowdList) {
//同一个受众，同一个只会有一条记录，所以这里就直接查询了
// List<UserGroupItem> hasItem = userGroupService.findByGroupIdAndAid(c.getGroupId(),aid);
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.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)) || !Objects.isNull(studyCourse)) {
pass = true; pass = true;
}
if (Objects.isNull(studyCourse) && !courseCrowdList.isEmpty()) {
List<String> audienceList = Arrays.asList(audiences.split(",")); // 此用户所在受众组
log.error("---------------参数------------ audienceList = " + audienceList);
for (CourseCrowd c : courseCrowdList) {
for (String audience :audienceList){
if (c.getGroupId().equals(audience)) {
pass = true;
break;
}
}
if (pass){
break; break;
} }
} }