无目录有权限就报名

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

@@ -11,6 +11,7 @@ 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;
@@ -28,6 +29,8 @@ 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;
@@ -60,7 +63,8 @@ public class CoursePortalApi extends ApiBaseController{
 
 	@Resource
 	private ICourseService courseService;
-
+	@Resource
+	private IUserService userService;
 	@Resource
 	private ITeacherService teacherService;
 
@@ -301,17 +305,30 @@ 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());
@@ -319,6 +336,17 @@ 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);
 				}
 			}
 
@@ -327,7 +355,7 @@ public class CoursePortalApi extends ApiBaseController{
 		rs.put("isCrowd",pass);
 		rs.put("contents",	cclist);
 		rs.put("sections",sectionlist);
-		rs.put("teachers",teachers);
+		rs.put("teachers",teacherCourseDtos);
 		//查询课程
 		return success(rs);
 

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

@@ -0,0 +1,11 @@
+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/school/study/api/StudyCourseApi.java

@@ -228,7 +228,7 @@ public class StudyCourseApi extends ApiBaseController{
 		
 		//检查是否已报名
 		StudyCourse sc=service.findByCourseIdAndAid(cid, aid);
-		if(sc==null) {
+		if(pass==true && sc==null) {
 			//未报名，这里直接报名
 			StudySignup signup=new StudySignup();
 			signup.setCourseId(cid);
@@ -246,14 +246,13 @@ public class StudyCourseApi extends ApiBaseController{
 			signup.setSignTime(LocalDateTime.now());
 			sc=service.autoSignup(signup);
 		}
-		
-		rs.put("signup",true);
+		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);//学习的内容
-		
+		}
 		return success(rs);
 	}
 

servers/boe-server-all/src/main/java/com/xboe/system/api/SysUploaderApi.java

@@ -1,9 +1,6 @@
 package com.xboe.system.api;
 
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.*;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLEncoder;
@@ -14,6 +11,12 @@ 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;
@@ -115,8 +118,17 @@ public class SysUploaderApi  extends ApiBaseController{
 //				ex.printStackTrace();
 				log.error("处理失败",ex);
 			}
-			
-			return wrap(xur);
+			XUploadResultDto dto=new XUploadResultDto();
+			String fileFullPath = SysConstant.getConfigValue(BaseConstant.CONFIG_UPLOAD_FILES_SAVEPATH) + xur.getFilePath();
+			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

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