Browse Source

学生查询课程接口

liujc 1 year ago
parent
commit
e43ee5d6e9

+ 40 - 81
.idea/httpRequests/http-requests-log.http

@@ -1,3 +1,43 @@
+GET http://127.0.0.1:9001/studentCourseSchedule/queryCourseId?courseId=2162
+Authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
+Connection: Keep-Alive
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
+Accept-Encoding: br,deflate,gzip,x-gzip
+
+<> 2023-06-14T145629.200.json
+
+###
+
+GET http://127.0.0.1:9001/studentCourseSchedule/queryCourseId?courseId=1374
+Authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
+Connection: Keep-Alive
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
+Accept-Encoding: br,deflate,gzip,x-gzip
+
+<> 2023-06-14T145450.200.json
+
+###
+
+GET http://127.0.0.1:8005/courseSchedule/getCurrentCourseDetail/1374
+Authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
+Connection: Keep-Alive
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
+Accept-Encoding: br,deflate,gzip,x-gzip
+
+<> 2023-06-14T143343.200.json
+
+###
+
+GET http://127.0.0.1:8005/courseSchedule/query?courseScheduleId=1374
+Authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
+Connection: Keep-Alive
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
+Accept-Encoding: br,deflate,gzip,x-gzip
+
+<> 2023-06-14T143049.200.json
+
+###
+
 POST http://127.0.0.1:9002/teacherAttendance/getLiveCurrentCourseStudents
 authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
 Content-Type: application/json
@@ -650,84 +690,3 @@ Accept-Encoding: br,deflate,gzip,x-gzip
 
 ###
 
-POST http://127.0.0.1:9002/teacherAttendance/getCurrentCourseStudents
-authorization: bearer 1238347b-3b06-444e-9d35-d122639121ad
-Content-Type: application/json
-Content-Length: 68
-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-{
-  "courseScheduleId": 2001,
-  "status": "NORMAL",
-  "search": ""
-}
-
-<> 2023-06-08T140848.200.json
-
-###
-
-POST http://127.0.0.1:9002/teacherCourseSchedule/liveCoursePage
-authorization: bearer 1238347b-3b06-444e-9d35-d122639121ad
-Content-Type: application/json
-Content-Length: 152
-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-{
-  "page": 1,
-  "rows": 10,
-//  "startTime": "2023-06-06 10:14:57",
-//  "endTime": "2023-06-08 10:14:57",
-//  "search": "",
-//  "status": "NOT_START"
-}
-
-<> 2023-06-08T112258.200.json
-
-###
-
-POST http://127.0.0.1:9002/teacherCourseSchedule/liveCoursePage
-authorization: bearer 1238347b-3b06-444e-9d35-d122639121ad
-Content-Type: application/json
-Content-Length: 152
-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-{
-  "page": 1,
-  "rows": 10,
-//  "startTime": "2023-06-06 10:14:57",
-//  "endTime": "2023-06-08 10:14:57",
-//  "search": "",
-//  "status": "NOT_START"
-}
-
-<> 2023-06-08T111901.200.json
-
-###
-
-POST http://127.0.0.1:9002/teacherCourseSchedule/liveCoursePage
-authorization: bearer 1238347b-3b06-444e-9d35-d122639121ad
-Content-Type: application/json
-Content-Length: 152
-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-{
-  "page": 1,
-  "rows": 10,
-//  "startTime": "2023-06-06 10:14:57",
-//  "endTime": "2023-06-08 10:14:57",
-//  "search": "",
-//  "status": "NOT_START"
-}
-
-<> 2023-06-08T111651.200.json
-
-###
-

+ 8 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/mapper/LiveGroupPlusMapper.java

@@ -21,4 +21,12 @@ public interface LiveGroupPlusMapper extends BaseMapper<Object> {
      * 直播课课表
      */
     List<CourseScheduleDto> liveCoursePage(@Param("page") IPage<CourseScheduleDto> page, @Param("param") LiveGroupWrapper.LiveCoursePageQuery queryInfo);
+
+    /**
+     * 直播课详情
+     *
+     * @param courseScheduleId 课表id
+     * @return
+     */
+    CourseScheduleDto detailLiveCourse(@Param("courseScheduleId") Long courseScheduleId);
 }

+ 8 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/CourseScheduleService.java

@@ -801,4 +801,12 @@ public interface CourseScheduleService extends BaseService<Long, CourseSchedule>
     IPage<CourseScheduleDto> liveCoursePage(LiveGroupWrapper.LiveCoursePageQuery queryInfo);
 
 	void updateCourseScheduleShareMode(UpdateCourseShareModeDto updateCourseShareModeDto);
+
+
+    /**
+     * 查询课程信息
+     * @param courseScheduleId
+     * @return
+     */
+    CourseScheduleDto detailLiveCourse(Long courseScheduleId);
 }

+ 28 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

@@ -6016,6 +6016,34 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 	}
 
     @Override
+    public CourseScheduleDto detailLiveCourse(Long courseScheduleId) {
+        CourseScheduleDto courseSchedule = liveGroupPlusMapper.detailLiveCourse(courseScheduleId);
+
+
+
+        Integer studentRemindTime = Integer.parseInt(sysConfigService.findByParamName(SysConfigService.LIVE_CLASS_START_REMIND_TIME).getParanValue());
+
+        Date startDate = DateUtil.startDateAndEndTime(courseSchedule.getClassDate(), courseSchedule.getStartClassTime());
+        courseSchedule.setStartClassTime(startDate);
+        Date endDate = DateUtil.startDateAndEndTime(courseSchedule.getClassDate(), courseSchedule.getEndClassTime());
+        courseSchedule.setEndClassTime(endDate);
+        startDate = DateUtil.addMinutes(startDate, -studentRemindTime);
+        // 课程是否开始
+        if(CourseStatusEnum.NOT_START.equals(courseSchedule.getStatus()) && startDate.before(new Date())) {
+            courseSchedule.setStatus(CourseStatusEnum.UNDERWAY);
+        }
+        // 设置老师信息
+        Teacher teacher = teacherService.get(courseSchedule.getActualTeacherId());
+        if (teacher != null) {
+            courseSchedule.setTeacherId(teacher.getId());
+            courseSchedule.setTeacherName(teacher.getRealName());
+            courseSchedule.setHeadUrl(teacher.getAvatar());
+        }
+        return courseSchedule;
+
+    }
+
+    @Override
     public List<CourseScheduleStudentDto> queryDetailList(CourseDetailQueryInfo courseDetailQueryInfo) {
         List<CourseScheduleStudentDto> courseScheduleStudentDtos = courseScheduleDao.queryDetailList(courseDetailQueryInfo);
 

+ 6 - 0
mec-biz/src/main/resources/config/mybatis/LiveGroupPlusMapper.xml

@@ -85,4 +85,10 @@
     </if>
     order by field(cs.status_, 'UNDERWAY', 'NOT_START', 'OVER') asc, cs.class_date_,cs.start_class_time_
     </select>
+
+<select id="detailLiveCourse" resultType="com.ym.mec.biz.dal.dto.CourseScheduleDto">
+    SELECT *
+    FROM course_schedule cs
+    where id_ = #{courseScheduleId}
+    </select>
 </mapper>

+ 5 - 0
mec-student/src/main/java/com/ym/mec/student/controller/StudentCourseScheduleController.java

@@ -102,4 +102,9 @@ public class StudentCourseScheduleController extends BaseController {
 		return succeed(scheduleService.queryMusicCoursePlan(sysUserService.getUserId(), startDate, endDate));
 	}
 
+    @ApiOperation(value = "获取课程信息")
+    @GetMapping("/queryCourseId")
+    public Object queryCourseId(Long courseId){
+        return succeed(scheduleService.detailLiveCourse(courseId));
+    }
 }