|
@@ -2,9 +2,12 @@ package com.yonge.cooleshow.auth.service.impl;
|
|
|
|
|
|
import java.util.List;
|
|
|
|
|
|
+import com.yonge.cooleshow.api.feign.AdminFeignService;
|
|
|
import com.yonge.cooleshow.auth.api.dto.*;
|
|
|
import com.yonge.cooleshow.auth.config.RongCloudConfig;
|
|
|
import com.yonge.cooleshow.common.enums.CacheNameEnum;
|
|
|
+import com.yonge.cooleshow.common.enums.SysUserType;
|
|
|
+import com.yonge.cooleshow.common.enums.UserFirstTimeTypeEnum;
|
|
|
import com.yonge.toolset.mybatis.service.impl.BaseServiceImpl;
|
|
|
import io.rong.models.user.UserModel;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
@@ -26,6 +29,8 @@ import com.yonge.cooleshow.common.entity.ImUserModel;
|
|
|
import com.yonge.toolset.base.exception.BizException;
|
|
|
import org.springframework.util.CollectionUtils;
|
|
|
|
|
|
+import javax.annotation.Resource;
|
|
|
+
|
|
|
@Service
|
|
|
public class SysUserServiceImpl extends BaseServiceImpl<Long, SysUser> implements SysUserService {
|
|
|
|
|
@@ -39,6 +44,8 @@ public class SysUserServiceImpl extends BaseServiceImpl<Long, SysUser> implement
|
|
|
private SysConfigService sysConfigService;
|
|
|
@Autowired
|
|
|
private RedissonClient redissonClient;
|
|
|
+ @Resource
|
|
|
+ private AdminFeignService adminFeignService;
|
|
|
|
|
|
@Override
|
|
|
public BaseDAO<Long, SysUser> getDAO() {
|
|
@@ -148,9 +155,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<Long, SysUser> implement
|
|
|
sysUser.setUserType("TEACHER");
|
|
|
sysUserDao.insert(sysUser);
|
|
|
//创建teacher表
|
|
|
- sysUserDao.saveTeacher(sysUser.getId());
|
|
|
- //创建老师账户
|
|
|
- sysUserDao.createUserAccount(sysUser.getId());
|
|
|
+ saveTeacher(sysUser);
|
|
|
//用户默认昵称
|
|
|
sysUser.setUsername("游客" + sysUser.getId());
|
|
|
sysUserDao.update(sysUser);
|
|
@@ -184,6 +189,9 @@ public class SysUserServiceImpl extends BaseServiceImpl<Long, SysUser> implement
|
|
|
public void saveStudent(SysUser sysUser) {
|
|
|
sysUserDao.saveStudent(sysUser.getId());
|
|
|
sysUserDao.createUserAccount(sysUser.getId());
|
|
|
+
|
|
|
+ //记录注册时间
|
|
|
+ adminFeignService.recordTime(sysUser.getId(), SysUserType.STUDENT.getCode(), UserFirstTimeTypeEnum.REGISTER_STUDENT);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
@@ -191,6 +199,9 @@ public class SysUserServiceImpl extends BaseServiceImpl<Long, SysUser> implement
|
|
|
public void saveTeacher(SysUser sysUser) {
|
|
|
sysUserDao.saveTeacher(sysUser.getId());
|
|
|
sysUserDao.createUserAccount(sysUser.getId());
|
|
|
+
|
|
|
+ //记录注册时间
|
|
|
+ adminFeignService.recordTime(sysUser.getId(), SysUserType.TEACHER.getCode(), UserFirstTimeTypeEnum.REGISTER_TEACHER);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
@@ -250,7 +261,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<Long, SysUser> implement
|
|
|
public void logoffById(Long id) {
|
|
|
//判断用户是否有未结束的课程
|
|
|
Integer num = sysUserDao.getUnCompCourseNum(id);
|
|
|
- if(num>0){
|
|
|
+ if (num > 0) {
|
|
|
throw new BizException("用户有未完成的课程");
|
|
|
}
|
|
|
|