场地管理，消息

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

@@ -1,665 +1,828 @@
-POST http://127.0.0.1:8005/imGroup/schoolQueryFriendList
-Authorization: bearer e19ed0c6-c024-4378-bf4e-789e0379eab6
+POST http://127.0.0.1:8005/imGroup/schoolQueryGroupList
+Authorization: bearer 0fde0d90-4ffd-4d34-990c-eca290471d6b
 Content-Type: application/json
-Content-Length: 152
+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": "SCHOOL",
-  "roleType": "ORCHESTRA_MANAGER",
-  "musicGroupId": "23053118101300001",
-  "lockFlag": false
+//    "keyword": "乐团预报名",
+//    "groupType": "NORMAL",
+    "musicGroupId": "23050515070500001",
+  //  "roleType": ""
 }
 
-<> 2023-06-01T095232.200.json
+<> 2023-06-01T162816.200.json
 
 ###
 
-POST http://127.0.0.1:8005/imGroup/schoolQueryFriendList
-Authorization: bearer e19ed0c6-c024-4378-bf4e-789e0379eab6
+POST http://127.0.0.1:8005/imGroup/schoolQueryGroupList
+Authorization: bearer 0fde0d90-4ffd-4d34-990c-eca290471d6b
 Content-Type: application/json
-Content-Length: 152
+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": "SCHOOL",
-  "roleType": "ORCHESTRA_MANAGER",
-  "musicGroupId": "23053118101300001",
-  "lockFlag": false
+//    "keyword": "乐团预报名",
+//    "groupType": "NORMAL",
+//    "musicGroupId": "142",
+  //  "roleType": ""
 }
 
-<> 2023-06-01T095217.200.json
+<> 2023-06-01T162734.200.json
 
 ###
 
-POST http://127.0.0.1:8005/imGroup/schoolQueryFriendList
-Authorization: bearer 07bef4ad-6d9e-46e0-8fd3-c24a2fd11332
+POST http://127.0.0.1:8005/imGroup/schoolQueryGroupList
+Authorization: bearer 9bdd96e1-8895-4200-aba5-241e1cb12e3c
 Content-Type: application/json
-Content-Length: 152
+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": "SCHOOL",
-  "roleType": "ORCHESTRA_MANAGER",
-  "musicGroupId": "23053118101300001",
-  "lockFlag": false
+//    "keyword": "乐团预报名",
+//    "groupType": "NORMAL",
+//    "musicGroupId": "142",
+  //  "roleType": ""
 }
 
-<> 2023-06-01T095044.200.json
+<> 2023-06-01T162700.200.json
 
 ###
 
-POST http://127.0.0.1:8005/imGroup/schoolQueryFriendList
-Authorization: bearer 07bef4ad-6d9e-46e0-8fd3-c24a2fd11332
+POST http://127.0.0.1:8005/imGroup/schoolQueryGroupList
+Authorization: bearer 81d0c352-fcc8-4812-87f5-0f7a68d10451
 Content-Type: application/json
-Content-Length: 152
+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": "SCHOOL",
-  "roleType": "ORCHESTRA_MANAGER",
-  "musicGroupId": "23053118101300001",
-  "lockFlag": false
+//    "keyword": "乐团预报名",
+//    "groupType": "NORMAL",
+//    "musicGroupId": "142",
+  //  "roleType": ""
 }
 
-<> 2023-06-01T095011.200.json
+<> 2023-06-01T162613.200.json
 
 ###
 
-POST http://127.0.0.1:8005/schoolStaff/updateAccount
-Authorization: bearer 6882e681-2f9a-4f8f-aee1-79b1e42de850
+POST http://127.0.0.1:8005/imGroup/schoolQueryGroupList
+Authorization: bearer 81d0c352-fcc8-4812-87f5-0f7a68d10451
 Content-Type: application/json
-Content-Length: 71
+Content-Length: 116
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-{"coopId":19,"phone":"19900990111","staffId":1839,"userType":"TEACHER"}
+{
+//    "keyword": "乐团预报名",
+    "groupType": "NORMAL",
+//    "musicGroupId": "142",
+  //  "roleType": ""
+}
 
-<> 2023-05-30T145725.200.json
+<> 2023-06-01T162603.200.json
 
 ###
 
-POST http://127.0.0.1:8005/schoolStaff/updateAccount
-Authorization: bearer 6882e681-2f9a-4f8f-aee1-79b1e42de850
+POST http://127.0.0.1:8005/imGroup/schoolQueryGroupList
+Authorization: bearer 81d0c352-fcc8-4812-87f5-0f7a68d10451
 Content-Type: application/json
-Content-Length: 71
+Content-Length: 114
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-{"coopId":16,"phone":"19900990111","staffId":1820,"userType":"TEACHER"}
+{
+//    "keyword": "乐团预报名",
+    "groupType": "NORMAL",
+    "musicGroupId": "142",
+  //  "roleType": ""
+}
 
-<> 2023-05-30T145417.200.json
+<> 2023-06-01T162557.200.json
 
 ###
 
-POST http://127.0.0.1:8005/schoolStaff/updateAccount
-Authorization: bearer 6882e681-2f9a-4f8f-aee1-79b1e42de850
+POST http://127.0.0.1:8005/imGroup/schoolQueryGroupList
+Authorization: bearer 241259a3-5563-410e-bed2-cd887f294b8b
 Content-Type: application/json
-Content-Length: 71
+Content-Length: 114
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-{"coopId":16,"phone":"19900990111","staffId":1837,"userType":"TEACHER"}
+{
+//    "keyword": "乐团预报名",
+    "groupType": "NORMAL",
+    "musicGroupId": "142",
+  //  "roleType": ""
+}
 
-<> 2023-05-30T145329.200.json
+<> 2023-06-01T162533.200.json
 
 ###
 
-POST http://127.0.0.1:8005/schoolStaff/updateAccount
-Authorization: bearer 6882e681-2f9a-4f8f-aee1-79b1e42de850
+POST http://127.0.0.1:8005/imGroup/schoolQueryGroupList
+Authorization: bearer 241259a3-5563-410e-bed2-cd887f294b8b
 Content-Type: application/json
-Content-Length: 71
+Content-Length: 114
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-{"coopId":19,"phone":"19900990114","staffId":1837,"userType":"TEACHER"}
+{
+//    "keyword": "乐团预报名",
+    "groupType": "NORMAL",
+    "musicGroupId": "142",
+  //  "roleType": ""
+}
 
-<> 2023-05-30T144905.200.json
+<> 2023-06-01T162517.200.json
 
 ###
 
-POST http://127.0.0.1:8005/schoolStaff/updateAccount
-Authorization: bearer 9e3a8ca3-b369-485a-aae0-5cdf17d46e61
+POST http://127.0.0.1:8005/imGroup/schoolQueryGroupList
+Authorization: bearer 241259a3-5563-410e-bed2-cd887f294b8b
 Content-Type: application/json
-Content-Length: 71
+Content-Length: 118
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-{"coopId":19,"phone":"19900990114","staffId":1837,"userType":"TEACHER"}
+{
+//    "keyword": "乐团预报名",
+//    "groupType": "NORMAL",
+//    "musicGroupId": "142",
+  //  "roleType": ""
+}
 
-<> 2023-05-30T144848.200.json
+<> 2023-06-01T162055.200.json
 
 ###
 
-POST http://127.0.0.1:8005/open/school/staffSave
+POST http://127.0.0.1:8005/imGroup/schoolQueryGroupList
+Authorization: bearer 241259a3-5563-410e-bed2-cd887f294b8b
 Content-Type: application/json
-coopId: 19
-tenantId: 1
-Content-Length: 129
+Content-Length: 114
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
 {
-  "schoolId": 3,
-  "userType": "ORCHESTRA_LEADER",
-  "username": "测试113",
-  "mobile": "19900990114",
-  "smsCode" : 666666
+//    "keyword": "乐团预报名",
+    "groupType": "NORMAL",
+    "musicGroupId": "142",
+  //  "roleType": ""
 }
 
-<> 2023-05-29T183339.200.json
+<> 2023-06-01T162047.200.json
 
 ###
 
-GET http://127.0.0.1:8005/imGroup/queryGroupMemberList?imGroupId=62
+POST http://127.0.0.1:8005/imGroup/schoolQueryGroupList
+Authorization: bearer 241259a3-5563-410e-bed2-cd887f294b8b
 Content-Type: application/json
-Authorization: bearer 9e3a8ca3-b369-485a-aae0-5cdf17d46e61
+Content-Length: 132
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-05-29T182845.200.json
+{
+//    "keyword": "乐团预报名",
+//    "groupType": "NORMAL",
+//    "musicGroupId": "23050515070500001",
+  //  "roleType": ""
+}
+
+<> 2023-06-01T162031.200.json
 
 ###
 
-POST http://127.0.0.1:8005/coursePatrolEvaluation/pageStat
-Authorization: bearer 9e3a8ca3-b369-485a-aae0-5cdf17d46e61
+POST http://127.0.0.1:8005/imGroup/schoolQueryFriendList
+Authorization: bearer 241259a3-5563-410e-bed2-cd887f294b8b
 Content-Type: application/json
-coopId: 12
-Content-Length: 58
+Content-Length: 154
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
 {
-  "startTime": "2023-01-01",
-  "endTime": "2024-04-04"
+//  "keyword": "宁老师",
+//  "groupType": "SCHOOL",
+  "roleType": "ORCHESTRA_MANAGER",
+  "musicGroupId": "23042416211000001",
+//  "lockFlag": false
 }
 
-<> 2023-05-29T182738.200.json
+<> 2023-06-01T161949.200.json
 
 ###
 
-POST http://127.0.0.1:8005/coursePatrolEvaluation/pageStat
-Authorization: bearer 703c9711-ca6d-45c3-9583-34d7b9d86705
+POST http://127.0.0.1:8005/imGroup/schoolQueryFriendList
+Authorization: bearer 241259a3-5563-410e-bed2-cd887f294b8b
 Content-Type: application/json
-coopId: 12
-Content-Length: 58
+Content-Length: 154
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
 {
-  "startTime": "2023-01-01",
-  "endTime": "2024-04-04"
+//  "keyword": "宁老师",
+//  "groupType": "SCHOOL",
+  "roleType": "ORCHESTRA_MANAGER",
+  "musicGroupId": "23042416211000001",
+//  "lockFlag": false
 }
 
-<> 2023-05-29T182713.200.json
+<> 2023-06-01T161053.200.json
 
 ###
 
-GET http://127.0.0.1:8005/schoolStaff/cooperation
-Authorization: bearer 66862b1d-938b-467e-b7c9-65f77f0e7347
-tenantId: 1
-coopId: 14
+POST http://127.0.0.1:8005/imGroup/schoolQueryFriendList
+Authorization: bearer 241259a3-5563-410e-bed2-cd887f294b8b
+Content-Type: application/json
+Content-Length: 156
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-05-25T181738.200.json
+{
+//  "keyword": "宁老师",
+//  "groupType": "SCHOOL",
+//  "roleType": "ORCHESTRA_MANAGER",
+  "musicGroupId": "23042416211000001",
+//  "lockFlag": false
+}
+
+<> 2023-06-01T161046.200.json
 
 ###
 
-GET http://127.0.0.1:8005/schoolStaff/cooperation
-Authorization: bearer 66862b1d-938b-467e-b7c9-65f77f0e7347
-tenantId: 1
-coopId: 14
+POST http://127.0.0.1:8005/imGroup/schoolQueryFriendList
+Authorization: bearer 241259a3-5563-410e-bed2-cd887f294b8b
+Content-Type: application/json
+Content-Length: 156
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-05-25T181606.200.json
+{
+//  "keyword": "宁老师",
+//  "groupType": "SCHOOL",
+//  "roleType": "ORCHESTRA_MANAGER",
+  "musicGroupId": "23042416211000001",
+//  "lockFlag": false
+}
+
+<> 2023-06-01T160758.200.json
 
 ###
 
-GET http://127.0.0.1:8005/schoolStaff/cooperation
-Authorization: bearer 66862b1d-938b-467e-b7c9-65f77f0e7347
-tenantId: 1
-coopId: 14
+POST http://127.0.0.1:8005/imGroup/schoolQueryFriendList
+Authorization: bearer 241259a3-5563-410e-bed2-cd887f294b8b
+Content-Type: application/json
+Content-Length: 158
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-05-25T180935.200.json
+{
+//  "keyword": "宁老师",
+//  "groupType": "SCHOOL",
+//  "roleType": "ORCHESTRA_MANAGER",
+//  "musicGroupId": "23053118101300001",
+//  "lockFlag": false
+}
+
+<> 2023-06-01T160642.200.json
 
 ###
 
-GET http://127.0.0.1:8005/schoolStaff/cooperation
-Authorization: bearer 66862b1d-938b-467e-b7c9-65f77f0e7347
-tenantId: 1
-coopId: 14
+POST http://127.0.0.1:8005/imGroup/schoolQueryFriendList
+Authorization: bearer 241259a3-5563-410e-bed2-cd887f294b8b
+Content-Type: application/json
+Content-Length: 154
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-05-25T180923.200.json
+{
+//  "keyword": "宁老师",
+//  "groupType": "SCHOOL",
+  "roleType": "ORCHESTRA_MANAGER",
+  "musicGroupId": "23053118101300001",
+//  "lockFlag": false
+}
+
+<> 2023-06-01T160633.200.json
 
 ###
 
-GET http://127.0.0.1:8005/schoolStaff/cooperation
-Authorization: bearer 3f804d4e-b7f0-41ad-8dbf-119a0c54becc
-tenantId: 1
-coopId: 1
+POST http://127.0.0.1:8005/imGroup/schoolQueryFriendList
+Authorization: bearer 241259a3-5563-410e-bed2-cd887f294b8b
+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
 
-<> 2023-05-25T180355.200.json
+{
+//  "keyword": "宁老师",
+//  "groupType": "SCHOOL",
+  "roleType": "ORCHESTRA_MANAGER",
+  "musicGroupId": "23053118101300001",
+  "lockFlag": false
+}
+
+<> 2023-06-01T160625.200.json
 
 ###
 
-POST http://127.0.0.1:8005/imGroup/schoolQueryFriendList
-Authorization: bearer 07bef4ad-6d9e-46e0-8fd3-c24a2fd11332
+POST http://127.0.0.1:8005/studentManage/userDetail
+Authorization: bearer 81d0c352-fcc8-4812-87f5-0f7a68d10451
 Content-Type: application/json
-Content-Length: 155
+coopId: 1
+Content-Length: 63
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
 {
-//  "keyword": "宁老师",
-//  "groupType": "SCHOOL",
-//  "musicGroupId": "23042416211000001",
-//  "roleType": "ORCHESTRA_TEACHER"
-  "lockFlag": false
+  "studentId": 2248340,
+  "musicGroupId": 23042419330600001
 }
 
-<> 2023-05-24T195305.200.json
+<> 2023-06-01T160136.200.json
 
 ###
 
-POST https://test.dayaedu.com/api-auth/smsLogin?phone=19900990033&clientId=school&clientSecret=school&smsCode=666666
-Content-Length: 0
+POST http://127.0.0.1:8005/classGroup/teachingPointCourse
+Authorization: bearer 81d0c352-fcc8-4812-87f5-0f7a68d10451
+Content-Type: application/json
+coopId: 7
+Content-Length: 68
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-05-24T194548.200.json
+{"startTime":"2023-05-22","endTime":"2023-05-28","page":1,"rows":20}
+
+<> 2023-06-01T155146.200.json
 
 ###
 
-GET http://127.0.0.1:8005/imGroup/queryGroupMemberList?imGroupId=62
+POST http://127.0.0.1:8005/classGroup/teachingPointCourse
+Authorization: bearer 81d0c352-fcc8-4812-87f5-0f7a68d10451
 Content-Type: application/json
-Authorization: bearer 387ba749-39ac-4a02-a183-00cf8ac29f10
+coopId: 7
+Content-Length: 68
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-05-24T193935.200.json
+{"startTime":"2023-05-22","endTime":"2023-05-28","page":1,"rows":20}
+
+<> 2023-06-01T155031.200.json
 
 ###
 
-GET http://127.0.0.1:9001/imLiveBroadcastRoom/joinRoom?roomUid=LIVE-2248336-1684474334299&userId=2248479&microphoneFlag=false
-Authorization: bearer aeec0ea9-4079-4765-aa72-346a7d37e735
+POST http://127.0.0.1:8005/classGroup/teachingPointCourse
+Authorization: bearer 81d0c352-fcc8-4812-87f5-0f7a68d10451
+Content-Type: application/json
+coopId: 7
+Content-Length: 68
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-05-19T175057.200.json
+{"startTime":"2023-05-22","endTime":"2023-05-28","page":1,"rows":20}
+
+<> 2023-06-01T154820.200.json
 
 ###
 
-GET http://127.0.0.1:9001/imLiveBroadcastRoom/joinRoom?roomUid=LIVE-2248336-1684474334299&userId=2248479&microphoneFlag=true
-Authorization: bearer aeec0ea9-4079-4765-aa72-346a7d37e735
+POST http://127.0.0.1:8005/classGroup/teachingPointCourse
+Authorization: bearer 387ba749-39ac-4a02-a183-00cf8ac29f10
+Content-Type: application/json
+coopId: 7
+Content-Length: 68
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-05-19T175049.200.json
+{"startTime":"2023-05-22","endTime":"2023-05-28","page":1,"rows":20}
+
+<> 2023-06-01T154745.200.json
 
 ###
 
-GET http://127.0.0.1:9001/imLiveBroadcastRoom/joinRoom?roomUid=LIVE-2248336-1684474334299&userId=2248479&microphoneFlag=false
-Authorization: bearer aeec0ea9-4079-4765-aa72-346a7d37e735
+POST http://127.0.0.1:8005/imGroup/updateImGroup
+Authorization: bearer 81d0c352-fcc8-4812-87f5-0f7a68d10451
+Content-Type: application/json
+tenantId: 1
+Content-Length: 54
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-05-19T175037.200.json
+{
+	"name": "考虑图",
+	"id": "1660958104046542850"
+}
+
+<> 2023-06-01T145140.200.json
 
 ###
 
-GET http://127.0.0.1:9001/imLiveBroadcastRoom/joinRoom?roomUid=LIVE-2248336-1684474334299&userId=2248479&microphoneFlag=false
-Authorization: bearer aeec0ea9-4079-4765-aa72-346a7d37e735
+POST http://127.0.0.1:8005/imGroup/updateImGroup
+Authorization: bearer 81d0c352-fcc8-4812-87f5-0f7a68d10451
+Content-Type: application/json
+Content-Length: 54
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-05-19T174858.200.json
+{
+	"name": "考虑图",
+	"id": "1660958104046542850"
+}
+
+<> 2023-06-01T145016.200.json
 
 ###
 
-GET http://127.0.0.1:9001/imLiveBroadcastRoom/joinRoom?roomUid=LIVE-2248336-1684474334299&userId=2248479&microphoneFlag=false
-Authorization: bearer aeec0ea9-4079-4765-aa72-346a7d37e735
+POST http://127.0.0.1:8005/imGroup/updateImGroup
+Authorization: bearer 0360886c-f5e4-40c4-ad35-d63a1f5995c6
+Content-Type: application/json
+Content-Length: 54
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-05-19T174628.200.json
+{
+	"name": "考虑图",
+	"id": "1660958104046542850"
+}
+
+<> 2023-06-01T144835.200.json
 
 ###
 
-POST http://127.0.0.1:8001/smsLogin
-Content-Type: application/x-www-form-urlencoded
-Content-Length: 100
+POST http://127.0.0.1:8005/imGroup/schoolQueryFriendList
+Authorization: bearer e19ed0c6-c024-4378-bf4e-789e0379eab6
+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
 
-clientId=student&clientSecret=student&phone=19900990088&smsCode=666666&deviceNum=190e35f7e15650ef33e
+{
+//  "keyword": "宁老师",
+//  "groupType": "SCHOOL",
+  "roleType": "ORCHESTRA_MANAGER",
+  "musicGroupId": "23053118101300001",
+  "lockFlag": false
+}
 
-<> 2023-05-19T174545.200.json
+<> 2023-06-01T095232.200.json
 
 ###
 
-GET http://127.0.0.1:9001/imLiveBroadcastRoom/joinRoom?roomUid=LIVE-2248336-1684474334299&userId=2248380&microphoneFlag=false
-Authorization: bearer b4d5c0d2-3faf-48f3-a5d6-6301cc1e1af6
+POST http://127.0.0.1:8005/imGroup/schoolQueryFriendList
+Authorization: bearer e19ed0c6-c024-4378-bf4e-789e0379eab6
+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
 
-<> 2023-05-19T174527.200.json
+{
+//  "keyword": "宁老师",
+//  "groupType": "SCHOOL",
+  "roleType": "ORCHESTRA_MANAGER",
+  "musicGroupId": "23053118101300001",
+  "lockFlag": false
+}
+
+<> 2023-06-01T095217.200.json
 
 ###
 
-GET http://127.0.0.1:9001/imLiveBroadcastRoom/joinRoom?roomUid=LIVE-2248336-1684474334299&userId=2248380&microphoneFlag=false
-Authorization: bearer b4d5c0d2-3faf-48f3-a5d6-6301cc1e1af6
+POST http://127.0.0.1:8005/imGroup/schoolQueryFriendList
+Authorization: bearer 07bef4ad-6d9e-46e0-8fd3-c24a2fd11332
+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
 
-<> 2023-05-19T174458.200.json
+{
+//  "keyword": "宁老师",
+//  "groupType": "SCHOOL",
+  "roleType": "ORCHESTRA_MANAGER",
+  "musicGroupId": "23053118101300001",
+  "lockFlag": false
+}
+
+<> 2023-06-01T095044.200.json
 
 ###
 
-GET http://127.0.0.1:9001/imLiveBroadcastRoom/joinRoom?roomUid=LIVE-2248336-1684474334299&userId=2248380&microphoneFlag=false
-Authorization: bearer b4d5c0d2-3faf-48f3-a5d6-6301cc1e1af6
+POST http://127.0.0.1:8005/imGroup/schoolQueryFriendList
+Authorization: bearer 07bef4ad-6d9e-46e0-8fd3-c24a2fd11332
+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
 
-<> 2023-05-19T174300.200.json
+{
+//  "keyword": "宁老师",
+//  "groupType": "SCHOOL",
+  "roleType": "ORCHESTRA_MANAGER",
+  "musicGroupId": "23053118101300001",
+  "lockFlag": false
+}
+
+<> 2023-06-01T095011.200.json
 
 ###
 
-GET http://127.0.0.1:9001/imLiveBroadcastRoom/joinRoom?roomUid=LIVE-2248336-1684474334299&userId=2248380&microphoneFlag=false
-Authorization: bearer b4d5c0d2-3faf-48f3-a5d6-6301cc1e1af6
+POST http://127.0.0.1:8005/schoolStaff/updateAccount
+Authorization: bearer 6882e681-2f9a-4f8f-aee1-79b1e42de850
+Content-Type: application/json
+Content-Length: 71
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-05-19T174052.200.json
+{"coopId":19,"phone":"19900990111","staffId":1839,"userType":"TEACHER"}
+
+<> 2023-05-30T145725.200.json
 
 ###
 
-POST http://127.0.0.1:8005/imLiveBroadcastRoomMember/queryRoomMember
-Authorization: bearer fcf13dd1-6f06-40ae-a36e-22b4df4d5d01
+POST http://127.0.0.1:8005/schoolStaff/updateAccount
+Authorization: bearer 6882e681-2f9a-4f8f-aee1-79b1e42de850
 Content-Type: application/json
-Content-Length: 45
+Content-Length: 71
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-{
-  "roomUid": "LIVE-2248336-1684474334299"
-}
+{"coopId":16,"phone":"19900990111","staffId":1820,"userType":"TEACHER"}
 
-<> 2023-05-19T173652.200.json
+<> 2023-05-30T145417.200.json
 
 ###
 
-POST http://127.0.0.1:8005/imLiveBroadcastRoomMember/queryRoomMember
-Authorization: bearer fcf13dd1-6f06-40ae-a36e-22b4df4d5d01
+POST http://127.0.0.1:8005/schoolStaff/updateAccount
+Authorization: bearer 6882e681-2f9a-4f8f-aee1-79b1e42de850
 Content-Type: application/json
-Content-Length: 45
+Content-Length: 71
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-{
-  "roomUid": "LIVE-2248336-1684474334299"
-}
+{"coopId":16,"phone":"19900990111","staffId":1837,"userType":"TEACHER"}
 
-<> 2023-05-19T173417.200.json
+<> 2023-05-30T145329.200.json
 
 ###
 
-POST http://127.0.0.1:8005/imLiveBroadcastRoomMember/queryRoomMember
-Authorization: bearer fcf13dd1-6f06-40ae-a36e-22b4df4d5d01
+POST http://127.0.0.1:8005/schoolStaff/updateAccount
+Authorization: bearer 6882e681-2f9a-4f8f-aee1-79b1e42de850
 Content-Type: application/json
-Content-Length: 2
+Content-Length: 71
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-{}
+{"coopId":19,"phone":"19900990114","staffId":1837,"userType":"TEACHER"}
 
-<> 2023-05-19T173333.200.json
+<> 2023-05-30T144905.200.json
 
 ###
 
-POST http://127.0.0.1:8005/imLiveBroadcastRoomMember/queryRoomMember
-Authorization: bearer fcf13dd1-6f06-40ae-a36e-22b4df4d5d01
-Content-Length: 2
-Content-Type: */*; charset=UTF-8
+POST http://127.0.0.1:8005/schoolStaff/updateAccount
+Authorization: bearer 9e3a8ca3-b369-485a-aae0-5cdf17d46e61
+Content-Type: application/json
+Content-Length: 71
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-{}
+{"coopId":19,"phone":"19900990114","staffId":1837,"userType":"TEACHER"}
 
-<> 2023-05-19T173320.200.json
+<> 2023-05-30T144848.200.json
 
 ###
 
-POST http://127.0.0.1:8005/imLiveBroadcastRoomMember/queryRoomMember
-Authorization: bearer fcf13dd1-6f06-40ae-a36e-22b4df4d5d01
-Content-Length: 0
+POST http://127.0.0.1:8005/open/school/staffSave
+Content-Type: application/json
+coopId: 19
+tenantId: 1
+Content-Length: 129
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-05-19T173307.200.json
+{
+  "schoolId": 3,
+  "userType": "ORCHESTRA_LEADER",
+  "username": "测试113",
+  "mobile": "19900990114",
+  "smsCode" : 666666
+}
+
+<> 2023-05-29T183339.200.json
 
 ###
 
-GET http://127.0.0.1:9001/imLiveBroadcastRoom/joinRoom?roomUid=LIVE-2248336-1684474334299&userId=2248380&microphoneFlag=false
-Authorization: bearer b4d5c0d2-3faf-48f3-a5d6-6301cc1e1af6
+GET http://127.0.0.1:8005/imGroup/queryGroupMemberList?imGroupId=62
+Content-Type: application/json
+Authorization: bearer 9e3a8ca3-b369-485a-aae0-5cdf17d46e61
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-05-19T173156.200.json
+<> 2023-05-29T182845.200.json
 
 ###
 
-POST http://localhost:9001/user/update
-Authorization: bearer b4d5c0d2-3faf-48f3-a5d6-6301cc1e1af6
-Content-Type: application/x-www-form-urlencoded
-Content-Length: 45
+POST http://127.0.0.1:8005/coursePatrolEvaluation/pageStat
+Authorization: bearer 9e3a8ca3-b369-485a-aae0-5cdf17d46e61
+Content-Type: application/json
+coopId: 12
+Content-Length: 58
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-username=ces&currentClass=1&currentGradeNum=3
+{
+  "startTime": "2023-01-01",
+  "endTime": "2024-04-04"
+}
 
-<> 2023-05-19T172903.200.json
+<> 2023-05-29T182738.200.json
 
 ###
 
-POST http://127.0.0.1:8001/smsLogin
-Content-Type: application/x-www-form-urlencoded
-Content-Length: 111
+POST http://127.0.0.1:8005/coursePatrolEvaluation/pageStat
+Authorization: bearer 703c9711-ca6d-45c3-9583-34d7b9d86705
+Content-Type: application/json
+coopId: 12
+Content-Length: 58
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-clientId=student&clientSecret=student&phone=19900990088&smsCode=666666&deviceNum=190e35f7e15650ef33e&isLessee=1
+{
+  "startTime": "2023-01-01",
+  "endTime": "2024-04-04"
+}
 
-<> 2023-05-19T172200.200.json
+<> 2023-05-29T182713.200.json
 
 ###
 
-POST http://127.0.0.1:8001/smsLogin
-Content-Type: application/x-www-form-urlencoded
-Content-Length: 111
+GET http://127.0.0.1:8005/schoolStaff/cooperation
+Authorization: bearer 66862b1d-938b-467e-b7c9-65f77f0e7347
+tenantId: 1
+coopId: 14
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-clientId=student&clientSecret=student&phone=19900990088&smsCode=666666&deviceNum=190e35f7e15650ef33e&isLessee=1
-
-<> 2023-05-19T172138.200.json
+<> 2023-05-25T181738.200.json
 
 ###
 
-POST http://127.0.0.1:8001/smsLogin
-Content-Type: application/x-www-form-urlencoded
-Content-Length: 111
+GET http://127.0.0.1:8005/schoolStaff/cooperation
+Authorization: bearer 66862b1d-938b-467e-b7c9-65f77f0e7347
+tenantId: 1
+coopId: 14
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-clientId=student&clientSecret=student&phone=19900990088&smsCode=666666&deviceNum=190e35f7e15650ef33e&isLessee=1
-
-<> 2023-05-19T172025.200.json
+<> 2023-05-25T181606.200.json
 
 ###
 
-POST http://127.0.0.1:8001/smsLogin
-Content-Type: application/x-www-form-urlencoded
-Content-Length: 111
+GET http://127.0.0.1:8005/schoolStaff/cooperation
+Authorization: bearer 66862b1d-938b-467e-b7c9-65f77f0e7347
+tenantId: 1
+coopId: 14
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-clientId=student&clientSecret=student&phone=19900990088&smsCode=666666&deviceNum=190e35f7e15650ef33e&isLessee=1
-
-<> 2023-05-19T171911.200.json
+<> 2023-05-25T180935.200.json
 
 ###
 
-POST http://127.0.0.1:8001/smsLogin
-Content-Type: application/x-www-form-urlencoded
-Content-Length: 111
+GET http://127.0.0.1:8005/schoolStaff/cooperation
+Authorization: bearer 66862b1d-938b-467e-b7c9-65f77f0e7347
+tenantId: 1
+coopId: 14
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-clientId=student&clientSecret=student&phone=19900990088&smsCode=666666&deviceNum=190e35f7e15650ef33e&isLessee=1
-
-<> 2023-05-19T171355.200.json
+<> 2023-05-25T180923.200.json
 
 ###
 
-POST http://127.0.0.1:8001/smsLogin
-Content-Type: application/x-www-form-urlencoded
-Content-Length: 111
+GET http://127.0.0.1:8005/schoolStaff/cooperation
+Authorization: bearer 3f804d4e-b7f0-41ad-8dbf-119a0c54becc
+tenantId: 1
+coopId: 1
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-clientId=student&clientSecret=student&phone=19900990088&smsCode=666666&deviceNum=190e35f7e15650ef33e&isLessee=1
-
-<> 2023-05-19T171229.200.json
+<> 2023-05-25T180355.200.json
 
 ###
 
-POST http://127.0.0.1:8001/smsLogin
-Content-Type: application/x-www-form-urlencoded
-Content-Length: 111
+POST http://127.0.0.1:8005/imGroup/schoolQueryFriendList
+Authorization: bearer 07bef4ad-6d9e-46e0-8fd3-c24a2fd11332
+Content-Type: application/json
+Content-Length: 155
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-clientId=student&clientSecret=student&phone=19900990088&smsCode=666666&deviceNum=190e35f7e15650ef33e&isLessee=1
+{
+//  "keyword": "宁老师",
+//  "groupType": "SCHOOL",
+//  "musicGroupId": "23042416211000001",
+//  "roleType": "ORCHESTRA_TEACHER"
+  "lockFlag": false
+}
 
-<> 2023-05-19T171144.200.json
+<> 2023-05-24T195305.200.json
 
 ###
 
-POST http://127.0.0.1:8001/smsLogin
-Content-Type: application/x-www-form-urlencoded
-Content-Length: 111
+POST https://test.dayaedu.com/api-auth/smsLogin?phone=19900990033&clientId=school&clientSecret=school&smsCode=666666
+Content-Length: 0
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-clientId=student&clientSecret=student&phone=19900990088&smsCode=666666&deviceNum=190e35f7e15650ef33e&isLessee=1
-
-<> 2023-05-19T171124.200.json
+<> 2023-05-24T194548.200.json
 
 ###
 
-POST http://127.0.0.1:8001/smsLogin
-Content-Type: application/x-www-form-urlencoded
-Content-Length: 114
+GET http://127.0.0.1:8005/imGroup/queryGroupMemberList?imGroupId=62
+Content-Type: application/json
+Authorization: bearer 387ba749-39ac-4a02-a183-00cf8ac29f10
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-clientId=student&clientSecret=student&phone=19900990088&smsCode=666666&deviceNum=190e35f7e15650ef33e&isLessee=true
-
-<> 2023-05-19T171047.200.json
+<> 2023-05-24T193935.200.json
 
 ###
 
-POST http://127.0.0.1:8001/smsLogin?clientId=student&clientSecret=student&phone=19900880088&smsCode=666666&isLessee=true
-Content-Type: application/x-www-form-urlencoded
-Content-Length: 0
+GET http://127.0.0.1:9001/imLiveBroadcastRoom/joinRoom?roomUid=LIVE-2248336-1684474334299&userId=2248479&microphoneFlag=false
+Authorization: bearer aeec0ea9-4079-4765-aa72-346a7d37e735
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-05-19T170945.200.json
+<> 2023-05-19T175057.200.json
 
 ###
 
-POST http://127.0.0.1:8001/smsLogin?clientId=student&clientSecret=student&phone=19900880088&smsCode=666666&isLessee=true
-Content-Type: application/json
-Content-Length: 0
+GET http://127.0.0.1:9001/imLiveBroadcastRoom/joinRoom?roomUid=LIVE-2248336-1684474334299&userId=2248479&microphoneFlag=true
+Authorization: bearer aeec0ea9-4079-4765-aa72-346a7d37e735
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-05-19T170850.200.json
+<> 2023-05-19T175049.200.json
 
 ###
 
-GET http://127.0.0.1:9001/open/liveBroadcastRoom/visitorFingerprint?code=0413aiGa1MplkF0RyGGa1sf6S143aiGv
+GET http://127.0.0.1:9001/imLiveBroadcastRoom/joinRoom?roomUid=LIVE-2248336-1684474334299&userId=2248479&microphoneFlag=false
+Authorization: bearer aeec0ea9-4079-4765-aa72-346a7d37e735
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-05-18T145501.200.json
+<> 2023-05-19T175037.200.json
 
 ###
 

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/ImGroupWrapper.java

@@ -4,6 +4,8 @@ import com.ym.mec.biz.dal.entity.ImGroup;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 public class ImGroupWrapper {
 
     @Data
@@ -26,6 +28,8 @@ public class ImGroupWrapper {
 
         @ApiModelProperty("用户状态 false ：查询未锁定")
         private Boolean lockFlag;
+
+        private List<Integer> userIds;
     }
 
 

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/TeachingPointWrapper.java

@@ -37,6 +37,9 @@ public class TeachingPointWrapper {
         @ApiModelProperty("结束时间")
         private Date endTime;
 
+
+        @ApiModelProperty("课程状态")
+        private CourseStatusEnum courseStatus;
     }
 
 
@@ -74,6 +77,19 @@ public class TeachingPointWrapper {
         @ApiModelProperty(value = "课程状态")
         private CourseStatusEnum courseStatus;
 
+
+        @ApiModelProperty("课程日期")
+        private Date courseDate;
+
+        /** 上课时间 */
+        @ApiModelProperty(value = "上课时间")
+        private Date startClassTime;
+
+        /** 结束时间 */
+        @ApiModelProperty(value = "结束时间")
+        private Date endClassTime;
+
+
         @ApiModelProperty("乐团ID")
         private String musicGroupId;
 

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

@@ -5576,6 +5576,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                 courseTeachingPoint.setSignPhoto(attendance.getSignInAttachments());
                 courseTeachingPoint.setSignOutPhoto(attendance.getSignOutAttachments());
             }
+            // 设置上课时间
+            courseTeachingPoint.setStartClassTime(DateUtil.startDateAndEndTime(courseTeachingPoint.getCourseDate(), courseTeachingPoint.getStartClassTime()));
+            courseTeachingPoint.setEndClassTime(DateUtil.startDateAndEndTime(courseTeachingPoint.getCourseDate(), courseTeachingPoint.getEndClassTime()));
+
         }
 
         return page.setRecords(courseTeachingPoints);

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

@@ -290,6 +290,22 @@ public class ImUserFriendServiceImpl extends BaseServiceImpl<Long, ImUserFriend>
      */
     @Override
     public List<ImUserFriendDto> queryFriendListByUserId(ImGroupWrapper.ImQuery query) {
+
+        List<Integer> userIds = new ArrayList<>();
+        if (StringUtils.isNotBlank(query.getMusicGroupId()) && StringUtils.isNotBlank(query.getRoleType())) {
+            if (query.getRoleType().equals(EFriendRoleType.ORCHESTRA_MANAGER.name())) {
+                MusicGroup musicGroup = musicGroupDao.get(query.getMusicGroupId());
+                if (musicGroup != null) {
+                    userIds.add(musicGroup.getEducationalTeacherId());
+                }
+            }
+
+        }
+        if (CollectionUtils.isNotEmpty(userIds)) {
+            query.setUserIds(userIds);
+            query.setMusicGroupId(null);
+        }
+
         return imUserFriendDao.getFriendListByUserId(query);
 
     }

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

@@ -826,6 +826,11 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
                     studentRegistration.setMusicGroupStatus(StudentMusicGroupStatusEnum.NORMAL);
                     studentRegistrationDao.update(studentRegistration);
 
+
+                    // 刷新im
+                    imUserFriendService.refreshGroupImUserFriend(studentRegistration.getMusicGroupId(), null);
+
+
                     //统计变更学员数
                     groupEventSource.musicGroupStudentChangeEvent(musicGroupPaymentCalender.getMusicGroupId(), StudentMusicGroupStatusEnum.NORMAL, new ArrayList<>(Arrays.asList(Integer.parseInt(studentId))));
                 }

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

@@ -3292,6 +3292,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 studentRegistrationDao.update(studentRegistration);
                 //统计变更学员数
                 groupEventSource.musicGroupStudentChangeEvent(studentRegistration.getMusicGroupId(), StudentMusicGroupStatusEnum.NORMAL, new ArrayList<>(Arrays.asList(userId)));
+
+                // 刷新im
+                imUserFriendService.refreshGroupImUserFriend(studentRegistration.getMusicGroupId(), null);
             }
 
             MusicGroup musicGroup = musicGroupDao.get(musicGroupId);

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

@@ -620,9 +620,6 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.SMS_APPLY_MESSAGE, map, null, 0, "", "",
                 studentRegistration.getParentsName(), subject.getName(), serverPhone);
 
-        // 刷新im
-        imUserFriendService.refreshGroupImUserFriend(studentRegistration.getMusicGroupId(), null);
-
         return studentRegistration;
     }
 

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

@@ -117,6 +117,9 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
     @Autowired
     private SubjectService subjectService;
 
+    @Autowired
+    private StudentService studentService;
+
 
     @Override
     public BaseDAO<Integer, Student> getDAO() {
@@ -1460,6 +1463,13 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
             }
         }
 
+        // 机构
+        Organization organization = organizationDao.get(studentDetail.getOrganId());
+        if (organization != null) {
+            //年级
+            studentDetail.setCurrentGrade(studentService.getStudentGrade(organization.getGradeType(), studentDetail.getCurrentGradeNum()));
+        }
+
         return studentDetail;
     }
 

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

@@ -296,7 +296,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 	@Override
 	public void batchSendImGroupImgMessage(ImSendGroupMessage messageDto) throws Exception {
 		URL url = new URL(messageDto.getFileUrl());
-		BufferedImage bufferedImage = Thumbnails.of(url).scale(0.1f).outputQuality(0.25f).asBufferedImage();
+		BufferedImage bufferedImage = Thumbnails.of("logs/1685600361362.jpg").scale(0.1f).outputQuality(0.25f).asBufferedImage();
 		ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
 		ImageIO.write(bufferedImage, "png", outputStream);
 		byte[] bytes = outputStream.toByteArray();
@@ -320,6 +320,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
             messageDto.setTargetIds(targetIds);
             imMessageDto.setMessageContent(imageToBase64(bufferedImage, "png"));
             imMessageDto.setFileUrl(messageDto.getFileUrl());
+            imMessageDto.setObjectName(messageDto.getObjectName());
             this.sendImMessage(imMessageDto);
         }
 	}

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

@@ -10,10 +10,16 @@
         ,mg.name_ as musicGroupName
         ,cs.actual_teacher_id_ as teacherId
         ,cs.teaching_point_ as teachingPoint
+        ,cs.class_date_ as courseDate
+        ,cs.start_class_time_ as startClassTime
+        ,cs.end_class_time_ as endClassTime
         from course_schedule cs
         left join music_group mg on mg.id_ = cs.music_group_id_
         <where>
             mg.del_flag_ = 0
+            <if test="param.courseStatus != null">
+                and cs.status_ = #{param.courseStatus}
+            </if>
             <if test="param.cooperationOrganId != null">
                 and mg.cooperation_organ_id_ = #{param.cooperationOrganId}
             </if>

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

@@ -271,8 +271,9 @@
     </update>
 
 	<select id="getByUserId" resultMap="ImGroup">
-        SELECT ig.* FROM im_group_member igm
+        SELECT distinct ig.* FROM im_group_member igm
         LEFT JOIN im_group ig ON igm.im_group_id_ = ig.id_
+        left join class_group cg on ig.id_ = cg.id_
         where 1 =1
         <if test="param.userId != null">
             AND igm.user_id_ = #{param.userId}
@@ -281,7 +282,7 @@
             AND (ig.name_ like concat('%',#{param.keyword},'%') or ig.tags_ like concat('%',#{param.keyword},'%'))
         </if>
         <if test="param.musicGroupId != null and param.musicGroupId != ''">
-            and ig.id_ = #{param.musicGroupId}
+            and cg.music_group_id_ = #{param.musicGroupId}
         </if>
         <if test="param.groupType != null">
             and ig.group_type_ = #{param.groupType.code}

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

@@ -173,9 +173,6 @@
         LEFT JOIN student st ON st.user_id_ = u.id_
         left join student_registration cgs on cgs.user_id_ = st.user_id_
         LEFT JOIN `subject` s ON s.id_ = st.subject_id_list_
-        <if test="param.musicGroupId != null and param.musicGroupId != ''">
-            left join music_group mg on mg.id_ = #{param.musicGroupId}
-        </if>
         WHERE iuf.user_id_ = #{param.userId}
         <if test="param.keyword != null and param.keyword != ''">
             and (iuf.friend_nickname_ like concat('%',#{param.keyword},'%'))
@@ -186,12 +183,15 @@
         </if>
         <if test="param.roleType != null and param.roleType != ''">
             and iuf.role_type_ = #{param.roleType}
-            <if test="param.musicGroupId != null and param.musicGroupId != ''">
-                and mg.educational_teacher_id_ = iuf.friend_id_
-            </if>
         </if>
         <if test="param.lockFlag != null and !param.lockFlag">
             and u.lock_flag_ = 0
         </if>
+        <if test="param.userIds != null and param.userIds.size() != 0">
+            and iuf.friend_id_ in
+            <foreach collection="param.userIds" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
     </select>
 </mapper>

mec-im/src/main/java/com/ym/controller/PrivateController.java

@@ -3,11 +3,16 @@ package com.ym.controller;
 import com.ym.mec.common.entity.ImMessageDto;
 import com.ym.mec.common.entity.ImPrivateMessage;
 import com.ym.mec.common.entity.ImTxtMessage;
+import com.ym.pojo.NoticeMessage;
 import com.ym.service.MessageService;
+import io.rong.messages.FileMessage;
+import io.rong.messages.ImgMessage;
 import io.rong.messages.TxtMessage;
+import io.rong.messages.UserInfo;
 import io.rong.models.message.PrivateMessage;
 import io.rong.models.message.RecallMessage;
 import io.rong.models.message.TemplateMessage;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -27,8 +32,23 @@ public class PrivateController {
     @RequestMapping(value = "/send", method = RequestMethod.POST)
     public Object send(@RequestBody ImMessageDto imMessageDto) throws Exception {
         PrivateMessage privateMessage = new PrivateMessage();
-        TxtMessage txtMessage = new TxtMessage(imMessageDto.getMessageContent(),imMessageDto.getExtra());
-        privateMessage.setContent(txtMessage);
+        String objectName = imMessageDto.getObjectName();
+        UserInfo userInfo = new UserInfo();
+        if(imMessageDto.getUserInfo() != null){
+            BeanUtils.copyProperties(imMessageDto.getUserInfo(),userInfo);
+        }
+        if("RC:ImgMsg".equals(objectName)){
+            ImgMessage imgMessage = new ImgMessage(imMessageDto.getMessageContent(),imMessageDto.getExtra(),imMessageDto.getFileUrl());
+            imgMessage.setUser(userInfo);
+            privateMessage.setContent(imgMessage);
+        }else if("RC:FileMsg".equals(objectName)){
+            FileMessage imgMessage = new FileMessage(imMessageDto.getFileName(),imMessageDto.getFileSize(),imMessageDto.getFileUrl(),imMessageDto.getExtra());
+            privateMessage.setContent(imgMessage);
+        }else {
+            TxtMessage txtMessage = new TxtMessage(imMessageDto.getMessageContent(),imMessageDto.getExtra());
+            txtMessage.setUser(userInfo);
+            privateMessage.setContent(txtMessage);
+        }
         privateMessage.setTargetId(imMessageDto.getTargetIds());
         privateMessage.setSenderId(imMessageDto.getSenderId());
         privateMessage.setObjectName(imMessageDto.getObjectName());

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/message/provider/JiguangPushPlugin.java

@@ -38,6 +38,12 @@ public class JiguangPushPlugin implements MessageSenderPlugin, InitializingBean
     @Value("${push.jiguang.masterSecret.system}")
     private String systemMasterSecret;
 
+
+    @Value("${push.jiguang.appKey.school}")
+    private String schoolAppKey;
+    @Value("${push.jiguang.masterSecret.school}")
+    private String schoolMasterSecret;
+
     @Value("${push.jiguang.apns_production:false}")
     private boolean apns_production = true; // 推送环境 True 表示推送生产环境，False 表示要推送开发环境
 
@@ -140,6 +146,7 @@ public class JiguangPushPlugin implements MessageSenderPlugin, InitializingBean
      */
     private String push(String[] alias, String alert, String content, String url, String type, String sound, String channelId) {
         String base64_auth_string = "";
+        String base64_auth_string1 = "";
         JSONObject androidIntent = null;
         switch (type) {
             case "STUDENT":
@@ -158,11 +165,19 @@ public class JiguangPushPlugin implements MessageSenderPlugin, InitializingBean
                 break;
             default:
                 base64_auth_string = encryptBASE64(this.systemAppKey + ":" + this.systemMasterSecret);
+                base64_auth_string1 = encryptBASE64(this.schoolAppKey + ":" + this.schoolMasterSecret);
                 break;
         }
         String authorization = "Basic " + base64_auth_string;
         JSONObject jsonObject = generateJson(alias, alert, content, url, sound, channelId, androidIntent,type);
-        return sendPostRequest(jsonObject.toString(), authorization);
+        String s = sendPostRequest(jsonObject.toString(), authorization);
+
+        if (StringUtils.isNotEmpty(base64_auth_string1)) {
+            String authorization1 = "Basic " + base64_auth_string1;
+            jsonObject = generateJson(alias, alert, content, url, sound, channelId, androidIntent,type);
+            return sendPostRequest(jsonObject.toString(), authorization1);
+        }
+        return s;
     }
 
     /**

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

@@ -8,6 +8,7 @@ import com.ym.mec.biz.dal.dao.ClassGroupDao;
 import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
+import com.ym.mec.biz.dal.enums.CourseStatusEnum;
 import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.SalarySettlementTypeEnum;
 import com.ym.mec.biz.dal.page.ClassGroupQueryInfo;
@@ -441,6 +442,9 @@ public class ClassGroupController extends BaseController {
             return succeed(new PageInfo<>());
         }
         queryInfo.setCooperationOrganId(coopId);
+        if (queryInfo.getCourseStatus() == null) {
+            queryInfo.setCourseStatus(CourseStatusEnum.OVER);
+        }
 
         IPage<TeachingPointWrapper.CourseTeachingPoint> courseTeachingPointIPage = courseScheduleService.teachingPointCourse(queryInfo);