排序

.idea/httpRequests/http-requests-log.http

@@ -1,4 +1,109 @@
 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
+
+###
+
+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-08T111624.200.json
+
+###
+
+POST http://127.0.0.1:9002/teacherCourseSchedule/liveCoursePage
+authorization: bearer 1238347b-3b06-444e-9d35-d122639121ad
+Content-Type: application/json
+Content-Length: 146
+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-08T111544.200.json
+
+###
+
+POST http://127.0.0.1:9002/teacherCourseSchedule/liveCoursePage
 Authorization: bearer 3c1eec84-6ee9-4c70-a4a8-d857d57338f6
 Content-Type: application/json
 Content-Length: 146
@@ -643,98 +748,3 @@ Accept-Encoding: br,deflate,gzip,x-gzip
 
 ###
 
-POST http://127.0.0.1:8005/imGroup/schoolQueryGroupList
-Authorization: bearer 0fde0d90-4ffd-4d34-990c-eca290471d6b
-Content-Type: application/json
-Content-Length: 130
-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-{
-//    "keyword": "乐团预报名",
-//    "groupType": "NORMAL",
-    "musicGroupId": "23050515070500001",
-  //  "roleType": ""
-}
-
-<> 2023-06-01T162816.200.json
-
-###
-
-POST http://127.0.0.1:8005/imGroup/schoolQueryGroupList
-Authorization: bearer 0fde0d90-4ffd-4d34-990c-eca290471d6b
-Content-Type: application/json
-Content-Length: 118
-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-{
-//    "keyword": "乐团预报名",
-//    "groupType": "NORMAL",
-//    "musicGroupId": "142",
-  //  "roleType": ""
-}
-
-<> 2023-06-01T162734.200.json
-
-###
-
-POST http://127.0.0.1:8005/imGroup/schoolQueryGroupList
-Authorization: bearer 9bdd96e1-8895-4200-aba5-241e1cb12e3c
-Content-Type: application/json
-Content-Length: 118
-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-{
-//    "keyword": "乐团预报名",
-//    "groupType": "NORMAL",
-//    "musicGroupId": "142",
-  //  "roleType": ""
-}
-
-<> 2023-06-01T162700.200.json
-
-###
-
-POST http://127.0.0.1:8005/imGroup/schoolQueryGroupList
-Authorization: bearer 81d0c352-fcc8-4812-87f5-0f7a68d10451
-Content-Type: application/json
-Content-Length: 118
-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-{
-//    "keyword": "乐团预报名",
-//    "groupType": "NORMAL",
-//    "musicGroupId": "142",
-  //  "roleType": ""
-}
-
-<> 2023-06-01T162613.200.json
-
-###
-
-POST http://127.0.0.1:8005/imGroup/schoolQueryGroupList
-Authorization: bearer 81d0c352-fcc8-4812-87f5-0f7a68d10451
-Content-Type: application/json
-Content-Length: 116
-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-{
-//    "keyword": "乐团预报名",
-    "groupType": "NORMAL",
-//    "musicGroupId": "142",
-  //  "roleType": ""
-}
-
-<> 2023-06-01T162603.200.json
-
-###
-

mec-biz/src/main/java/com/ym/mec/biz/service/VipGroupService.java

@@ -476,4 +476,9 @@ public interface VipGroupService extends BaseService<Long, VipGroup> {
      * @param id 直播课id
      */
     Boolean del(Integer id);
+
+    /**
+     * 关闭直播间
+     */
+    void closeLiveCourseRoom();
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupServiceImpl.java

@@ -5046,4 +5046,9 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
         vipGroupDao.del(id);
         return true;
     }
+
+    @Override
+    public void closeLiveCourseRoom() {
+
+    }
 }

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

@@ -55,7 +55,7 @@
     WHERE
     (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
     AND (cs.is_lock_=0 OR cs.is_lock_ IS NULL)
-    and cs.type_ = 'LIVE' and ilbr.os_ = 'client'
+    and cs.type_ = 'LIVE'
     <if test="param.startTime != null">
         AND cs.class_date_ &gt;= date_format(#{param.startTime},'%Y-%m-%d')
     </if>
@@ -69,6 +69,6 @@
     <if test="param.search != null and param.search != ''">
         AND (cs.name_ LIKE CONCAT('%',#{param.search},'%'))
     </if>
-    ORDER BY start_class_time_
+    order by field(ilbr.live_state_, 1, 0, 2) asc, ilbr.live_start_time_ desc
     </select>
 </mapper>

mec-web/src/main/java/com/ym/mec/web/controller/TaskController.java

@@ -670,7 +670,7 @@ public class TaskController extends BaseController {
     @ApiOperation("关闭直播课房间")
     @GetMapping("/closeLiveCourseRoom")
     public Object closeLiveCourseRoom() {
-//        vipGroupService.closeLiveCourseRoom();
+        vipGroupService.closeLiveCourseRoom();
         return succeed();
     }
 }