|
@@ -1,32 +1,6 @@
|
|
|
package com.yonge.cooleshow.biz.dal.service.impl;
|
|
|
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
-import com.google.common.collect.ImmutableList;
|
|
|
-import com.google.common.collect.Lists;
|
|
|
-import com.yonge.cooleshow.biz.dal.entity.*;
|
|
|
-import com.yonge.cooleshow.biz.dal.enums.ImGroupType;
|
|
|
-import com.yonge.cooleshow.biz.dal.mapper.TenantAlbumMapper;
|
|
|
-import com.yonge.cooleshow.biz.dal.mapper.TenantAlbumRefMapper;
|
|
|
-import com.yonge.cooleshow.biz.dal.mapper.TenantUnbindHistoryMapper;
|
|
|
-import com.yonge.cooleshow.biz.dal.mapper.TenantUnbindRecordMapper;
|
|
|
-import com.yonge.cooleshow.biz.dal.queryInfo.TeacherQueryInfo;
|
|
|
-import com.yonge.cooleshow.biz.dal.service.*;
|
|
|
-import com.yonge.cooleshow.biz.dal.vo.MusicSheetUploadCountVo;
|
|
|
-import com.yonge.cooleshow.biz.dal.wrapper.StatGroupWrapper;
|
|
|
-import com.yonge.cooleshow.biz.dal.wrapper.teacher.TeacherWrapper;
|
|
|
-import com.yonge.cooleshow.common.enums.ESettlementFrom;
|
|
|
-import com.yonge.cooleshow.common.enums.ETenantUnBindAuditStatus;
|
|
|
-import org.apache.commons.lang3.StringUtils;
|
|
|
-import org.redisson.api.RMap;
|
|
|
-import org.redisson.api.RedissonClient;
|
|
|
-import org.slf4j.Logger;
|
|
|
-import org.slf4j.LoggerFactory;
|
|
|
-import org.springframework.beans.BeanUtils;
|
|
|
-import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
|
|
|
-import org.springframework.stereotype.Service;
|
|
|
-import org.springframework.transaction.annotation.Transactional;
|
|
|
-
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
@@ -42,7 +16,6 @@ import com.yonge.cooleshow.biz.dal.dto.TeacherDto;
|
|
|
import com.yonge.cooleshow.biz.dal.dto.req.TeacherSubmitReq;
|
|
|
import com.yonge.cooleshow.biz.dal.dto.search.TeacherSearch;
|
|
|
import com.yonge.cooleshow.biz.dal.entity.ImGroup;
|
|
|
-import com.yonge.cooleshow.biz.dal.entity.ImGroupMember;
|
|
|
import com.yonge.cooleshow.biz.dal.entity.Student;
|
|
|
import com.yonge.cooleshow.biz.dal.entity.StudentStar;
|
|
|
import com.yonge.cooleshow.biz.dal.entity.Subject;
|
|
@@ -50,6 +23,8 @@ import com.yonge.cooleshow.biz.dal.entity.Teacher;
|
|
|
import com.yonge.cooleshow.biz.dal.entity.TeacherAuthMusicianRecord;
|
|
|
import com.yonge.cooleshow.biz.dal.entity.TeacherStyleVideo;
|
|
|
import com.yonge.cooleshow.biz.dal.entity.TeacherTotal;
|
|
|
+import com.yonge.cooleshow.biz.dal.entity.TenantAlbum;
|
|
|
+import com.yonge.cooleshow.biz.dal.entity.TenantAlbumRef;
|
|
|
import com.yonge.cooleshow.biz.dal.entity.TenantInfo;
|
|
|
import com.yonge.cooleshow.biz.dal.entity.TenantUnbindHistory;
|
|
|
import com.yonge.cooleshow.biz.dal.entity.TenantUnbindRecord;
|
|
@@ -60,6 +35,8 @@ import com.yonge.cooleshow.biz.dal.enums.ImGroupType;
|
|
|
import com.yonge.cooleshow.biz.dal.enums.MessageTypeEnum;
|
|
|
import com.yonge.cooleshow.biz.dal.enums.TeacherTagEnum;
|
|
|
import com.yonge.cooleshow.biz.dal.enums.TeacherTypeEnum;
|
|
|
+import com.yonge.cooleshow.biz.dal.mapper.TenantAlbumMapper;
|
|
|
+import com.yonge.cooleshow.biz.dal.mapper.TenantAlbumRefMapper;
|
|
|
import com.yonge.cooleshow.biz.dal.mapper.TenantUnbindHistoryMapper;
|
|
|
import com.yonge.cooleshow.biz.dal.mapper.TenantUnbindRecordMapper;
|
|
|
import com.yonge.cooleshow.biz.dal.queryInfo.TeacherQueryInfo;
|
|
@@ -67,6 +44,7 @@ import com.yonge.cooleshow.biz.dal.service.ImGroupMemberService;
|
|
|
import com.yonge.cooleshow.biz.dal.service.ImGroupService;
|
|
|
import com.yonge.cooleshow.biz.dal.service.ImUserFriendService;
|
|
|
import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
|
|
|
+import com.yonge.cooleshow.biz.dal.service.SmsCodeService;
|
|
|
import com.yonge.cooleshow.biz.dal.service.StudentService;
|
|
|
import com.yonge.cooleshow.biz.dal.service.StudentStarService;
|
|
|
import com.yonge.cooleshow.biz.dal.service.SubjectService;
|
|
@@ -81,21 +59,6 @@ import com.yonge.cooleshow.biz.dal.service.TenantInfoService;
|
|
|
import com.yonge.cooleshow.biz.dal.service.UserAccountService;
|
|
|
import com.yonge.cooleshow.biz.dal.service.UserFirstTimeService;
|
|
|
import com.yonge.cooleshow.biz.dal.service.im.ImGroupCoreService;
|
|
|
-import com.yonge.cooleshow.biz.dal.queryInfo.TeacherQueryInfo;
|
|
|
-import com.yonge.cooleshow.biz.dal.service.ImGroupService;
|
|
|
-import com.yonge.cooleshow.biz.dal.service.StudentService;
|
|
|
-import com.yonge.cooleshow.biz.dal.service.StudentStarService;
|
|
|
-import com.yonge.cooleshow.biz.dal.service.SubjectService;
|
|
|
-import com.yonge.cooleshow.biz.dal.service.SysConfigService;
|
|
|
-import com.yonge.cooleshow.biz.dal.service.SysMessageService;
|
|
|
-import com.yonge.cooleshow.biz.dal.service.TeacherAuthEntryRecordService;
|
|
|
-import com.yonge.cooleshow.biz.dal.service.TeacherAuthMusicianRecordService;
|
|
|
-import com.yonge.cooleshow.biz.dal.service.TeacherService;
|
|
|
-import com.yonge.cooleshow.biz.dal.service.TeacherStyleVideoService;
|
|
|
-import com.yonge.cooleshow.biz.dal.service.TeacherTotalService;
|
|
|
-import com.yonge.cooleshow.biz.dal.service.UserAccountService;
|
|
|
-import com.yonge.cooleshow.biz.dal.service.UserFirstTimeService;
|
|
|
-import com.yonge.cooleshow.biz.dal.service.im.ImGroupCoreService;
|
|
|
import com.yonge.cooleshow.biz.dal.vo.HotTeacherVo;
|
|
|
import com.yonge.cooleshow.biz.dal.vo.MusicSheetUploadCountVo;
|
|
|
import com.yonge.cooleshow.biz.dal.vo.MyFens;
|
|
@@ -119,28 +82,7 @@ import com.yonge.toolset.thirdparty.message.MessageSenderPluginContext;
|
|
|
import com.yonge.toolset.utils.date.DateUtil;
|
|
|
import com.yonge.toolset.utils.idcard.IdcardInfoExtractor;
|
|
|
import com.yonge.toolset.utils.string.ValueUtil;
|
|
|
-import org.redisson.api.RMap;
|
|
|
-import org.redisson.api.RedissonClient;
|
|
|
-import org.slf4j.Logger;
|
|
|
-import org.slf4j.LoggerFactory;
|
|
|
-import org.springframework.beans.BeanUtils;
|
|
|
-import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
|
|
|
-import org.springframework.stereotype.Service;
|
|
|
-import org.springframework.transaction.annotation.Transactional;
|
|
|
-
|
|
|
-import javax.annotation.Resource;
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.Arrays;
|
|
|
-import java.util.Date;
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
-import java.util.Objects;
|
|
|
-import java.util.concurrent.TimeUnit;
|
|
|
-import java.util.stream.Collectors;
|
|
|
-
|
|
|
-import static com.yonge.cooleshow.biz.dal.constant.LiveRoomConstant.TEACHER_TEMP_LIVE_ROOM;
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
import org.redisson.api.RMap;
|
|
|
import org.redisson.api.RedissonClient;
|
|
|
import org.slf4j.Logger;
|
|
@@ -159,6 +101,7 @@ import java.util.List;
|
|
|
import java.util.Map;
|
|
|
import java.util.Objects;
|
|
|
import java.util.Optional;
|
|
|
+import java.util.Set;
|
|
|
import java.util.concurrent.TimeUnit;
|
|
|
import java.util.stream.Collectors;
|
|
|
|