|
@@ -8,16 +8,21 @@ import com.yonge.cooleshow.biz.dal.entity.ImGroup;
|
|
|
import com.yonge.cooleshow.biz.dal.entity.ImGroupMember;
|
|
|
import com.yonge.cooleshow.biz.dal.entity.ImGroupMemberAudit;
|
|
|
import com.yonge.cooleshow.biz.dal.enums.AuditStatusEnum;
|
|
|
+import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
|
|
|
+import com.yonge.cooleshow.biz.dal.enums.MessageTypeEnum;
|
|
|
import com.yonge.cooleshow.biz.dal.queryInfo.ImGroupMemberAuditQueryInfo;
|
|
|
import com.yonge.cooleshow.biz.dal.service.ImGroupMemberAuditService;
|
|
|
import com.yonge.cooleshow.biz.dal.service.ImGroupMemberService;
|
|
|
import com.yonge.cooleshow.biz.dal.service.ImGroupService;
|
|
|
+import com.yonge.cooleshow.biz.dal.vo.AuditUserInfo;
|
|
|
import com.yonge.toolset.base.exception.BizException;
|
|
|
+import com.yonge.toolset.thirdparty.message.MessageSenderPluginContext;
|
|
|
import io.rong.models.group.GroupMember;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
+import org.springframework.util.CollectionUtils;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
import java.util.*;
|
|
@@ -41,6 +46,9 @@ public class ImGroupMemberAuditServiceImpl extends ServiceImpl<ImGroupMemberAudi
|
|
|
@Resource
|
|
|
private ImGroupMemberService imGroupMemberService;
|
|
|
|
|
|
+ @Resource
|
|
|
+ private SysMessageServiceImpl sysMessageService;
|
|
|
+
|
|
|
@Override
|
|
|
public ImGroupMemberAuditDao getDao() {
|
|
|
return this.baseMapper;
|
|
@@ -84,6 +92,22 @@ public class ImGroupMemberAuditServiceImpl extends ServiceImpl<ImGroupMemberAudi
|
|
|
imGroupService.syncGroupMemberNum(imGroup.getId());
|
|
|
//加入融云群
|
|
|
imGroupMemberService.join(groupMembers,groupId);
|
|
|
+ } else {
|
|
|
+ Map<Long,String> receivers = new HashMap<>();
|
|
|
+
|
|
|
+ // 群创建人
|
|
|
+ SysUser user = sysUserFeignService.queryUserById(imGroup.getCreateBy());
|
|
|
+ // 申请人
|
|
|
+ SysUser auditUser = sysUserFeignService.queryUserById(imGroupMemberAudit.getUserId());
|
|
|
+
|
|
|
+ receivers.put(user.getId(), user.getPhone());
|
|
|
+ try {
|
|
|
+ sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_JOIN_FANSGROUP,
|
|
|
+ receivers, null, 0, null, ClientEnum.TEACHER.getCode(), auditUser.getUsername(),imGroup.getName());
|
|
|
+ } catch (Exception e) {
|
|
|
+ log.warn("学生入群消息发送失败,{}",e.getMessage());
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -111,6 +135,33 @@ public class ImGroupMemberAuditServiceImpl extends ServiceImpl<ImGroupMemberAudi
|
|
|
imGroupService.syncGroupMemberNum(imGroup.getId());
|
|
|
//加入融云群
|
|
|
imGroupMemberService.join(groupMembers,imGroup.getId());
|
|
|
+
|
|
|
+ sendMessage(auditIds);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 发送通过消息
|
|
|
+ *
|
|
|
+ * @param auditIds
|
|
|
+ */
|
|
|
+ private void sendMessage(String auditIds) {
|
|
|
+ List<AuditUserInfo> auditUserInfoList = baseMapper.selectAuditUserInfo(auditIds);
|
|
|
+
|
|
|
+ if (CollectionUtils.isEmpty(auditUserInfoList)) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ for (AuditUserInfo auditUserInfo : auditUserInfoList) {
|
|
|
+ Map<Long,String> receivers = new HashMap<>();
|
|
|
+
|
|
|
+ receivers.put(auditUserInfo.getAuditUserId(), auditUserInfo.getAuditUserPhone());
|
|
|
+ try {
|
|
|
+ sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.FANSGROUP_APPLY_SUCCESS,
|
|
|
+ receivers, null, 0, null, ClientEnum.STUDENT.getCode(), auditUserInfo.getGroupUsername(),
|
|
|
+ auditUserInfo.getGroupName());
|
|
|
+ } catch (Exception e) {
|
|
|
+ log.warn("学生入群申请通过消息发送失败,{}",e.getMessage());
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|