取消注释

servers/boe-server-all/pom.xml

@@ -232,13 +232,6 @@
 			<artifactId>spring-retry</artifactId>
 			<version>1.3.1</version>
 		</dependency>
-
-		<dependency>
-			<groupId>com.xuxueli</groupId>
-			<artifactId>xxl-job-core</artifactId>
-			<version>2.3.0</version>
-		</dependency>
-
 	</dependencies>
 	<build>
 		<resources>

servers/boe-server-all/src/main/java/com/xboe/XxlJobConfig.java

@@ -1,40 +0,0 @@
-package com.xboe;
-
-import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class XxlJobConfig {
-
-    @Value("${xxl.job.admin.addresses}")
-    private String adminAddresses;
-    @Value("${xxl.job.executor.appname}")
-    private String appName;
-    @Value("${xxl.job.executor.ip}")
-    private String ip;
-    @Value("${xxl.job.executor.port}")
-    private int port;
-    @Value("${xxl.job.accessToken}")
-    private String accessToken;
-    @Value("${xxl.job.executor.logpath}")
-    private String logPath;
-    @Value("${xxl.job.executor.logretentiondays}")
-    private int logRetentionDays;
-
-    @Bean
-    public XxlJobSpringExecutor xxlJobExecutor() {
-        // 创建 XxlJobSpringExecutor 执行器
-        XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
-        xxlJobSpringExecutor.setAdminAddresses(adminAddresses);
-        xxlJobSpringExecutor.setAppname(appName);
-        xxlJobSpringExecutor.setIp(ip);
-        xxlJobSpringExecutor.setPort(port);
-        xxlJobSpringExecutor.setAccessToken(accessToken);
-        xxlJobSpringExecutor.setLogPath(logPath);
-        xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays);
-        // 返回
-        return xxlJobSpringExecutor;
-    }
-}

servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CaseScheduledTasks.java

@@ -1,7 +1,6 @@
 package com.xboe.module.boecase.api;
 
 import com.xboe.module.boecase.service.ICasesService;
-import com.xxl.job.core.handler.annotation.XxlJob;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
@@ -17,7 +16,6 @@ public class CaseScheduledTasks {
      * 每月的第一天的1:00执行
      */
 //    @Scheduled(cron = "0 0 1 1 * ?")
-    @XxlJob("refreshViewsRankOfMajor")
     public void refreshViewsRankOfMajor() {
         casesService.refreshViewsRankOfMajor();
     }
@@ -25,8 +23,7 @@ public class CaseScheduledTasks {
     /**
      * 季初第一天两点执行，cron表达式设置为每个季度的第一个月的第一天的特定时间。每个季度的第一个月是1月、4月、7月和10月：
      */
-//    @Scheduled(cron = "0 0 2 1 1,4,7,10 ?")
-    @XxlJob("refreshLastQuarterStatistics")
+    @Scheduled(cron = "0 0 2 1 1,4,7,10 ?")
     public void refreshLastQuarterStatistics() {
         casesService.refreshLastQuarterStatistics();
     }

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

@@ -11,7 +11,6 @@ import com.xboe.core.orm.FieldFilters;
 import com.xboe.module.course.dto.CourseQueryDto;
 import com.xboe.module.course.dto.CourseTeacherDto;
 import com.xboe.module.course.dto.RankingDto;
-import com.xboe.module.course.dto.TeacherCourseDto;
 import com.xboe.module.course.entity.*;
 import com.xboe.module.course.service.ICourseContentService;
 import com.xboe.module.course.service.ICourseSectionService;
@@ -29,8 +28,6 @@ import com.xboe.school.study.entity.StudyHomeWork;
 import com.xboe.school.study.service.IStudyCourseService;
 import com.xboe.school.study.service.IStudyHomeWorkService;
 import com.xboe.school.study.service.IStudyService;
-import com.xboe.system.user.entity.User;
-import com.xboe.system.user.service.IUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -63,8 +60,7 @@ public class CoursePortalApi extends ApiBaseController{
 
 	@Resource
 	private ICourseService courseService;
-	@Resource
-	private IUserService userService;
+
 	@Resource
 	private ITeacherService teacherService;
 
@@ -282,7 +278,7 @@ public class CoursePortalApi extends ApiBaseController{
 		if (!Objects.isNull(studyCourse)){
 			pass = true;
 		}
-		if (Objects.isNull(studyCourse) && !courseCrowdList.isEmpty() && !StringUtils.isEmpty(audiences)) {
+		if (Objects.isNull(studyCourse) && !courseCrowdList.isEmpty()) {
 			List<String> audienceList = Arrays.asList(audiences.split(",")); // 此用户所在受众组
 			log.error("---------------参数------------ audienceList = " + audienceList);
 			for (CourseCrowd c : courseCrowdList) {
@@ -305,30 +301,17 @@ public class CoursePortalApi extends ApiBaseController{
 		List<CourseContent> cclist=contentService.getByCourseId(id);
 		List<CourseSection> sectionlist=sectionService.getByCourseId(id);
 		List<CourseTeacher> teachers=courseService.findTeachersByCourseId(id);
-		List<TeacherCourseDto> teacherCourseDtos = new ArrayList<>();
+
 
 		//获取教师的介绍信息,因为一门课程 的教师不会太多，所以这里简单直接遍历查询，后续再优化
 		for(CourseTeacher ct : teachers) {
-			TeacherCourseDto teacherCourseDto = new TeacherCourseDto();
 			Teacher t = teacherService.get(ct.getTeacherId());
-			User user = userService.get(ct.getTeacherId());
 			if(t!=null) {
 				ct.setRemark(t.getDescription());
 				if(redisTemplate.opsForValue().get(ct.getTeacherId())!=null){
 					if(Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1")){
 						ct.setTeacherName("BOE教师");
 					}
-					teacherCourseDto.setCourseId(ct.getCourseId());
-					teacherCourseDto.setTeacherName(ct.getTeacherName());
-					teacherCourseDto.setTeacherId(ct.getTeacherId());
-					teacherCourseDto.setCode(ct.getCode());
-					teacherCourseDto.setRemark(ct.getRemark());
-					teacherCourseDto.setSysCreateAid(ct.getSysCreateAid());
-					teacherCourseDto.setSysCreateBy(ct.getSysCreateBy());
-					teacherCourseDto.setSysCreateTime(ct.getSysCreateTime());
-					teacherCourseDto.setId(ct.getId());
-					teacherCourseDto.setUserNo(user.getUserNo());
-					teacherCourseDtos.add(teacherCourseDto);
 				}else if (redisTemplate.opsForValue().get(ct.getTeacherId())==null){
 					List<String> list=new ArrayList<>();
 					list.add(ct.getTeacherId());
@@ -336,17 +319,6 @@ public class CoursePortalApi extends ApiBaseController{
 					if(Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1")){
 						ct.setTeacherName("BOE教师");
 					}
-					teacherCourseDto.setCourseId(ct.getCourseId());
-					teacherCourseDto.setTeacherName(ct.getTeacherName());
-					teacherCourseDto.setTeacherId(ct.getTeacherId());
-					teacherCourseDto.setCode(ct.getCode());
-					teacherCourseDto.setRemark(ct.getRemark());
-					teacherCourseDto.setSysCreateAid(ct.getSysCreateAid());
-					teacherCourseDto.setSysCreateBy(ct.getSysCreateBy());
-					teacherCourseDto.setSysCreateTime(ct.getSysCreateTime());
-					teacherCourseDto.setId(ct.getId());
-					teacherCourseDto.setUserNo(user.getUserNo());
-					teacherCourseDtos.add(teacherCourseDto);
 				}
 			}
 
@@ -355,7 +327,7 @@ public class CoursePortalApi extends ApiBaseController{
 		rs.put("isCrowd",pass);
 		rs.put("contents",	cclist);
 		rs.put("sections",sectionlist);
-		rs.put("teachers",teacherCourseDtos);
+		rs.put("teachers",teachers);
 		//查询课程
 		return success(rs);
 

servers/boe-server-all/src/main/java/com/xboe/module/course/dto/TeacherCourseDto.java

@@ -1,11 +0,0 @@
-package com.xboe.module.course.dto;
-
-import com.xboe.module.course.entity.CourseTeacher;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class TeacherCourseDto extends CourseTeacher {
-    private String userNo;
-}

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

@@ -93,6 +93,9 @@ public class CourseServiceImpl implements ICourseService {
     @Resource
     private CourseHRBPAuditDao courseHRBPAuditDao;
 
+    @Resource
+    private StudyCourseDao scdao;
+
 
     @Resource
     private SysLogAuditDao logAuditDao;//审核日志记录
@@ -1093,6 +1096,15 @@ 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

@@ -177,7 +177,7 @@ public class StudyCourseApi extends ApiBaseController{
 		if (!Objects.isNull(studyCourse)){
 			pass = true;
 		}
-		if (Objects.isNull(studyCourse) && !courseCrowdList.isEmpty() && !StringUtils.isEmpty(audiences)) {
+		if (Objects.isNull(studyCourse) && !courseCrowdList.isEmpty()) {
 			List<String> audienceList = Arrays.asList(audiences.split(",")); // 此用户所在受众组
 			log.error("---------------参数------------ audienceList = " + audienceList);
 			for (CourseCrowd c : courseCrowdList) {
@@ -228,7 +228,7 @@ public class StudyCourseApi extends ApiBaseController{
 		
 		//检查是否已报名
 		StudyCourse sc=service.findByCourseIdAndAid(cid, aid);
-		if(pass==true && sc==null) {
+		if(sc==null) {
 			//未报名，这里直接报名
 			StudySignup signup=new StudySignup();
 			signup.setCourseId(cid);
@@ -246,13 +246,13 @@ public class StudyCourseApi extends ApiBaseController{
 			signup.setSignTime(LocalDateTime.now());
 			sc=service.autoSignup(signup);
 		}
-		if (sc !=null){
-			rs.put("studyId", sc.getId());//学习id
-			rs.put("progress", sc.getProgress());
-			//查询上次学习的是什么资源。查询用户的学习情况
-			List<StudyCourseItem> items=studyService.findByStudyId(sc.getId());
-			rs.put("contentStudys",items);//学习的内容
-		}
+		
+		rs.put("signup",true);
+		rs.put("studyId", sc.getId());//学习id
+		rs.put("progress", sc.getProgress());
+		//查询上次学习的是什么资源。查询用户的学习情况
+		List<StudyCourseItem> items=studyService.findByStudyId(sc.getId());
+		rs.put("contentStudys",items);//学习的内容
 		
 		return success(rs);
 	}
@@ -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){
+	public JsonResponse<Boolean> appendStudyDuration(String studyId,String studyItemId,String contentId,Integer duration,String courseId,HttpServletRequest request){
 		if(StringUtils.isBlank(studyId)){
 			return error("参数错误");
 		}
@@ -387,8 +387,12 @@ 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);
+			studyService.appendStudyDuration(studyId, studyItemId,contentId,duration,courseId,token);
 			return success(true);
 		}catch(Exception e) {
 			log.error("追加学习时长错误",e);

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

@@ -2,14 +2,11 @@ package com.xboe.school.study.dao;
 
 import java.time.LocalDateTime;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 
 import com.xboe.api.ThirdApi;
-import com.xboe.constants.CacheName;
+import com.xboe.school.study.entity.StudyExam;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Repository;
 
 import com.xboe.core.orm.BaseDao;
@@ -30,9 +27,6 @@ public class StudyCourseDao extends BaseDao<StudyCourse> {
 	
 	@Autowired
 	StudyCourseItemDao scItemDao;
-	@Autowired
-	StringRedisTemplate redisTemplate;
-
 
 	@Resource
 	private ThirdApi thirdApi;
@@ -43,11 +37,6 @@ public class StudyCourseDao extends BaseDao<StudyCourse> {
 	 * @param total
 	 */
 	public void finishCheck(String studyId,String courseId,Integer total,String token){
-
-		if(StringUtils.isNotEmpty(redisTemplate.opsForValue().get(studyId + "_" + courseId + "_" + total))){
-			return ;
-		}
-
 		log.info("------1.完成情况检查---------------studyId = " + studyId + " , courseId = " + courseId + " , total = " + total );
 		LocalDateTime now=LocalDateTime.now();
 		//已完成的内容
@@ -62,9 +51,7 @@ public class StudyCourseDao extends BaseDao<StudyCourse> {
 		}
 		log.info("------3.完成情况检查---------------studyId = " + studyId + " , courseId = " + courseId + " , total = " + total );
 		//以下注意，float类型，是否等于100对应
-		float percent=n*100/total;
-
-
+		float percent=n*100/total;    
 		if(n>=total) {
 			//自主报名的课程,代表学习完成
 			super.updateMultiFieldById(studyId,
@@ -72,13 +59,11 @@ public class StudyCourseDao extends BaseDao<StudyCourse> {
 					UpdateBuilder.create("lastTime",now),
 					UpdateBuilder.create("finishTime",now),
 					UpdateBuilder.create("status",StudyCourse.STATUS_FINISH));
-			redisTemplate.opsForValue().set(studyId + "_" + courseId + "_" + total, "100", 24, TimeUnit.HOURS);
 		}else {
 			super.updateMultiFieldById(studyId,
 					UpdateBuilder.create("progress",percent),
 					UpdateBuilder.create("lastTime",LocalDateTime.now()),
 					UpdateBuilder.create("status",StudyCourse.STATUS_STUDYING));
-//			redisTemplate.opsForValue().set(studyId, String.valueOf(percent), 10, TimeUnit.SECONDS);
 		}
 
 		List<StudyCourse> allUserList = thirdApi.getStudyCourseList(studyId ,courseId, token);
@@ -136,4 +121,10 @@ 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,8 @@ 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，得到章节的学习记录情况
 	 * @param studyId

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

@@ -110,7 +110,7 @@ public class StudyServiceImpl implements IStudyService{
 	
 	@Override
 	@Transactional
-	public void appendStudyDuration(String studyId,String studyItemId,String courseContentId, int duration) {
+	public void appendStudyDuration(String studyId,String studyItemId,String courseContentId, int duration,String courseId,String token) {
 		
 		//增加内容的学习时长
 		if(StringUtils.isNotBlank(studyItemId)) {
@@ -140,7 +140,43 @@ public class StudyServiceImpl implements IStudyService{
 		
 		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) {
+
+		//增加内容的学习时长
+		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);
+
 	}
 
 	@Override

servers/boe-server-all/src/main/resources/application-pro.properties

@@ -74,12 +74,3 @@ xboe.email.url=https://u.boe.com/api/b1/email/send
 xboe.email.from=boeu_learning@boe.com.cn
 xboe.email.user=
 xboe.email.security=
-
-xxl.job.admin.addresses=http://u.boe.com/jobAdmin
-xxl.job.accessToken=65ddc683-22f5-83b4-de3a-3c97a0a29af0
-xxl.job.executor.appname=java-servers-job-api
-xxl.job.executor.port=9995
-xxl.job.executor.address=
-xxl.job.executor.ip=
-xxl.job.executor.logpath=/var/log/xxl-job/dw/
-xxl.job.executor.logretentiondays=30

servers/boe-server-all/src/main/resources/application-test.properties

@@ -80,13 +80,4 @@ xboe.email.from=boeu_learning@boe.com.cn
 xboe.email.user=
 xboe.email.security=
 
-boe.domain=https://u-pre.boe.com
-
-xxl.job.admin.addresses=http://u-pre.boe.com/jobAdmin
-xxl.job.accessToken=65ddc683-22f5-83b4-de3a-3c97a0a29af0
-xxl.job.executor.appname=java-servers-job-api
-xxl.job.executor.port=9995
-xxl.job.executor.address=
-xxl.job.executor.ip=
-xxl.job.executor.logpath=/var/log/xxl-job/dw/
-xxl.job.executor.logretentiondays=30
+boe.domain=https://u-pre.boe.com