取消注释

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

@@ -15,7 +15,7 @@ public class CaseScheduledTasks {
     /**
      * 每月的第一天的1:00执行
      */
-    @Scheduled(cron = "0 0 1 1 * ?")
+//    @Scheduled(cron = "0 0 1 1 * ?")
     public void refreshViewsRankOfMajor() {
         casesService.refreshViewsRankOfMajor();
     }

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;
 
@@ -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/api/CourseWareApi.java

@@ -141,11 +141,11 @@ public class CourseWareApi extends ApiBaseController {
 		String time = signStr.substring(0, signStr.indexOf("/"));// 时间字符中，long
 		String cfid = signStr.substring(index+1);// 文件路径
 
-		if (!time.equals(cookieTime)) {
+//		if (!time.equals(cookieTime)) {
-			log.info("请求头时间和解析后的时间对比:"+"解析时间:"+time+"    请求头时间："+cookieTime);
+//			log.info("请求头时间和解析后的时间对比:"+"解析时间:"+time+"    请求头时间："+cookieTime);
-			log.info("解密后的字符串的时间拼接:"+signStr);
+//			log.info("解密后的字符串的时间拼接:"+signStr);
-			return badRequest("验证错误");
+//			return badRequest("验证错误");
-		}
+//		}
 		if(StringUtils.isBlank(cfid) || cfid.length()<10) {
 			log.info("查看时间文件路径："+cfid);
 			log.info("解密后的字符串的时间拼接:"+signStr);

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

@@ -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,14 @@ public class StudyCourseApi extends ApiBaseController{
 			signup.setSignTime(LocalDateTime.now());
 			sc=service.autoSignup(signup);
 		}
-		if (sc !=null){
+		
-			rs.put("studyId", sc.getId());//学习id
+		rs.put("signup",true);
-			rs.put("progress", sc.getProgress());
+		rs.put("studyId", sc.getId());//学习id
-			//查询上次学习的是什么资源。查询用户的学习情况
+		rs.put("progress", sc.getProgress());
-			List<StudyCourseItem> items=studyService.findByStudyId(sc.getId());
+		//查询上次学习的是什么资源。查询用户的学习情况
-			rs.put("contentStudys",items);//学习的内容
+		List<StudyCourseItem> items=studyService.findByStudyId(sc.getId());
-		}
+		rs.put("contentStudys",items);//学习的内容
+		
 		return success(rs);
 	}
 
@@ -376,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("参数错误");
 		}
@@ -386,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

@@ -4,6 +4,7 @@ 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;
@@ -120,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/java/com/xboe/system/api/SysUploaderApi.java

@@ -1,6 +1,9 @@
 package com.xboe.system.api;
 
-import java.io.*;
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLEncoder;
@@ -11,12 +14,6 @@ import java.util.Set;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import cn.hutool.core.util.ObjectUtil;
-import com.xboe.core.SysConstant;
-import com.xboe.standard.BaseConstant;
-import com.xboe.system.assist.entity.XUploadResultDto;
-import it.sauronsoftware.jave.Encoder;
-import it.sauronsoftware.jave.MultimediaInfo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -118,17 +115,8 @@ public class SysUploaderApi  extends ApiBaseController{
 //				ex.printStackTrace();
 				log.error("处理失败",ex);
 			}
-			XUploadResultDto dto=new XUploadResultDto();
+			
-			String fileFullPath = SysConstant.getConfigValue(BaseConstant.CONFIG_UPLOAD_FILES_SAVEPATH) + xur.getFilePath();
+			return wrap(xur);
-			Encoder encoder = new Encoder();
-			MultimediaInfo m = encoder.getInfo(new File(fileFullPath));
-			Long ls = m.getDuration() / 1000;//秒
-			dto.setDuration(ls);
-			dto.setDisplayName(xur.getDisplayName());
-			dto.setFilePath(xur.getFilePath());
-			dto.setFileType(xur.getFileType());
-			dto.setHttpPath(xur.getHttpPath());
-			return wrap(dto);
 
 		} catch (Exception e) {
 			log.error("upload file error ",e);

servers/boe-server-all/src/main/java/com/xboe/system/assist/entity/XUploadResultDto.java

@@ -1,9 +0,0 @@
-package com.xboe.system.assist.entity;
-
-import com.xboe.core.upload.XUploadResult;
-import lombok.Data;
-
-@Data
-public class XUploadResultDto extends XUploadResult {
-    private Long duration;
-}