|
@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.google.common.collect.Lists;
|
|
import com.google.common.collect.Lists;
|
|
import com.microsvc.toolkit.common.webportal.exception.BizException;
|
|
import com.microsvc.toolkit.common.webportal.exception.BizException;
|
|
|
|
+import com.yonge.cooleshow.api.feign.dto.ImUserInfo;
|
|
import com.yonge.cooleshow.auth.api.entity.SysUser;
|
|
import com.yonge.cooleshow.auth.api.entity.SysUser;
|
|
import com.yonge.cooleshow.biz.dal.dao.StudentDao;
|
|
import com.yonge.cooleshow.biz.dal.dao.StudentDao;
|
|
import com.yonge.cooleshow.biz.dal.dao.SubjectDao;
|
|
import com.yonge.cooleshow.biz.dal.dao.SubjectDao;
|
|
@@ -30,6 +31,7 @@ import com.yonge.cooleshow.biz.dal.service.ImGroupService;
|
|
import com.yonge.cooleshow.biz.dal.service.ImUserFriendService;
|
|
import com.yonge.cooleshow.biz.dal.service.ImUserFriendService;
|
|
import com.yonge.cooleshow.biz.dal.service.StudentService;
|
|
import com.yonge.cooleshow.biz.dal.service.StudentService;
|
|
import com.yonge.cooleshow.biz.dal.service.StudentTotalService;
|
|
import com.yonge.cooleshow.biz.dal.service.StudentTotalService;
|
|
|
|
+import com.yonge.cooleshow.biz.dal.service.im.ImGroupCoreService;
|
|
import com.yonge.cooleshow.biz.dal.service.SysConfigService;
|
|
import com.yonge.cooleshow.biz.dal.service.SysConfigService;
|
|
import com.yonge.cooleshow.biz.dal.service.TenantInfoService;
|
|
import com.yonge.cooleshow.biz.dal.service.TenantInfoService;
|
|
import com.yonge.cooleshow.biz.dal.service.UserTenantAlbumRecordService;
|
|
import com.yonge.cooleshow.biz.dal.service.UserTenantAlbumRecordService;
|
|
@@ -38,10 +40,12 @@ import com.yonge.cooleshow.biz.dal.vo.StudentHomeVo;
|
|
import com.yonge.cooleshow.biz.dal.vo.StudentVo;
|
|
import com.yonge.cooleshow.biz.dal.vo.StudentVo;
|
|
import com.yonge.cooleshow.biz.dal.vo.TeacherVo;
|
|
import com.yonge.cooleshow.biz.dal.vo.TeacherVo;
|
|
import com.yonge.cooleshow.biz.dal.wrapper.StudentWrapper;
|
|
import com.yonge.cooleshow.biz.dal.wrapper.StudentWrapper;
|
|
|
|
+import com.yonge.cooleshow.biz.dal.wrapper.im.ImGroupWrapper;
|
|
import com.yonge.cooleshow.common.constant.SysConfigConstant;
|
|
import com.yonge.cooleshow.common.constant.SysConfigConstant;
|
|
import com.yonge.cooleshow.common.entity.HttpResponseResult;
|
|
import com.yonge.cooleshow.common.entity.HttpResponseResult;
|
|
import com.yonge.cooleshow.common.enums.CacheNameEnum;
|
|
import com.yonge.cooleshow.common.enums.CacheNameEnum;
|
|
import com.yonge.cooleshow.common.enums.UserLockFlag;
|
|
import com.yonge.cooleshow.common.enums.UserLockFlag;
|
|
|
|
+import com.yonge.toolset.base.exception.BizException;
|
|
import com.yonge.cooleshow.common.enums.YesOrNoEnum;
|
|
import com.yonge.cooleshow.common.enums.YesOrNoEnum;
|
|
import com.yonge.toolset.base.util.StringUtil;
|
|
import com.yonge.toolset.base.util.StringUtil;
|
|
import com.yonge.toolset.mybatis.support.PageUtil;
|
|
import com.yonge.toolset.mybatis.support.PageUtil;
|
|
@@ -85,17 +89,14 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
|
|
private SysUserMapper sysUserMapper;
|
|
private SysUserMapper sysUserMapper;
|
|
@Autowired
|
|
@Autowired
|
|
private SubjectDao subjectDao;
|
|
private SubjectDao subjectDao;
|
|
- @Autowired
|
|
|
|
- private TenantInfoService tenantInfoService;
|
|
|
|
- @Autowired
|
|
|
|
- private UserTenantAlbumRecordService userTenantAlbumRecordService;
|
|
|
|
- @Autowired
|
|
|
|
- private SysConfigService sysConfigService;
|
|
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
private ImGroupService imGroupService;
|
|
private ImGroupService imGroupService;
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
|
|
+ private ImGroupCoreService imGroupCoreService;
|
|
|
|
+
|
|
|
|
+ @Autowired
|
|
private ImGroupMemberService imGroupMemberService;
|
|
private ImGroupMemberService imGroupMemberService;
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -125,6 +126,16 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
|
|
StudentHomeVo studentHomeVo = new StudentHomeVo();
|
|
StudentHomeVo studentHomeVo = new StudentHomeVo();
|
|
BeanUtils.copyProperties(detail, studentHomeVo);
|
|
BeanUtils.copyProperties(detail, studentHomeVo);
|
|
|
|
|
|
|
|
+ try {
|
|
|
|
+ ImGroupWrapper.ImUserInfo register = imGroupCoreService.register(user.getId().toString(),
|
|
|
|
+ ClientEnum.STUDENT.getCode(),
|
|
|
|
+ user.getUsername(),
|
|
|
|
+ user.getAvatar());
|
|
|
|
+ studentHomeVo.setImToken(register.getImToken());
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
+ throw new BizException("获取IMToken失败");
|
|
|
|
+ }
|
|
|
|
+
|
|
//身份证号、手机号脱敏
|
|
//身份证号、手机号脱敏
|
|
studentHomeVo.setIdCardNo(ValueUtil.fuzzyIdCard(studentHomeVo.getIdCardNo()));
|
|
studentHomeVo.setIdCardNo(ValueUtil.fuzzyIdCard(studentHomeVo.getIdCardNo()));
|
|
studentHomeVo.setPhone(ValueUtil.fuzzyMobile(studentHomeVo.getPhone()));
|
|
studentHomeVo.setPhone(ValueUtil.fuzzyMobile(studentHomeVo.getPhone()));
|