受众传参判空

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

@@ -278,7 +278,7 @@ public class CoursePortalApi extends ApiBaseController{
 		if (!Objects.isNull(studyCourse)){
 			pass = true;
 		}
-		if (Objects.isNull(studyCourse) && !courseCrowdList.isEmpty()) {
+		if (Objects.isNull(studyCourse) && !courseCrowdList.isEmpty() && !StringUtils.isEmpty(audiences)) {
 			List<String> audienceList = Arrays.asList(audiences.split(",")); // 此用户所在受众组
 			log.error("---------------参数------------ audienceList = " + audienceList);
 			for (CourseCrowd c : courseCrowdList) {

servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java

@@ -93,9 +93,6 @@ public class CourseServiceImpl implements ICourseService {
     @Resource
     private CourseHRBPAuditDao courseHRBPAuditDao;
 
-    @Resource
-    private StudyCourseDao scdao;
-
 
     @Resource
     private SysLogAuditDao logAuditDao;//审核日志记录
@@ -1096,15 +1093,6 @@ public class CourseServiceImpl implements ICourseService {
                 courseCrowdDao.saveOrUpdate(cc);
             }
         }
-        if (c != null) {
-            List<StudyCourse> studyCourses = scdao.findListById(c.getId());
-            if (studyCourses != null && !studyCourses.isEmpty()) {
-                for (StudyCourse sc : studyCourses) {
-                    scdao.finishCheck(sc.getId(), c.getId(), 0, aid);
-                }
-            }
-        }
-
         //同步发布
         publishUtil.fullTextPublish(c);
         //发布事件处理

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

@@ -377,7 +377,7 @@ public class StudyCourseApi extends ApiBaseController{
 	//更新时长
 	/**追加学习时长*/
 	@PostMapping("/study-append-duration")
-	public JsonResponse<Boolean> appendStudyDuration(String studyId,String studyItemId,String contentId,Integer duration,String courseId,HttpServletRequest request){
+	public JsonResponse<Boolean> appendStudyDuration(String studyId,String studyItemId,String contentId,Integer duration){
 		if(StringUtils.isBlank(studyId)){
 			return error("参数错误");
 		}
@@ -387,12 +387,8 @@ public class StudyCourseApi extends ApiBaseController{
 		if(duration==null){
 			return error("无学习时长");
 		}
-		String token = request.getHeader("Xboe-Access-Token");
-		if (StringUtils.isEmpty(token)) {
-			token = request.getHeader("token");
-		}
 		try {
-			studyService.appendStudyDuration(studyId, studyItemId,contentId,duration,courseId,token);
+			studyService.appendStudyDuration(studyId, studyItemId,contentId,duration);
 			return success(true);
 		}catch(Exception e) {
 			log.error("追加学习时长错误",e);

servers/boe-server-all/src/main/java/com/xboe/school/study/dao/StudyCourseDao.java

@@ -4,7 +4,6 @@ import java.time.LocalDateTime;
 import java.util.List;
 
 import com.xboe.api.ThirdApi;
-import com.xboe.school.study.entity.StudyExam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
@@ -121,10 +120,4 @@ public class StudyCourseDao extends BaseDao<StudyCourse> {
 	public StudyCourse findByCourseIdAndAid(String aid, String courseId) {
 		return this.findOne(FieldFilters.eq("aid",aid),FieldFilters.eq("courseId",courseId));
 	}
-
-	public List<StudyCourse> findListById(String courseId) {
-		String hql1 = "FROM StudyCourse WHERE courseId = ?1";
-		List<StudyCourse> listByHql = super.findListByHql(hql1, courseId);
-		return listByHql;
-	}
 }

servers/boe-server-all/src/main/java/com/xboe/school/study/service/IStudyService.java

@@ -77,7 +77,6 @@ public interface IStudyService {
 	 * @param duration 学习时长
 	 */
 	void appendStudyDuration(String studyId,String studyItemId,String courseContentId, int duration);
-	void appendStudyDuration(String studyId,String studyItemId,String courseContentId, int duration,String courseId,String token);
 	
 	/**
 	 * 根据学习id，得到章节的学习记录情况

servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java

@@ -108,42 +108,6 @@ public class StudyServiceImpl implements IStudyService{
 		
 	}
 	
-	@Override
-	@Transactional
-	public void appendStudyDuration(String studyId,String studyItemId,String courseContentId, int duration,String courseId,String token) {
-		
-		//增加内容的学习时长
-		if(StringUtils.isNotBlank(studyItemId)) {
-			//直接根据id更新
-//			String hql="Update StudyCourseItem set studyDuration=studyDuration+"+duration+",status=(case when status<2 then 2 else status end) where id=?1";
-//			scItemDao.update(hql,studyItemId);
-			String sql="Update boe_study_course_item set study_duration=study_duration+"+duration+",status=(case when status<2 then 2 else status end) where id=?1";
-			scItemDao.sqlUpdate(sql,studyItemId);
-			//scItemDao.updateMultiFieldById(studyItemId, UpdateBuilder.create("studyDuration", "studyDuration+"+duration,FieldUpdateType.EXPRESSION));
-			
-		}else {
-			//根据学习id和课程内容id更新
-//			scItemDao.update(UpdateBuilder.from(StudyCourseItem.class)
-//					.addUpdateField("studyDuration", "studyDuration+"+duration,FieldUpdateType.EXPRESSION)
-//					.addFilter(FieldFilters.eq("studyId", studyId))  
-//					.addFilter(FieldFilters.eq("contentId", courseContentId))
-//					.builder());
-//			
-//			String hql="Update StudyCourseItem set studyDuration=studyDuration+"+duration+",status=(case when status<2 then 2 else status end) where studyId=?1 and contentId=?2";
-//			scItemDao.update(hql,studyId,courseContentId);
-			String sql="Update boe_study_course_item set study_duration=study_duration+"+duration+",status=(case when status<2 then 2 else status end) where study_id=?1 and content_id=?2";
-			scItemDao.sqlUpdate(sql,studyId,courseContentId);
-		}
-		
-		//追加课程的学习时长
-		//scDao.updateMultiFieldById(studyId, UpdateBuilder.create("totalDuration", "totalDuration+"+duration,FieldUpdateType.EXPRESSION));
-		
-		String sql="Update boe_study_course set total_duration=total_duration+"+duration+",status=(case when status<2 then 2 else status end),progress=(case when progress=0 then 1 else progress end),last_time = '"+LocalDateTime.now()+"' where id=?1";
-		scDao.sqlUpdate(sql,studyId);
-		Integer total = 0;
-		scDao.finishCheck(studyId,courseId,total,token);
-	}
-
 	@Override
 	@Transactional
 	public void appendStudyDuration(String studyId,String studyItemId,String courseContentId, int duration) {