Home Explore Help
Sign In
yonge
/
mec
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

fix

shangke 2 years ago
parent
0386f1dce2
commit
b46e063733
2 changed files with 162 additions and 241 deletions
Split View Show Diff Stats
  1. 150 231
      .idea/httpRequests/http-requests-log.http
  2. 12 10
      mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

+ 150 - 231
.idea/httpRequests/http-requests-log.http
View File 

@@ -1,3 +1,153 @@
 
+GET http://127.0.0.1:9002/teacherCourseSchedule/liveCourseScheduleTime?courseScheduleId=2549
 
+Authorization: bearer 3b32893e-d0db-4db9-ad2b-1bcd81d8b522
 
+Proxy-Connection: Keep-Alive
 
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 
+Accept-Encoding: br,deflate,gzip,x-gzip
 
+
 
+<> 2023-06-16T002219.200.json
 
+
 
+###
 
+
 
+GET http://127.0.0.1:9002/teacherCourseSchedule/liveCourseScheduleTime?courseScheduleId=2551
 
+Authorization: bearer 3b32893e-d0db-4db9-ad2b-1bcd81d8b522
 
+Proxy-Connection: Keep-Alive
 
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 
+Accept-Encoding: br,deflate,gzip,x-gzip
 
+
 
+<> 2023-06-16T002210.200.json
 
+
 
+###
 
+
 
+GET http://127.0.0.1:9002/teacherCourseSchedule/liveCourseScheduleTime?courseScheduleId=2550
 
+Authorization: bearer 3b32893e-d0db-4db9-ad2b-1bcd81d8b522
 
+Proxy-Connection: Keep-Alive
 
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 
+Accept-Encoding: br,deflate,gzip,x-gzip
 
+
 
+<> 2023-06-16T002201.200.json
 
+
 
+###
 
+
 
+GET http://127.0.0.1:9002/teacherCourseSchedule/liveCourseScheduleTime?courseScheduleId=2548
 
+Authorization: bearer 3b32893e-d0db-4db9-ad2b-1bcd81d8b522
 
+Proxy-Connection: Keep-Alive
 
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 
+Accept-Encoding: br,deflate,gzip,x-gzip
 
+
 
+<> 2023-06-16T002140.200.json
 
+
 
+###
 
+
 
+GET http://127.0.0.1:9002/teacherCourseSchedule/liveCourseScheduleTime?courseScheduleId=2548
 
+Authorization: bearer 3b32893e-d0db-4db9-ad2b-1bcd81d8b522
 
+Proxy-Connection: Keep-Alive
 
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 
+Accept-Encoding: br,deflate,gzip,x-gzip
 
+
 
+<> 2023-06-16T002122.200.json
 
+
 
+###
 
+
 
+GET http://127.0.0.1:9002/teacherCourseSchedule/liveCourseScheduleTime?courseScheduleId=2548
 
+Authorization: bearer 3b32893e-d0db-4db9-ad2b-1bcd81d8b522
 
+Proxy-Connection: Keep-Alive
 
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 
+Accept-Encoding: br,deflate,gzip,x-gzip
 
+
 
+<> 2023-06-16T002116.200.json
 
+
 
+###
 
+
 
+GET http://127.0.0.1:9002/teacherCourseSchedule/liveCourseScheduleTime?courseScheduleId=2548
 
+Authorization: bearer 3b32893e-d0db-4db9-ad2b-1bcd81d8b522
 
+Proxy-Connection: Keep-Alive
 
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 
+Accept-Encoding: br,deflate,gzip,x-gzip
 
+
 
+<> 2023-06-16T001946.200.json
 
+
 
+###
 
+
 
+GET http://127.0.0.1:9002/teacherCourseSchedule/liveCourseScheduleTime?courseScheduleId=2548
 
+Authorization: bearer 3b32893e-d0db-4db9-ad2b-1bcd81d8b522
 
+Proxy-Connection: Keep-Alive
 
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 
+Accept-Encoding: br,deflate,gzip,x-gzip
 
+
 
+<> 2023-06-16T001010.200.json
 
+
 
+###
 
+
 
+GET http://127.0.0.1:9002/teacherCourseSchedule/liveCourseScheduleTime?courseScheduleId=2548
 
+Authorization: bearer 3b32893e-d0db-4db9-ad2b-1bcd81d8b522
 
+Proxy-Connection: Keep-Alive
 
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 
+Accept-Encoding: br,deflate,gzip,x-gzip
 
+
 
+<> 2023-06-16T000611.200.json
 
+
 
+###
 
+
 
+GET http://127.0.0.1:9002/teacherCourseSchedule/liveCourseScheduleTime?courseScheduleId=2548
 
+Authorization: bearer 3b32893e-d0db-4db9-ad2b-1bcd81d8b522
 
+Proxy-Connection: Keep-Alive
 
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 
+Accept-Encoding: br,deflate,gzip,x-gzip
 
+
 
+<> 2023-06-16T000505.200.json
 
+
 
+###
 
+
 
+GET http://127.0.0.1:9002/teacherCourseSchedule/liveCourseScheduleTime?courseScheduleId=2548
 
+Authorization: bearer 3b32893e-d0db-4db9-ad2b-1bcd81d8b522
 
+Proxy-Connection: Keep-Alive
 
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 
+Accept-Encoding: br,deflate,gzip,x-gzip
 
+
 
+<> 2023-06-16T000415.200.json
 
+
 
+###
 
+
 
+GET http://127.0.0.1:9002/teacherCourseSchedule/liveCourseScheduleTime?courseScheduleId=2548
 
+Authorization: bearer 3b32893e-d0db-4db9-ad2b-1bcd81d8b522
 
+Proxy-Connection: Keep-Alive
 
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 
+Accept-Encoding: br,deflate,gzip,x-gzip
 
+
 
+<> 2023-06-16T000301.200.json
 
+
 
+###
 
+
 
+GET http://127.0.0.1:9002/teacherCourseSchedule/liveCourseScheduleTime?courseScheduleId=2548
 
+Authorization: bearer 3b32893e-d0db-4db9-ad2b-1bcd81d8b522
 
+Proxy-Connection: Keep-Alive
 
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 
+Accept-Encoding: br,deflate,gzip,x-gzip
 
+
 
+<> 2023-06-15T235840.200.json
 
+
 
+###
 
+
 
+GET http://127.0.0.1:9002/teacherCourseSchedule/liveCourseScheduleTime?courseScheduleId=2548
 
+Authorization: bearer 3b32893e-d0db-4db9-ad2b-1bcd81d8b522
 
+Proxy-Connection: Keep-Alive
 
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 
+Accept-Encoding: br,deflate,gzip,x-gzip
 
+
 
+<> 2023-06-15T235817.200.json
 
+
 
+###
 
+
 
+GET http://127.0.0.1:9002/teacherCourseSchedule/liveCourseScheduleTime?courseScheduleId=2548
 
+Authorization: bearer 3b32893e-d0db-4db9-ad2b-1bcd81d8b522
 
+Proxy-Connection: Keep-Alive
 
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 
+Accept-Encoding: br,deflate,gzip,x-gzip
 
+
 
+<> 2023-06-15T235608.200.json
 
+
 
+###
 
+
 
 GET http://127.0.0.1:9002/teacherCourseSchedule/liveCourseScheduleTime?courseScheduleId=2550
 
 Authorization: bearer 3b32893e-d0db-4db9-ad2b-1bcd81d8b522
 
 Proxy-Connection: Keep-Alive
 
@@ -383,234 +533,3 @@ Accept-Encoding: br,deflate,gzip,x-gzip
 
 
 ###
 
 
-POST http://127.0.0.1:9002/teacherAttendance/getLiveCurrentCourseStudents
 
-authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
 
-Content-Type: application/json
 
-Content-Length: 69
 
-Connection: Keep-Alive
 
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 
-Accept-Encoding: br,deflate,gzip,x-gzip
 
-
 
-{
 
-  "courseScheduleId": "2328",
 
-  "status": "SHARE",
 
-  "search": ""
 
-}
 
-
 
-<> 2023-06-14T124937.200.json
 
-
 
-###
 
-
 
-POST http://127.0.0.1:9002/teacherAttendance/getLiveCurrentCourseStudents
 
-authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
 
-Content-Type: application/json
 
-Content-Length: 69
 
-Connection: Keep-Alive
 
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 
-Accept-Encoding: br,deflate,gzip,x-gzip
 
-
 
-{
 
-  "courseScheduleId": "2328",
 
-  "status": "SHARE",
 
-  "search": ""
 
-}
 
-
 
-<> 2023-06-14T124615.200.json
 
-
 
-###
 
-
 
-POST http://127.0.0.1:9002/teacherAttendance/getLiveCurrentCourseStudents
 
-authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
 
-Content-Type: application/json
 
-Content-Length: 69
 
-Connection: Keep-Alive
 
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 
-Accept-Encoding: br,deflate,gzip,x-gzip
 
-
 
-{
 
-  "courseScheduleId": "2328",
 
-  "status": "SHARE",
 
-  "search": ""
 
-}
 
-
 
-<> 2023-06-14T124548.200.json
 
-
 
-###
 
-
 
-POST http://127.0.0.1:9002/teacherAttendance/getLiveCurrentCourseStudents
 
-authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
 
-Content-Type: application/json
 
-Content-Length: 69
 
-Connection: Keep-Alive
 
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 
-Accept-Encoding: br,deflate,gzip,x-gzip
 
-
 
-{
 
-  "courseScheduleId": "2328",
 
-  "status": "SHARE",
 
-  "search": ""
 
-}
 
-
 
-<> 2023-06-14T124526.200.json
 
-
 
-###
 
-
 
-POST http://127.0.0.1:9002/teacherAttendance/getLiveCurrentCourseStudents
 
-authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
 
-Content-Type: application/json
 
-Content-Length: 69
 
-Connection: Keep-Alive
 
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 
-Accept-Encoding: br,deflate,gzip,x-gzip
 
-
 
-{
 
-  "courseScheduleId": "2328",
 
-  "status": "SHARE",
 
-  "search": ""
 
-}
 
-
 
-<> 2023-06-14T124513.200.json
 
-
 
-###
 
-
 
-POST http://127.0.0.1:9002/teacherAttendance/getLiveCurrentCourseStudents
 
-authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
 
-Content-Type: application/json
 
-Content-Length: 69
 
-Connection: Keep-Alive
 
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 
-Accept-Encoding: br,deflate,gzip,x-gzip
 
-
 
-{
 
-  "courseScheduleId": "2328",
 
-  "status": "SHARE",
 
-  "search": ""
 
-}
 
-
 
-<> 2023-06-14T124441.200.json
 
-
 
-###
 
-
 
-POST http://127.0.0.1:9002/teacherCourseSchedule/liveCoursePage
 
-authorization: bearer a9b023c1-f525-4b95-8723-0ca14b038624
 
-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-14T111123.200.json
 
-
 
-###
 
-
 
-POST http://127.0.0.1:8005/vipGroupManage/liveStudentList
 
-Authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
 
-Content-Type: application/json
 
-Content-Length: 78
 
-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,
 
-  "liveGroupId": 102,
 
-  "search": "测试59611"
 
-}
 
-
 
-<> 2023-06-14T105403.200.json
 
-
 
-###
 
-
 
-POST http://127.0.0.1:8005/vipGroupManage/liveStudentList
 
-Authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
 
-Content-Type: application/json
 
-Content-Length: 77
 
-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,
 
-  "liveGroupId": 102,
 
-  "search": "测试5961"
 
-}
 
-
 
-<> 2023-06-14T105355.200.json
 
-
 
-###
 
-
 
-POST http://127.0.0.1:8005/vipGroupManage/liveStudentList
 
-Authorization: bearer b2d082f2-2e51-4880-8119-5471c5287bf9
 
-Content-Type: application/json
 
-Content-Length: 51
 
-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,
 
-  "liveGroupId": 102
 
-}
 
-
 
-<> 2023-06-14T105332.200.json
 
-
 
-###
 
-
 
-GET http://127.0.0.1:8005/task/liveCourseRemind
 
-Connection: Keep-Alive
 
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 
-Accept-Encoding: br,deflate,gzip,x-gzip
 
-
 
-<> 2023-06-13T183554.200.json
 
-
 
-###
 
-
 
-GET http://127.0.0.1:8005/task/liveCourseRemind
 
-Connection: Keep-Alive
 
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 
-Accept-Encoding: br,deflate,gzip,x-gzip
 
-
 
-<> 2023-06-13T183425.200.json
 
-
 
-###
 
-
 
-GET http://127.0.0.1:8005/task/liveCourseRemind
 
-Connection: Keep-Alive
 
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 
-Accept-Encoding: br,deflate,gzip,x-gzip
 
-
 
-<> 2023-06-13T183308.200.json
 
-
 
-###
 
-
 
-GET http://127.0.0.1:8005/task/liveCourseRemind
 
-Connection: Keep-Alive
 
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 
-Accept-Encoding: br,deflate,gzip,x-gzip
 
-
 
-<> 2023-06-13T182452.200.json
 
-
 
-###
 
-
 
-GET http://127.0.0.1:9001/studentVipGroup/joinLiveRoomByShare?courseScheduleId=2179
 
-Authorization: bearer 093517b0-c9a4-407b-b558-0d71bf157b16
 
-Connection: Keep-Alive
 
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 
-Accept-Encoding: br,deflate,gzip,x-gzip
 
-
 
-<> 2023-06-12T163044.200.json
 
-
 
-###
 
-

+ 12 - 10
mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java
View File 

@@ -6517,14 +6517,15 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
 
 			for (int i = 0; i < beforeCourse.size(); i++) {
 
 				CourseSchedule current = beforeCourse.get(i);
 
-				CourseSchedule next = null;
 
-				if (i + 1 < beforeCourse.size()) {
 
-					next = beforeCourse.get(i + 1);
 
+				if (current.getContinuousCourse()) {
 
+					newCourseSchedules.add(current);
 
 				}
 
-				if (next != null && current.getContinuousCourse()) {
 
-					newCourseSchedules.addAll(Lists.newArrayList(current, next));
 
+
 
+				if (i + 1 < beforeCourse.size()) {
 
+					CourseSchedule next = beforeCourse.get(i + 1);
 
 
 					if (!next.getContinuousCourse()) {
 
+						newCourseSchedules.add(next);
 
 						break;
 
 					}
 
 				}
 
@@ -6555,14 +6556,15 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
 
 			for (int i = 0; i < afterCourse.size(); i++) {
 
 				CourseSchedule current = afterCourse.get(i);
 
-				CourseSchedule next = null;
 
-				if (i + 1 < afterCourse.size()) {
 
-					next = afterCourse.get(i + 1);
 
+				if (current.getContinuousCourse()) {
 
+					newCourseSchedules.add(current);
 
 				}
 
-				if (next != null && current.getContinuousCourse()) {
 
-					newCourseSchedules.addAll(Lists.newArrayList(current, next));
 
+
 
+				if (i + 1 < afterCourse.size()) {
 
+					CourseSchedule next = afterCourse.get(i + 1);
 
 
 					if (!next.getContinuousCourse()) {
 
+						newCourseSchedules.add(next);
 
 						break;
 
 					}
 
 				}