From a3aad61ac89a1ee5e3656b3c416f31f0e02080e2 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Fri, 8 Nov 2024 15:04:12 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=B2=E5=B8=88=E5=B7=A5=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/course/api/CoursePortalApi.java | 34 +++++++++++++++++-- .../module/course/dto/TeacherCourseDto.java | 11 ++++++ 2 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 servers/boe-server-all/src/main/java/com/xboe/module/course/dto/TeacherCourseDto.java diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CoursePortalApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CoursePortalApi.java index 3aed6c4e..0718c749 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CoursePortalApi.java +++ b/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 cclist=contentService.getByCourseId(id); List sectionlist=sectionService.getByCourseId(id); List teachers=courseService.findTeachersByCourseId(id); - + List 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 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); diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/dto/TeacherCourseDto.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/dto/TeacherCourseDto.java new file mode 100644 index 00000000..8fef6126 --- /dev/null +++ b/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; +} From e5c8dbabed791a83a882fa755e0c23213056def5 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Sun, 10 Nov 2024 14:00:11 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=97=A0=E7=9B=AE=E5=BD=95=E6=97=A0?= =?UTF-8?q?=E6=9D=83=E9=99=90=E4=B8=8D=E8=83=BD=E6=8A=A5=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xboe/school/study/api/StudyCourseApi.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java index dc24355c..e3044504 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java +++ b/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,13 +246,13 @@ public class StudyCourseApi extends ApiBaseController{ signup.setSignTime(LocalDateTime.now()); sc=service.autoSignup(signup); } - - rs.put("signup",true); - rs.put("studyId", sc.getId());//学习id - rs.put("progress", sc.getProgress()); - //查询上次学习的是什么资源。查询用户的学习情况 - List items=studyService.findByStudyId(sc.getId()); - rs.put("contentStudys",items);//学习的内容 + if (sc !=null){ + rs.put("studyId", sc.getId());//学习id + rs.put("progress", sc.getProgress()); + //查询上次学习的是什么资源。查询用户的学习情况 + List items=studyService.findByStudyId(sc.getId()); + rs.put("contentStudys",items);//学习的内容 + } return success(rs); } From 2c94b091990303ce7b825f3ec8cdfcd4da80d412 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Sun, 10 Nov 2024 19:25:08 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E8=AF=BE=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E8=A7=86=E9=A2=91=E5=A4=B1=E8=B4=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/system/api/SysUploaderApi.java | 29 +++++++++++++++---- .../assist/entity/XUploadResultDto.java | 9 ++++++ 2 files changed, 32 insertions(+), 6 deletions(-) create mode 100644 servers/boe-server-all/src/main/java/com/xboe/system/assist/entity/XUploadResultDto.java diff --git a/servers/boe-server-all/src/main/java/com/xboe/system/api/SysUploaderApi.java b/servers/boe-server-all/src/main/java/com/xboe/system/api/SysUploaderApi.java index 84f47abb..1241d912 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/system/api/SysUploaderApi.java +++ b/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,11 @@ import java.util.Set; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +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 +117,23 @@ public class SysUploaderApi extends ApiBaseController{ // ex.printStackTrace(); log.error("处理失败",ex); } - - return wrap(xur); + Long ls = 0L; + XUploadResultDto dto=new XUploadResultDto(); + String fileFullPath = SysConstant.getConfigValue(BaseConstant.CONFIG_UPLOAD_FILES_SAVEPATH) + xur.getFilePath(); + try { + Encoder encoder = new Encoder(); + MultimediaInfo m = encoder.getInfo(new File(fileFullPath)); + ls = m.getDuration() / 1000;//秒 + }catch (Exception e){ + e.printStackTrace(); + log.error("读取视频时长错误"); + } + 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); diff --git a/servers/boe-server-all/src/main/java/com/xboe/system/assist/entity/XUploadResultDto.java b/servers/boe-server-all/src/main/java/com/xboe/system/assist/entity/XUploadResultDto.java new file mode 100644 index 00000000..9efec465 --- /dev/null +++ b/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; +}