im

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

@@ -1,3 +1,83 @@
+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
+
+{
+//  "keyword": "宁老师",
+//  "groupType": "SCHOOL",
+  "roleType": "ORCHESTRA_MANAGER",
+  "musicGroupId": "23053118101300001",
+  "lockFlag": false
+}
+
+<> 2023-06-01T095232.200.json
+
+###
+
+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
+
+{
+//  "keyword": "宁老师",
+//  "groupType": "SCHOOL",
+  "roleType": "ORCHESTRA_MANAGER",
+  "musicGroupId": "23053118101300001",
+  "lockFlag": false
+}
+
+<> 2023-06-01T095217.200.json
+
+###
+
+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
+
+{
+//  "keyword": "宁老师",
+//  "groupType": "SCHOOL",
+  "roleType": "ORCHESTRA_MANAGER",
+  "musicGroupId": "23053118101300001",
+  "lockFlag": false
+}
+
+<> 2023-06-01T095044.200.json
+
+###
+
+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
+
+{
+//  "keyword": "宁老师",
+//  "groupType": "SCHOOL",
+  "roleType": "ORCHESTRA_MANAGER",
+  "musicGroupId": "23053118101300001",
+  "lockFlag": false
+}
+
+<> 2023-06-01T095011.200.json
+
+###
+
 POST http://127.0.0.1:8005/schoolStaff/updateAccount
 Authorization: bearer 6882e681-2f9a-4f8f-aee1-79b1e42de850
 Content-Type: application/json
@@ -583,49 +663,3 @@ Accept-Encoding: br,deflate,gzip,x-gzip
 
 ###
 
-GET http://127.0.0.1:9001/open/liveBroadcastRoom/visitorFingerprint?code=0413aiGa1MplkF0RyGGa1sf6S143aiGv
-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-<> 2023-05-18T145309.200.json
-
-###
-
-GET http://127.0.0.1:9001/open/sysConfig/queryByParamName?paramName=wechat_appid
-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-<> 2023-05-17T183050.200.json
-
-###
-
-POST http://127.0.0.1:8005/imLiveBroadcastRoomMember/queryRoomMember
-Content-Type: application/json
-Authorization: bearer 70c30cec-f77c-4871-beaa-ce4b5224bf3e
-Content-Length: 82
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-{"rows":10,"page":1,"roomUid":"LIVE-2248324-1683860932420", "excludeBlacklist": 0}
-
-<> 2023-05-12T191018.200.json
-
-###
-
-POST http://127.0.0.1:8005/imLiveBroadcastRoomMember/queryRoomMember
-Content-Type: application/json
-Authorization: bearer 70c30cec-f77c-4871-beaa-ce4b5224bf3e
-Content-Length: 82
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-{"rows":10,"page":1,"roomUid":"LIVE-2248324-1683860932420", "excludeBlacklist": 1}
-
-<> 2023-05-12T191000.200.json
-
-###
-

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

@@ -638,11 +638,6 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
      */
     @Override
     public List<ImGroup> queryByUserId(ImGroupWrapper.ImQuery query) {
-        if (query.getGroupType() != null && StringUtils.isNotBlank(query.getMusicGroupId())) {
-            if (query.getGroupType().equals(ImGroup.GroupTypeEnum.SCHOOL)) {
-                return new ArrayList<>();
-            }
-        }
         return imGroupDao.getByUserId(query);
     }
 

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

@@ -290,11 +290,6 @@ public class ImUserFriendServiceImpl extends BaseServiceImpl<Long, ImUserFriend>
      */
     @Override
     public List<ImUserFriendDto> queryFriendListByUserId(ImGroupWrapper.ImQuery query) {
-        if (StringUtils.isNotBlank(query.getRoleType()) && StringUtils.isNotBlank(query.getMusicGroupId())) {
-            if (!query.getRoleType().equals("STUDENT")) {
-                return new ArrayList<>();
-            }
-        }
         return imUserFriendDao.getFriendListByUserId(query);
 
     }

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

@@ -19,11 +19,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 
+import com.ym.mec.biz.service.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -129,31 +131,6 @@ import com.ym.mec.biz.dal.page.RegistrationOrPreQueryInfo;
 import com.ym.mec.biz.dal.page.StudentPreRegistrationQueryInfo;
 import com.ym.mec.biz.dal.page.StudentRegistrationQueryInfo;
 import com.ym.mec.biz.event.source.SendSeoMessageSource;
-import com.ym.mec.biz.service.ClassGroupService;
-import com.ym.mec.biz.service.ClassGroupStudentMapperService;
-import com.ym.mec.biz.service.CloudTeacherOrderService;
-import com.ym.mec.biz.service.ContractService;
-import com.ym.mec.biz.service.CourseScheduleService;
-import com.ym.mec.biz.service.CourseScheduleStudentPaymentService;
-import com.ym.mec.biz.service.GoodsService;
-import com.ym.mec.biz.service.ImGroupMemberService;
-import com.ym.mec.biz.service.MusicGroupPaymentCalenderActivityService;
-import com.ym.mec.biz.service.MusicGroupPaymentCalenderMemberService;
-import com.ym.mec.biz.service.MusicGroupPaymentCalenderRepairService;
-import com.ym.mec.biz.service.MusicGroupPaymentCalenderService;
-import com.ym.mec.biz.service.MusicGroupSubjectPlanService;
-import com.ym.mec.biz.service.StudentPaymentOrderDetailService;
-import com.ym.mec.biz.service.StudentPaymentOrderService;
-import com.ym.mec.biz.service.StudentRegistrationService;
-import com.ym.mec.biz.service.StudentService;
-import com.ym.mec.biz.service.SubjectService;
-import com.ym.mec.biz.service.SysConfigService;
-import com.ym.mec.biz.service.SysCouponCodeService;
-import com.ym.mec.biz.service.SysMessageService;
-import com.ym.mec.biz.service.SysTenantConfigService;
-import com.ym.mec.biz.service.SysUserCashAccountDetailService;
-import com.ym.mec.biz.service.SysUserCashAccountLogService;
-import com.ym.mec.biz.service.SysUserCashAccountService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.entity.ImResult;
@@ -274,6 +251,9 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
     @Autowired
     private MusicGroupPaymentCalenderRepairService musicGroupPaymentCalenderRepairService;
 
+    @Autowired
+    private ImUserFriendService imUserFriendService;
+
     @Override
     public BaseDAO<Long, StudentRegistration> getDAO() {
         return studentRegistrationDao;
@@ -640,6 +620,9 @@ 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;
     }
 
@@ -1286,6 +1269,10 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                     musicGroupStudentFeeDao.insert(musicGroupStudentFee);
                 }
             }
+
+            // 刷新im
+            imUserFriendService.refreshGroupImUserFriend(studentRegistration.getMusicGroupId(), null);
+
             //主班新增余额日志
             if (amount.doubleValue() != 0d && masterTotalPrice.doubleValue() > 0d) {
                 StudentCourseFeeDetail studentCourseFeeDetail = new StudentCourseFeeDetail();

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

@@ -314,8 +314,10 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
             this.sendGroupMessage(imMessageDto);
         }
         if (StringUtils.isNotBlank(messageDto.getUserTargetIds())) {
+            String targetIds = messageDto.getTargetIds();
             messageDto.setTargetIds(messageDto.getUserTargetIds());
             ImMessageDto imMessageDto = this.getImGroupMessage(messageDto);
+            messageDto.setTargetIds(targetIds);
             imMessageDto.setMessageContent(imageToBase64(bufferedImage, "png"));
             imMessageDto.setFileUrl(messageDto.getFileUrl());
             this.sendImMessage(imMessageDto);

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

@@ -173,9 +173,12 @@
         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 (u.real_name_ like concat('%',#{param.keyword},'%') or iuf.friend_nickname_ like concat('%',#{param.keyword},'%'))
+            and (iuf.friend_nickname_ like concat('%',#{param.keyword},'%'))
         </if>
 
         <if test="param.musicGroupId != null and param.musicGroupId != ''">
@@ -183,6 +186,9 @@
         </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

mec-student/src/main/java/com/ym/mec/student/controller/ImGroupController.java

@@ -72,7 +72,7 @@ public class ImGroupController extends BaseController {
 			dto = new ImUserFriendDto();
 			SysUser user = sysUserService.queryUserById(userId);
 			dto.setFriend(user);
-			if (user.getUserType().contains("STUDENT")) {
+			if (user.getUserType().contains("STUDENT") || user.getUserType().contains("SCHOOL")) {
 				dto.setFriendNickname(user.getUsername());
 			} else {
 				dto.setFriendNickname(user.getRealName());

mec-teacher/src/main/java/com/ym/mec/teacher/controller/ImGroupController.java

@@ -93,7 +93,7 @@ public class ImGroupController extends BaseController {
 			dto = new ImUserFriendDto();
 			SysUser user = userLoginService.queryUserById(userId);
 			dto.setFriend(user);
-			if (user.getUserType().contains("STUDENT")) {
+            if (user.getUserType().contains("STUDENT") || user.getUserType().contains("SCHOOL")) {
 				dto.setFriendNickname(user.getUsername());
 			} else {
 				dto.setFriendNickname(user.getRealName());

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

@@ -115,7 +115,7 @@ public class ImGroupController extends BaseController {
 			dto.setFriend(user);
 			//这里由原来的优先取老师的realName改成了优先取学员的username，
 			// 因为管理员在修改通讯录备注的时候，如果是多角色，优先改的是学员的username
-			if (user.getUserType().contains("STUDENT")) {
+            if (user.getUserType().contains("STUDENT") || user.getUserType().contains("SCHOOL")) {
 				dto.setFriendNickname(user.getUsername());
 			} else {
 				dto.setFriendNickname(user.getRealName());