好友列表查询

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

@@ -1,3 +1,63 @@
+POST http://127.0.0.1:8005/imGroup/schoolQueryFriendList
+Authorization: bearer cc492cd7-4ba9-413c-a7e9-d9d9b44f6d07
+Content-Type: application/json
+Content-Length: 144
+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": "STUDENT",
+  "musicGroupId": "23050514590600001",
+//  "lockFlag": false
+}
+
+<> 2023-06-01T195106.200.json
+
+###
+
+POST http://127.0.0.1:8005/imGroup/schoolQueryFriendList
+Authorization: bearer cc492cd7-4ba9-413c-a7e9-d9d9b44f6d07
+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
+
+{
+//  "keyword": "宁老师",
+//  "groupType": "SCHOOL",
+  "roleType": "ORCHESTRA_TEACHER",
+  "musicGroupId": "23050514590600001",
+//  "lockFlag": false
+}
+
+<> 2023-06-01T195052.200.json
+
+###
+
+POST http://127.0.0.1:8005/imGroup/schoolQueryFriendList
+Authorization: bearer cc492cd7-4ba9-413c-a7e9-d9d9b44f6d07
+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
+
+{
+//  "keyword": "宁老师",
+//  "groupType": "SCHOOL",
+  "roleType": "ORCHESTRA_MANAGER",
+  "musicGroupId": "23050514590600001",
+//  "lockFlag": false
+}
+
+<> 2023-06-01T195028.200.json
+
+###
+
 POST http://127.0.0.1:8005/imGroup/schoolQueryGroupList
 Authorization: bearer 0fde0d90-4ffd-4d34-990c-eca290471d6b
 Content-Type: application/json
@@ -796,33 +856,3 @@ Accept-Encoding: br,deflate,gzip,x-gzip
 
 ###
 
-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-19T175057.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
-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
-
-###
-
-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-19T175037.200.json
-
-###
-

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ClassGroupTeacherMapperDao.java

@@ -168,4 +168,6 @@ public interface ClassGroupTeacherMapperDao extends BaseDAO<Long, ClassGroupTeac
      * @param musicGroupIds 乐团编号
      */
     List<ClassGroupTeacherMapper> findAllByMusicGroupIds(@Param("musicGroupIds") List<String> musicGroupIds);
+
+    List<ClassGroupTeacherMapper> getByMusicGroupId(@Param("musicGroupId") String musicGroupId);
 }

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

@@ -292,13 +292,27 @@ public class ImUserFriendServiceImpl extends BaseServiceImpl<Long, ImUserFriend>
     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 (StringUtils.isNotBlank(query.getMusicGroupId()) ) {
+            MusicGroup musicGroup = musicGroupDao.get(query.getMusicGroupId());
+
+            List<Integer> teacherIds = new ArrayList<>();
+            List<Integer> studentIds = new ArrayList<>();
+            List<ClassGroupTeacherMapper> classGroupTeacherMappers = classGroupTeacherMapperDao.getByMusicGroupId(query.getMusicGroupId());
+            if (CollectionUtils.isNotEmpty(classGroupTeacherMappers)) {
+                for (ClassGroupTeacherMapper classGroupTeacherMapper : classGroupTeacherMappers) {
+                    teacherIds.add(classGroupTeacherMapper.getUserId());
+                }
+            }
+
+            List<StudentRegistration> musicGroupStu = studentRegistrationDao.getMusicGroupStu(query.getMusicGroupId());
+            if (CollectionUtils.isNotEmpty(musicGroupStu)) {
+                for (StudentRegistration studentRegistration : musicGroupStu) {
+                    studentIds.add(studentRegistration.getUserId());
                 }
             }
+            userIds.add(musicGroup.getEducationalTeacherId());
+            userIds.addAll(teacherIds);
+            userIds.addAll(studentIds);
 
         }
         if (CollectionUtils.isNotEmpty(userIds)) {

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

@@ -256,4 +256,8 @@
             #{musicGroupId}
         </foreach>
     </select>
+
+    <select id="getByMusicGroupId" resultMap="ClassGroupTeacherMapper">
+        SELECT * FROM class_group_teacher_mapper WHERE music_group_id_=#{musicGroupId}
+    </select>
 </mapper>

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

@@ -177,10 +177,6 @@
         <if test="param.keyword != null and param.keyword != ''">
             and (iuf.friend_nickname_ like concat('%',#{param.keyword},'%'))
         </if>
-
-        <if test="param.musicGroupId != null and param.musicGroupId != ''">
-            and cgs.music_group_id_ = #{param.musicGroupId}
-        </if>
         <if test="param.roleType != null and param.roleType != ''">
             and iuf.role_type_ = #{param.roleType}
         </if>