1.添加老师和学生相关接口

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/req/TeacherSubmitReq.java

@@ -53,6 +53,9 @@ public class TeacherSubmitReq implements Serializable {
     @ApiModelProperty("结算方式")
     private ESettlementFrom settlementFrom;
 
+    @ApiModelProperty("是否解绑")
+    private Boolean bindTenant;
+
     public Long getUserId() {
         return userId;
     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/StudentSearch.java

@@ -64,11 +64,14 @@ public class StudentSearch extends QueryInfo{
     private Integer hideFlag;
 
     @ApiModelProperty("机构ID")
-    private String tenantId;
+    private Long tenantId;
 
     @ApiModelProperty("机构名称")
     private String tenantName;
 
+    @ApiModelProperty(value = "排序方式",hidden = true)
+    private String orderBy;
+
     public Date getVipStartTime() {
         return vipStartTime;
     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/TeacherSearch.java

@@ -68,6 +68,8 @@ public class TeacherSearch extends QueryInfo{
 	@ApiModelProperty("结算方式")
 	private String settlementFrom;
 
+	@ApiModelProperty(value = "排序方式, 默认 create_time_ desc", hidden = true)
+	private String orderBy;
 	public YesOrNoEnum getTrainFlag() {
 		if (YesOrNoEnum.YES == trainFlag) {
 			return trainFlag;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/StudentService.java

@@ -104,4 +104,10 @@ public interface StudentService extends IService<Student> {
      * @return StudentWrapper.UnionStudentResp
      */
     StudentWrapper.UnionStudentResp unionStudent(StudentWrapper.UnionStudent info);
+
+    /**
+     * 添加学生
+     * @param studentInfo 学生信息
+     */
+    Boolean save(StudentWrapper.Student studentInfo);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ImUserFriendServiceImpl.java

@@ -81,14 +81,15 @@ public class ImUserFriendServiceImpl extends ServiceImpl<ImUserFriendDao, ImUser
         BasicUserInfo teacherInfo = teacherDao.getBasicUserInfo(teacherId);
         List<BasicUserInfo> studentInfos = teacherDao.findBasicUserInfo(studentIds);
         studentInfos.add(teacherInfo);
-        Map<Long, List<BasicUserInfo>> basicUserInfoMap = studentInfos.stream().collect(Collectors.groupingBy(BasicUserInfo::getUserId));
-        for(Long studentId : studentIds){
+        Map<Long, List<BasicUserInfo>> basicUserInfoMap =
+                studentInfos.stream().collect(Collectors.groupingBy(BasicUserInfo::getUserId));
+        for (Long studentId : studentIds) {
             //老师关联学员
             ImUserFriend teacherFriend = new ImUserFriend();
             //学员关联老师
             ImUserFriend studentFriend = new ImUserFriend();
             List<BasicUserInfo> basicUserInfos = basicUserInfoMap.get(studentId);
-            if(CollectionUtils.isNotEmpty(basicUserInfos)){
+            if (CollectionUtils.isNotEmpty(basicUserInfos)) {
                 BasicUserInfo info = basicUserInfos.get(0);
                 teacherFriend.setFriendAvatar(info.getAvatar());
                 teacherFriend.setFriendNickname(info.getUsername());
@@ -125,14 +126,14 @@ public class ImUserFriendServiceImpl extends ServiceImpl<ImUserFriendDao, ImUser
 
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         BasicUserInfo basicUserInfo = teacherDao.getBasicUserInfo(userId);
-        if(sysUser != null && sysUser.getId() != null){
+        if (sysUser != null && sysUser.getId() != null) {
 
             ImUserFriend imUserFriend = lambdaQuery()
                     .eq(ImUserFriend::getUserId, sysUser.getId())
                     .eq(ImUserFriend::getClientType, clientType)
                     .eq(ImUserFriend::getFriendId, userId)
                     .one();
-            if(Objects.nonNull(imUserFriend)){
+            if (Objects.nonNull(imUserFriend)) {
                 //更新当前用户关联的该用户的详情信息
                 imUserFriend.setFriendAvatar(basicUserInfo.getAvatar());
                 imUserFriend.setFriendNickname(basicUserInfo.getUsername());
@@ -166,8 +167,8 @@ public class ImUserFriendServiceImpl extends ServiceImpl<ImUserFriendDao, ImUser
     /**
      * 新用户自动添加客服
      *
-     * @param userId    新用户ID
-     * @param friendIds 好友ID
+     * @param userId     新用户ID
+     * @param friendIds  好友ID
      * @param clientType 客户端类型
      * @return Integer
      */
@@ -256,7 +257,8 @@ public class ImUserFriendServiceImpl extends ServiceImpl<ImUserFriendDao, ImUser
     public void sendCustomerServiceNotifyMessage(String sender, CustomerService.NotifyMessage info) {
 
         // 发送者信息
-        com.yonge.cooleshow.biz.dal.entity.SysUser senderUser = sysUserMapper.selectOne(Wrappers.<com.yonge.cooleshow.biz.dal.entity.SysUser>lambdaQuery()
+        com.yonge.cooleshow.biz.dal.entity.SysUser senderUser =
+                sysUserMapper.selectOne(Wrappers.<com.yonge.cooleshow.biz.dal.entity.SysUser>lambdaQuery()
                 .eq(com.yonge.cooleshow.biz.dal.entity.SysUser::getPhone, sender));
 
         if (Objects.isNull(senderUser)) {
@@ -276,7 +278,8 @@ public class ImUserFriendServiceImpl extends ServiceImpl<ImUserFriendDao, ImUser
             }
         } else {
 
-            LambdaQueryWrapper<com.yonge.cooleshow.biz.dal.entity.SysUser> wrapper = Wrappers.<com.yonge.cooleshow.biz.dal.entity.SysUser>lambdaQuery()
+            LambdaQueryWrapper<com.yonge.cooleshow.biz.dal.entity.SysUser> wrapper =
+                    Wrappers.<com.yonge.cooleshow.biz.dal.entity.SysUser>lambdaQuery()
                     .select(com.yonge.cooleshow.biz.dal.entity.SysUser::getId,
                             com.yonge.cooleshow.biz.dal.entity.SysUser::getUsername)
                     .in(com.yonge.cooleshow.biz.dal.entity.SysUser::getPhone, info.getReceives());
@@ -337,17 +340,17 @@ public class ImUserFriendServiceImpl extends ServiceImpl<ImUserFriendDao, ImUser
     }
 
 
-
     /**
      * 用户IM好友列表
      *
      * @param clientType 客户端类型
-     * @param userId 用户ID
+     * @param userId     用户ID
      * @param paramMap   Map<String, Object>
      * @return List<ImUserWrapper.ImUserFriend>
      */
     @Override
-    public List<ImUserWrapper.ImUserFriend> findUserAllImFriendInfo(ClientEnum clientType, Long userId, Map<String, Object> paramMap) {
+    public List<ImUserWrapper.ImUserFriend> findUserAllImFriendInfo(ClientEnum clientType, Long userId, Map<String,
+            Object> paramMap) {
 
         // 用户好友匹配条件
         Object search = paramMap.get("search");
@@ -360,30 +363,30 @@ public class ImUserFriendServiceImpl extends ServiceImpl<ImUserFriendDao, ImUser
                         e -> e.eq(ImUserFriend::getFriendId, search).or().like(ImUserFriend::getFriendNickname, search))
                 .orderByDesc(ImUserFriend::getId).list();
 
-        List<ImUserWrapper.ImUserFriend> userFriends = JSON.parseArray(JSON.toJSONString(records), ImUserWrapper.ImUserFriend.class);
+        List<ImUserWrapper.ImUserFriend> userFriends = JSON.parseArray(JSON.toJSONString(records),
+                ImUserWrapper.ImUserFriend.class);
 
         for (ImUserWrapper.ImUserFriend item : userFriends) {
 
             switch (clientType) {
-                case TEACHER:
-                    {
-                        // 老师查询学生好友
-                        if (item.getFriendType() == ClientEnum.TEACHER) {
-                            item.setImFriendId(MessageFormat.format("{0}", String.valueOf(item.getFriendId())));
-                        } else {
-                            item.friendType(Optional.ofNullable(item.getFriendType()).orElse(ClientEnum.STUDENT))
-                                    .setImFriendId(MessageFormat.format("{0}:{1}", String.valueOf(item.getFriendId()), ClientEnum.STUDENT.name()));
-                        }
-
+                case TEACHER: {
+                    // 老师查询学生好友
+                    if (item.getFriendType() == ClientEnum.TEACHER) {
+                        item.setImFriendId(MessageFormat.format("{0}", String.valueOf(item.getFriendId())));
+                    } else {
+                        item.friendType(Optional.ofNullable(item.getFriendType()).orElse(ClientEnum.STUDENT))
+                                .setImFriendId(MessageFormat.format("{0}:{1}", String.valueOf(item.getFriendId()),
+                                        ClientEnum.STUDENT.name()));
                     }
-                    break;
-                case STUDENT:
-                    {
-                        // 查询学生老师好友
-                        item.friendType(Optional.ofNullable(item.getFriendType()).orElse(ClientEnum.TEACHER))
-                                .setImFriendId(MessageFormat.format("{0}", String.valueOf(item.getFriendId())));
-                    }
-                    break;
+
+                }
+                break;
+                case STUDENT: {
+                    // 查询学生老师好友
+                    item.friendType(Optional.ofNullable(item.getFriendType()).orElse(ClientEnum.TEACHER))
+                            .setImFriendId(MessageFormat.format("{0}", String.valueOf(item.getFriendId())));
+                }
+                break;
                 default:
                     break;
             }
@@ -394,8 +397,9 @@ public class ImUserFriendServiceImpl extends ServiceImpl<ImUserFriendDao, ImUser
 
     /**
      * 删除机构下的好友
-     * @param tenantId 机构ID
-     * @param userId 用户ID
+     *
+     * @param tenantId   机构ID
+     * @param userId     用户ID
      */
     @Override
     public void delFriendByTenantId(Long tenantId, Long userId) {

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/StudentServiceImpl.java

@@ -1,9 +1,12 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.microsvc.toolkit.common.webportal.exception.BizException;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dao.StudentDao;
 import com.yonge.cooleshow.biz.dal.dao.SubjectDao;
@@ -11,15 +14,27 @@ import com.yonge.cooleshow.biz.dal.dao.TeacherDao;
 import com.yonge.cooleshow.biz.dal.dao.UserBindingTeacherDao;
 import com.yonge.cooleshow.biz.dal.dto.search.QueryMyFollowSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.StudentSearch;
-import com.yonge.cooleshow.biz.dal.entity.*;
+import com.yonge.cooleshow.biz.dal.entity.Student;
+import com.yonge.cooleshow.biz.dal.entity.StudentTotal;
+import com.yonge.cooleshow.biz.dal.entity.Subject;
+import com.yonge.cooleshow.biz.dal.entity.TenantInfo;
+import com.yonge.cooleshow.biz.dal.entity.UserBindingTeacher;
+import com.yonge.cooleshow.biz.dal.entity.UserTenantAlbumRecord;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.mapper.SysUserMapper;
-import com.yonge.cooleshow.biz.dal.service.*;
+import com.yonge.cooleshow.biz.dal.service.ImGroupService;
+import com.yonge.cooleshow.biz.dal.service.ImUserFriendService;
+import com.yonge.cooleshow.biz.dal.service.StudentService;
+import com.yonge.cooleshow.biz.dal.service.StudentTotalService;
+import com.yonge.cooleshow.biz.dal.service.SysConfigService;
+import com.yonge.cooleshow.biz.dal.service.TenantInfoService;
+import com.yonge.cooleshow.biz.dal.service.UserTenantAlbumRecordService;
 import com.yonge.cooleshow.biz.dal.vo.MyFollow;
 import com.yonge.cooleshow.biz.dal.vo.StudentHomeVo;
 import com.yonge.cooleshow.biz.dal.vo.StudentVo;
 import com.yonge.cooleshow.biz.dal.vo.TeacherVo;
 import com.yonge.cooleshow.biz.dal.wrapper.StudentWrapper;
+import com.yonge.cooleshow.common.constant.SysConfigConstant;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.enums.CacheNameEnum;
 import com.yonge.cooleshow.common.enums.UserLockFlag;
@@ -72,6 +87,12 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
     @Autowired
     private UserTenantAlbumRecordService userTenantAlbumRecordService;
 
+    @Autowired
+    private SysConfigService sysConfigService;
+
+    @Autowired
+    private ImGroupService imGroupService;
+
     @Override
     public StudentVo detail(Long userId) {
         return baseMapper.detail(userId);
@@ -257,8 +278,9 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
         StudentVo studentVo = detailByPhone(info.getMobile());
 
 
-        com.yonge.cooleshow.biz.dal.entity.SysUser sysUser = sysUserMapper.selectOne(Wrappers.<com.yonge.cooleshow.biz.dal.entity.SysUser>lambdaQuery()
-                                                                                             .eq(com.yonge.cooleshow.biz.dal.entity.SysUser::getPhone, info.getMobile()));
+        com.yonge.cooleshow.biz.dal.entity.SysUser sysUser =
+                sysUserMapper.selectOne(Wrappers.<com.yonge.cooleshow.biz.dal.entity.SysUser>lambdaQuery()
+                        .eq(com.yonge.cooleshow.biz.dal.entity.SysUser::getPhone, info.getMobile()));
 
         studentResp.setSysUser(sysUser);
         if (Objects.isNull(studentVo)) {
@@ -281,7 +303,8 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
                 studentResp.setUpdateFlag(true);
             } else {
 
-                com.yonge.cooleshow.biz.dal.entity.SysUser updateEntity = new com.yonge.cooleshow.biz.dal.entity.SysUser();
+                com.yonge.cooleshow.biz.dal.entity.SysUser updateEntity =
+                        new com.yonge.cooleshow.biz.dal.entity.SysUser();
                 updateEntity.setId(sysUser.getId());
                 updateEntity.setUpdateTime(LocalDateTime.now());
                 //updateEntity.setDelFlag(Optional.ofNullable(info.getLockFlag()).orElse(0)); // 激活帐号
@@ -337,11 +360,98 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
         return studentResp;
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public Boolean save(StudentWrapper.Student studentInfo) {
+        if (studentInfo.getId() != null) {
+            return createStudent(studentInfo);
+        } else {
+            return updateStudent(studentInfo);
+        }
+    }
+
+    private Boolean updateStudent(StudentWrapper.Student studentInfo) {
+        StudentVo student = detail(studentInfo.getId());
+        if (student == null) {
+            throw new BizException("学生信息不存在");
+        }
+        // 解绑
+        if (!studentInfo.getBindTenant()) {
+            studentInfo.setTenantId(-1L);
+            // 退群，删除好友
+            imUserFriendService.delFriendByTenantId(student.getTenantId(), student.getUserId());
+        }
+        // 手机号码修改
+        if (!student.getPhone().equals(studentInfo.getPhone())) {
+            com.yonge.cooleshow.biz.dal.entity.SysUser sysUser = getOrCreateAccount(studentInfo);
+            this.lambdaUpdate().set(Student::getSubjectId, studentInfo.getSubjectId())
+                    .set(Student::getTenantId, studentInfo.getTenantId())
+                    .set(Student::getUserId, sysUser.getId())
+                    .set(Student::getUpdateTime, new Date())
+                    .eq(Student::getUserId, studentInfo.getId())
+                    .update();
+        } else {
+            Student newStudent = new Student();
+            newStudent.setUserId(studentInfo.getId());
+            newStudent.setSubjectId(studentInfo.getSubjectId());
+            newStudent.setUpdateTime(new Date());
+            newStudent.setTenantId(studentInfo.getTenantId());
+            this.getBaseMapper().updateById(newStudent);
+        }
+        return true;
+    }
+
+    private Boolean createStudent(StudentWrapper.Student studentInfo) {
+        com.yonge.cooleshow.biz.dal.entity.SysUser sysUser = getOrCreateAccount(studentInfo);
+        Student student = new Student();
+        student.setUserId(sysUser.getId());
+        student.setTenantId(studentInfo.getTenantId());
+        student.setSubjectId(studentInfo.getSubjectId());
+        student.setCreateTime(new Date());
+        student.setLockFlag(UserLockFlag.NORMAL);
+        save(student);
+        return true;
+    }
+
+    private com.yonge.cooleshow.biz.dal.entity.SysUser getOrCreateAccount(StudentWrapper.Student studentInfo) {
+        QueryWrapper<com.yonge.cooleshow.biz.dal.entity.SysUser> sysUserQueryWrapper = new QueryWrapper<>();
+        sysUserQueryWrapper.lambda().eq(com.yonge.cooleshow.biz.dal.entity.SysUser::getPhone, studentInfo.getPhone());
+        List<com.yonge.cooleshow.biz.dal.entity.SysUser> sysUsers = sysUserMapper.selectList(sysUserQueryWrapper);
+        com.yonge.cooleshow.biz.dal.entity.SysUser sysUser;
+        if (!sysUsers.isEmpty()) {
+            sysUser = sysUsers.get(0);
+            if (this.getBaseMapper().selectById(sysUser.getId()) != null) {
+                throw new BizException("手机号已经注册学生账号");
+            }
+            sysUser.setGender(studentInfo.getGender());
+            sysUser.setBirthdate(studentInfo.getBirthdate());
+            String userType = sysUser.getUserType();
+            String studentUserType = "STUDENT";
+            if (StringUtils.isEmpty(userType)) {
+                sysUser.setUserType(studentUserType);
+            } else if (!userType.contains(studentUserType)) {
+                sysUser.setUserType(userType + "," + studentUserType);
+            }
+            sysUserMapper.updateById(sysUser);
+        } else {
+            sysUser = JSON.parseObject(JSON.toJSONString(studentInfo),
+                    com.yonge.cooleshow.biz.dal.entity.SysUser.class);
+            sysUser.setPhone(studentInfo.getPhone());
+            sysUser.setAvatar(sysConfigService.findConfigValue(SysConfigConstant.DEFAULT_HEARD));
+            sysUser.setGender(studentInfo.getGender());
+            sysUser.setUserType("STUDENT");
+            sysUser.setBirthdate(studentInfo.getBirthdate());
+            sysUserMapper.insert(sysUser);
+        }
+        return sysUser;
+    }
+
     /**
      * 更新学生关联帐号
-     * @param info StudentWrapper.UnionStudent
+     *
+     * @param info        StudentWrapper.UnionStudent
      * @param studentResp StudentWrapper.UnionStudentResp
-     * @param student Student
+     * @param student     Student
      */
     private void updateStudentUnionStatus(StudentWrapper.UnionStudent info,
                                           StudentWrapper.UnionStudentResp studentResp, Student student) {

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherServiceImpl.java

@@ -161,20 +161,6 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
             }).filter(Objects::nonNull).collect(Collectors.joining(","));
             teacherVo.setSubjectName(subjectNames);
         }
-
-        // 设置机构名称
-        List<Long> tenantIdList = teacherVos.stream().map(TeacherVo::getTenantId)
-                .filter(next -> next != null && !next.equals(-1L)).distinct()
-                .collect(Collectors.toList());
-        if (!tenantIdList.isEmpty()) {
-            Map<Long, String> tenantIdNameMap = tenantInfoService.lambdaQuery().in(TenantInfo::getId, tenantIdList)
-                    .list().stream().collect(Collectors.toMap(TenantInfo::getId, TenantInfo::getName));
-            tenantIdNameMap.put(-1L, "平台老师");
-            for (TeacherVo next : teacherVos) {
-                next.setTenantName(tenantIdNameMap.getOrDefault(next.getTenantId(), ""));
-            }
-        }
-
         return page.setRecords(teacherVos);
     }
 
@@ -383,8 +369,6 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
         } else {
             teacher.setUpdateTime(new Date());
             teacher = getTeacherDetil(teacher, teacherSubmitReq);
-            baseMapper.updateById(teacher);
-
             if (null == teacher.getEntryAuthDate() || null == teacher.getMusicianDate()) {
                 baseMapper.update(teacher, Wrappers.<Teacher>lambdaUpdate()
                         .set(Teacher::getEntryAuthDate, teacher.getEntryAuthDate())
@@ -393,8 +377,8 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
                 );
             }
 
-            // 机构发生变化
-            if (!teacher.getTenantId().equals(teacherSubmitReq.getTenantId())) {
+            // 机构解绑
+            if (teacher.getTenantId() != -1 && !teacherSubmitReq.getBindTenant()) {
                 // 老师建立的班级群解散，并解除好友关系
                 List<ImGroupMember> groupMembers = imGroupMemberService.lambdaQuery()
                         .eq(ImGroupMember::getIsAdmin,true)
@@ -411,7 +395,10 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
                     });
                     imUserFriendService.delFriendByTenantId(teacher.getTenantId(), teacher.getUserId());
                 }
+                // 机构解绑后，归属为平台老师
+                teacher.setTenantId(-1L);
             }
+            baseMapper.updateById(teacher);
         }
 
         return teacher;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/StudentWrapper.java

@@ -9,6 +9,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.time.LocalDate;
 
 /**
  * 学生封装类
@@ -82,4 +83,34 @@ public class StudentWrapper {
             return this;
         }
     }
+
+    @Data
+    @ApiModel("学生基础信息")
+    public static class Student{
+
+        @ApiModelProperty("id")
+        private Long id;
+
+        @ApiModelProperty("机构ID")
+        private Long tenantId;
+
+        @ApiModelProperty("姓名")
+        private String name;
+
+        @ApiModelProperty("性别。0：女 1：男")
+        private Integer gender;
+
+        @ApiModelProperty("生日")
+        private LocalDate birthdate;
+
+        @ApiModelProperty("手机号码")
+        private String phone;
+
+        @ApiModelProperty("声部，多个用逗号隔开")
+        private String subjectId;
+
+        @ApiModelProperty("是否绑定机构，0:解绑，1：不解绑")
+        private Boolean bindTenant;
+
+    }
 }

cooleshow-user/user-biz/src/main/resources/config/mybatis/ImUserFriendMapper.xml

@@ -36,6 +36,6 @@
                     (t1.user_id_ = t2.user_id_ OR t1.friend_id_ = t2.user_id_)
             )
         WHERE t1.user_id_ = #{userId}
-           OR t1.friend_id_ = #{userId}
+        OR t1.friend_id_ = #{userId}
     </delete>
 </mapper>

cooleshow-user/user-biz/src/main/resources/config/mybatis/StudentMapper.xml

@@ -159,7 +159,14 @@
                 and te.name_ like concat('%',#{param.tenantName},'%')
             </if>
         </where>
-        order by t.create_time_ desc
+        <choose>
+            <when test="param.orderBy != null and param.orderBy.trim() != ''">
+                order by #{param.orderBy}
+            </when>
+            <otherwise>
+                order by t.create_time_ desc
+            </otherwise>
+        </choose>
     </select>
 
     <select id="querySubject" resultMap="com.yonge.cooleshow.biz.dal.dao.SubjectDao.Subject">

cooleshow-user/user-biz/src/main/resources/config/mybatis/TeacherMapper.xml

@@ -182,7 +182,14 @@
                 and te.name_ like concat('%',#{param.tenantName},'%')
             </if>
         </where>
-        order by t.create_time_ desc
+        <choose>
+            <when test="param.orderBy != null and param.orderBy.trim() != ''">
+                order by #{param.orderBy}
+            </when>
+            <otherwise>
+                order by t.create_time_ desc
+            </otherwise>
+        </choose>
     </select>
 
 	<resultMap id="BasicUserInfo" type="com.yonge.cooleshow.biz.dal.dto.BasicUserInfo">

cooleshow-user/user-tenant/src/main/java/com/yonge/cooleshow/tenant/controller/StudentController.java

@@ -0,0 +1,99 @@
+package com.yonge.cooleshow.tenant.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.dto.search.StudentSearch;
+import com.yonge.cooleshow.biz.dal.entity.TenantInfo;
+import com.yonge.cooleshow.biz.dal.service.StudentService;
+import com.yonge.cooleshow.biz.dal.service.SysUserService;
+import com.yonge.cooleshow.biz.dal.service.TenantInfoService;
+import com.yonge.cooleshow.biz.dal.vo.StudentVo;
+import com.yonge.cooleshow.biz.dal.wrapper.StudentWrapper;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.cooleshow.common.enums.UserLockFlag;
+import com.yonge.cooleshow.common.enums.UserStatusEnum;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
+import com.yonge.toolset.base.page.PageInfo;
+import com.yonge.toolset.mybatis.support.PageUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/student")
+@Api(value = "学生表", tags = "学生表")
+public class StudentController extends BaseController {
+    @Autowired
+    private StudentService studentService;
+
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+
+    @Autowired
+    private TenantInfoService tenantInfoService;
+
+    @GetMapping("/detail/{id}")
+    @ApiOperation(value = "详情", notes = "传入id")
+    public HttpResponseResult<StudentVo> detail(@PathVariable("id") Long id) {
+        StudentVo detail = studentService.detail(id);
+        return succeed(detail);
+    }
+
+    @PostMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入StudentSearch")
+    public HttpResponseResult<PageInfo<StudentVo>> page(@RequestBody StudentSearch query) {
+        TenantInfo tenantInfo = getTenantInfo();
+        query.setTenantId(tenantInfo.getId());
+        query.setDelFlag(YesOrNoEnum.NO);
+        query.setOrderBy("t.username desc");
+
+        IPage<StudentVo> pages = studentService.selectPage(PageUtil.getPage(query), query);
+        List<StudentVo> rows = pages.getRecords();
+
+        for (StudentVo vo : rows) {
+            if (vo.getDelFlag() == YesOrNoEnum.YES) {
+                vo.setUserStatus(UserStatusEnum.CLOSED);
+            } else {
+                if (vo.getLockFlag() == UserLockFlag.LOCKED) {
+                    vo.setUserStatus(UserStatusEnum.LOCKED);
+                } else {
+                    vo.setUserStatus(UserStatusEnum.NORMAL);
+                }
+            }
+        }
+        return succeed(PageUtil.pageInfo(pages));
+    }
+
+    @PostMapping("/save")
+    @ApiOperation(value = "新增/修改", notes = "传入Student")
+    public HttpResponseResult<Boolean> save(
+            @Validated @RequestBody com.yonge.cooleshow.tenant.vo.StudentVo.Student student) {
+        TenantInfo tenantInfo = getTenantInfo();
+        StudentWrapper.Student studentInfo = JSON.parseObject(JSON.toJSONString(student), StudentWrapper.Student.class);
+        studentInfo.setTenantId(tenantInfo.getId());
+        studentService.save(studentInfo);
+        return succeed();
+    }
+
+    private TenantInfo getTenantInfo() {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        TenantInfo tenantInfo = tenantInfoService.lambdaQuery().eq(TenantInfo::getUserId, sysUser.getId())
+                .last("limit 1").one();
+        if (tenantInfo == null) {
+            throw new com.microsvc.toolkit.common.webportal.exception.BizException("非法请求");
+        }
+        return tenantInfo;
+    }
+}

cooleshow-user/user-tenant/src/main/java/com/yonge/cooleshow/tenant/controller/TeacherController.java

@@ -0,0 +1,131 @@
+package com.yonge.cooleshow.tenant.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.microsvc.toolkit.common.webportal.exception.BizException;
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+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.Teacher;
+import com.yonge.cooleshow.biz.dal.entity.TeacherStyleVideo;
+import com.yonge.cooleshow.biz.dal.entity.TenantInfo;
+import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
+import com.yonge.cooleshow.biz.dal.service.TeacherService;
+import com.yonge.cooleshow.biz.dal.service.TenantInfoService;
+import com.yonge.cooleshow.biz.dal.vo.TeacherVo;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.cooleshow.common.enums.UserLockFlag;
+import com.yonge.cooleshow.common.enums.UserStatusEnum;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
+import com.yonge.toolset.base.page.PageInfo;
+import com.yonge.toolset.mybatis.support.PageUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@RestController
+@RequestMapping("/teacher")
+@Api(value = "教师表", tags = "教师表")
+public class TeacherController extends BaseController {
+
+    @Autowired
+    private TeacherService teacherService;
+
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+
+    @Autowired
+    private TenantInfoService tenantInfoService;
+
+    /**
+     * 查询单条
+     */
+    @GetMapping("/detail/{id}")
+    @ApiOperation(value = "详情", notes = "传入id")
+    public HttpResponseResult<TeacherVo> detail(@PathVariable("id") Long userId) {
+        TenantInfo tenantInfo = getTenantInfo();
+
+        TeacherVo detail = teacherService.findTeacherDetailInfo(userId);
+        if (detail == null) {
+            throw new BizException("数据不存在");
+        }
+        if (tenantInfo.getId().equals(detail.getTenantId())) {
+            throw new BizException("非法请求");
+        }
+        if (!CollectionUtils.isEmpty(detail.getStyleVideo())) {
+            List<TeacherStyleVideo> styleVideo = detail.getStyleVideo();
+            List<TeacherStyleVideo> collect =
+                    styleVideo.stream().filter(o -> AuthStatusEnum.PASS.equals(o.getAuthStatus())).collect(Collectors.toList());
+            detail.setStyleVideo(collect);
+        }
+        return succeed(detail);
+    }
+
+    /**
+     * 查询分页
+     */
+    @PostMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入teacher")
+    public HttpResponseResult<PageInfo<TeacherVo>> page(@RequestBody TeacherSearch query) {
+        TenantInfo tenantInfo = getTenantInfo();
+        query.setTenantId(tenantInfo.getId());
+        query.setDelFlag(YesOrNoEnum.NO);
+        query.setOrderBy("t.username desc");
+
+        IPage<TeacherVo> pages = teacherService.selectPage(PageUtil.getPage(query), query);
+        List<TeacherVo> rows = pages.getRecords();
+
+        for (TeacherVo vo : rows) {
+            if (vo.getDelFlag() == YesOrNoEnum.YES) {
+                vo.setUserStatus(UserStatusEnum.CLOSED);
+            } else {
+                if (vo.getLockFlag() == UserLockFlag.LOCKED) {
+                    vo.setUserStatus(UserStatusEnum.LOCKED);
+                } else {
+                    vo.setUserStatus(UserStatusEnum.NORMAL);
+                }
+            }
+        }
+        return succeed(PageUtil.pageInfo(pages));
+    }
+
+    /**
+     * 新增或修改
+     */
+    @PostMapping("/submit")
+    @ApiOperation(value = "新增或修改", notes = "传入teacher")
+    public HttpResponseResult<Boolean> submit(@Valid @RequestBody TeacherSubmitReq teacherSubmitReq) {
+        TenantInfo tenantInfo = getTenantInfo();
+        if (teacherSubmitReq.getUserId() != null) {
+            Teacher teacher = teacherService.lambdaQuery().eq(Teacher::getUserId, teacherSubmitReq.getUserId())
+                    .eq(Teacher::getTenantId, tenantInfo.getId()).last("limit 1").one();
+            if (teacher == null) {
+                throw new BizException("老师不存在");
+            }
+        }
+        teacherSubmitReq.setTenantId(tenantInfo.getId());
+        return teacherService.submit(teacherSubmitReq);
+    }
+
+    private TenantInfo getTenantInfo() {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        TenantInfo tenantInfo = tenantInfoService.lambdaQuery().eq(TenantInfo::getUserId, sysUser.getId())
+                .last("limit 1").one();
+        if (tenantInfo == null) {
+            throw new BizException("非法请求");
+        }
+        return tenantInfo;
+    }
+}

cooleshow-user/user-tenant/src/main/java/com/yonge/cooleshow/tenant/controller/open/OpenStudentController.java

@@ -0,0 +1,47 @@
+package com.yonge.cooleshow.tenant.controller.open;
+
+import com.alibaba.fastjson.JSON;
+import com.yonge.cooleshow.biz.dal.entity.TenantInfo;
+import com.yonge.cooleshow.biz.dal.service.StudentService;
+import com.yonge.cooleshow.biz.dal.service.TenantInfoService;
+import com.yonge.cooleshow.biz.dal.wrapper.StudentWrapper;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.toolset.base.exception.BizException;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/open/student")
+@Api(value = "学生表", tags = "学生表")
+public class OpenStudentController extends BaseController {
+    @Autowired
+    private StudentService studentService;
+
+    @Autowired
+    private TenantInfoService tenantInfoService;
+
+    @PostMapping("/save")
+    @ApiOperation(value = "新增/修改", notes = "传入Student")
+    public HttpResponseResult<Boolean> save(
+            @Validated @RequestBody com.yonge.cooleshow.tenant.vo.StudentVo.Student student) {
+        Long tenantId = student.getTenantId();
+        if (tenantId == null) {
+            throw new BizException("未指定机构");
+        }
+        TenantInfo tenantInfo = tenantInfoService.getById(tenantId);
+        if (tenantInfo == null) {
+            throw new BizException("机构不存在");
+        }
+        StudentWrapper.Student studentInfo = JSON.parseObject(JSON.toJSONString(student), StudentWrapper.Student.class);
+        studentInfo.setTenantId(tenantInfo.getId());
+        studentService.save(studentInfo);
+        return succeed();
+    }
+}

cooleshow-user/user-tenant/src/main/java/com/yonge/cooleshow/tenant/vo/StudentVo.java

@@ -0,0 +1,45 @@
+package com.yonge.cooleshow.tenant.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+@ApiModel("学生入参模型")
+@Data
+public class StudentVo {
+
+    @Data
+    @ApiModel("添加/修改学生")
+    public static class Student{
+
+        @ApiModelProperty("id")
+        private Long id;
+
+        @ApiModelProperty("所属机构，开放接口必填")
+        private Long tenantId;
+
+        @ApiModelProperty("姓名")
+        @NotNull
+        private String name;
+
+        @ApiModelProperty("性别。0：女 1：男")
+        @NotNull
+        private Boolean gender;
+
+        @ApiModelProperty("生日")
+        private Date birthdate;
+
+        @ApiModelProperty("手机号码")
+        @NotNull
+        private String phone;
+
+        @ApiModelProperty("声部，多个用逗号隔开")
+        private String subjectId;
+
+        @ApiModelProperty("是否解绑")
+        private Boolean bindTenant;
+    }
+}