update

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ClassGroupDao.java

@@ -7,6 +7,7 @@ import com.ym.mec.biz.dal.dto.TeacherVipClassInfoDto;
 import com.ym.mec.biz.dal.entity.ClassGroup;
 import com.ym.mec.common.dal.BaseDAO;
 
+import com.ym.mec.common.entity.ImGroupModel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -91,12 +92,19 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
      * @param musicGroupId
      * @return
      */
-    List<ClassGroupTeachers> findClassGroupByMusicGroupId(@Param("musicGroupId") int musicGroupId);
+    List<ClassGroupTeachers> findClassGroupByMusicGroupId(@Param("musicGroupId") Integer musicGroupId);
 
     /**
      * 获取学生所购买课程列表
      * @param userId
      * @return
      */
-    List<CourseListDto> queryCoursePage(int userId);
+    List<CourseListDto> queryCoursePage(Integer userId);
+
+    /**
+     * 获取学员所在群组信息
+     * @param userId
+     * @return
+     */
+    List<ImGroupModel> queryUserGroups(Integer userId);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicGroupDao.java

@@ -1,5 +1,7 @@
 package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dto.BasicUserDto;
 import com.ym.mec.biz.dal.dto.MusicCardDto;
 import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
@@ -38,4 +40,11 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
      * @return
      */
     Integer countCourseByType(@Param("userId") Integer userId, @Param("type") ClassGroupTypeEnum type);
+
+    /**
+     * 根绝学员编号获取相关老师列表
+     * @param studentId
+     * @return
+     */
+    List<BasicUserDto> findTeachersByStuId(Integer studentId);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/BasicUserDto.java

@@ -0,0 +1,44 @@
+package com.ym.mec.biz.dal.dto;
+
+public class BasicUserDto {
+
+    private Integer userId;
+
+    private String name;
+
+    private String headUrl;
+
+    private Integer gender;
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getHeadUrl() {
+        return headUrl;
+    }
+
+    public void setHeadUrl(String headUrl) {
+        this.headUrl = headUrl;
+    }
+
+    public Integer getGender() {
+        return gender;
+    }
+
+    public void setGender(Integer gender) {
+        this.gender = gender;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/MusicCardDto.java

@@ -8,6 +8,9 @@ public class MusicCardDto {
     @ApiModelProperty(value = "用户姓名",required = true)
     private String userName;
 
+    @ApiModelProperty(value = "乐团编号",required = true)
+    private String musicGroupId;
+
     @ApiModelProperty(value = "乐团名称",required = true)
     private String musicGroupName;
 
@@ -29,6 +32,14 @@ public class MusicCardDto {
     @ApiModelProperty(value = "vip课数量",required = true)
     private Integer vipClassNum;
 
+    public String getMusicGroupId() {
+        return musicGroupId;
+    }
+
+    public void setMusicGroupId(String musicGroupId) {
+        this.musicGroupId = musicGroupId;
+    }
+
     public Integer getMusicGroupNum() {
         return musicGroupNum;
     }

mec-biz/src/main/java/com/ym/mec/biz/service/ClassGroupService.java

@@ -5,6 +5,7 @@ import java.util.List;
 import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.ClassGroup;
 import com.ym.mec.biz.dal.page.VipClassQueryInfo;
+import com.ym.mec.common.entity.ImGroupModel;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
 import org.apache.ibatis.annotations.Param;
@@ -105,5 +106,12 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
      * @param userId
      * @return
      */
-    List<CourseListDto> queryCoursePage(int userId);
+    List<CourseListDto> queryCoursePage(Integer userId);
+
+    /**
+     * 获取学员所在群组信息
+     * @param userId
+     * @return
+     */
+    List<ImGroupModel> queryUserGroups(Integer userId);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/MusicGroupService.java

@@ -1,5 +1,7 @@
 package com.ym.mec.biz.service;
 
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dto.BasicUserDto;
 import com.ym.mec.biz.dal.dto.MusicCardDto;
 import com.ym.mec.biz.dal.dto.SubFeeSettingDto;
 import com.ym.mec.biz.dal.entity.MusicGroup;
@@ -18,6 +20,7 @@ public interface MusicGroupService extends BaseService<String, MusicGroup> {
     /**
      * 建团申请数据提交
      * @param subFeeSettingDto
+     * @Author superzou
      */
     void createGroup(SubFeeSettingDto subFeeSettingDto);
 
@@ -33,4 +36,11 @@ public interface MusicGroupService extends BaseService<String, MusicGroup> {
      * @return
      */
     MusicCardDto queryPersonalMusicGroups(Integer id);
+
+    /**
+     * 根据学员编号获取相关老师列表
+     * @param studentId
+     * @return
+     */
+    List<BasicUserDto> findTeachersByStuId(Integer studentId);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupServiceImpl.java

@@ -8,6 +8,7 @@ import com.ym.mec.biz.dal.enums.*;
 import com.ym.mec.biz.dal.page.VipClassQueryInfo;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.entity.ImGroupModel;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.util.collection.MapUtil;
@@ -263,7 +264,12 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     }
 
     @Override
-    public List<CourseListDto> queryCoursePage(int userId) {
+    public List<CourseListDto> queryCoursePage(Integer userId) {
         return classGroupDao.queryCoursePage(userId);
     }
+
+    @Override
+    public List<ImGroupModel> queryUserGroups(Integer userId) {
+        return classGroupDao.queryUserGroups(userId);
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupServiceImpl.java

@@ -1,6 +1,8 @@
 package com.ym.mec.biz.service.impl;
 
+import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.*;
+import com.ym.mec.biz.dal.dto.BasicUserDto;
 import com.ym.mec.biz.dal.dto.MusicCardDto;
 import com.ym.mec.biz.dal.dto.SubFeeSettingDto;
 import com.ym.mec.biz.dal.entity.*;
@@ -101,4 +103,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup>
 		musicCardDto.setVipClassNum(musicGroupDao.countCourseByType(id,ClassGroupTypeEnum.VIP));
 		return musicGroupDao.queryPersonalMusicGroups(id);
 	}
+
+	@Override
+	public List<BasicUserDto> findTeachersByStuId(Integer studentId) {
+		return musicGroupDao.findTeachersByStuId(studentId);
+	}
 }

mec-biz/src/main/resources/config/mybatis/ClassGroupMapper.xml

@@ -286,4 +286,15 @@
             WHERE cgsm.user_id_ = #{userId} AND cg.type_ = 'VIP') a
             ORDER BY a.create_time_ DESC
     </select>
+
+    <resultMap id="imGroupModel" type="com.ym.mec.common.entity.ImGroupModel">
+        <result column="id_" property="id"/>
+        <result column="name_" property="name"/>
+        <result column="student_num_" property="minute"/>
+    </resultMap>
+    <select id="queryUserGroups" resultMap="imGroupModel">
+        SELECT cg.id_,cg.name_,cg.student_num_ FROM class_group_student_mapper cgsm
+        LEFT JOIN class_group cg ON cgsm.class_group_id_ = cg.id_
+        WHERE cgsm.user_id_ = #{userId}
+    </select>
 </mapper>

mec-biz/src/main/resources/config/mybatis/MusicGroupMapper.xml

@@ -133,6 +133,7 @@
 		<result column="current_class_" property="currentClass" />
 		<result column="current_grade_" property="currentGrade" />
 		<result column="music_group_name_" property="musicGroupName" />
+		<result column="music_group_id_" property="musicGroupId" />
 		<result column="vip_class_num_" property="vipClassNum" />
 		<result column="music_group_num_" property="musicGroupNum" />
 		<result column="payment_status_" property="paymentStatus" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
@@ -140,7 +141,7 @@
 
     <select id="queryUserMusicGroups" resultMap="queryUserMusicGroupsMap">
 		SELECT sr.name_ user_name_,sr.current_class_,sr.current_grade_,
-		sr.payment_status_,mg.name_ music_group_name_,s.name_ subject_name_
+		sr.payment_status_,mg.name_ music_group_name_,s.name_ subject_name_,mg.id_ music_group_id_
 		FROM student_registration sr
 		LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
 		LEFT JOIN `subject` s ON sr.actual_subject_id_ = s.id_
@@ -166,4 +167,19 @@
 		LEFT JOIN class_group cg ON sr.class_group_id_ = cg.id_
 		WHERE sr.user_id_ = #{userId} AND cg.type_ = #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 	</select>
+
+	<resultMap type="com.ym.mec.biz.dal.dto.BasicUserDto" id="BasicUserDto">
+		<result column="username_" property="name" />
+		<result column="user_id_" property="userId" />
+		<result column="head_url_" property="headUrl" />
+		<result column="gender_" property="gender"/>
+	</resultMap>
+	<select id="findTeachersByStuId" resultMap="BasicUserDto">
+		SELECT username_,id_ user_id_,avatar_ head_url_,gender_ FROM sys_user
+		WHERE id_ IN (SELECT DISTINCT(su.id_) FROM class_group_student_mapper cgsp
+		LEFT JOIN class_group cg ON cgsp.class_group_id_ = cg.id_
+		LEFT JOIN class_group_teacher_mapper cgtm ON cg.id_ = cgtm.class_group_id_
+		LEFT JOIN sys_user su ON cgtm.user_id_ = su.id_
+		WHERE cgsp.user_id_ = #{studentId})
+	</select>
 </mapper>

mec-student/src/main/java/com/ym/mec/student/controller/CourseController.java

@@ -1,5 +1,7 @@
 package com.ym.mec.student.controller;
 
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.service.ClassGroupService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.security.AuthUser;
@@ -18,14 +20,26 @@ public class CourseController extends BaseController {
 
     @Autowired
     private ClassGroupService classGroupService;
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
 
     @ApiOperation("获取学生所购买课程列表")
     @GetMapping(value = "/queryUserMusicGroups")
     public Object queryCoursePage(){
-        AuthUser user = SecurityUtils.getUser();
-//        if(user == null){
-//            return failed("请登录");
-//        }
-        return succeed(classGroupService.queryCoursePage(1));
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if(sysUser == null){
+            return failed("请登录");
+        }
+        return succeed(classGroupService.queryCoursePage(sysUser.getId()));
+    }
+
+    @ApiOperation("获取学员所有群组")
+    @GetMapping(value = "/queryUserGroups")
+    public Object queryUserGroups(){
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if(sysUser == null){
+            return failed("请登录");
+        }
+        return succeed(classGroupService.queryUserGroups(sysUser.getId()));
     }
 }

mec-student/src/main/java/com/ym/mec/student/controller/MusicGroupController.java

@@ -27,11 +27,10 @@ public class MusicGroupController extends BaseController {
     @GetMapping(value = "/queryUserMusicGroups")
     public Object queryUserMusicGroups(){
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        AuthUser user = SecurityUtils.getUser();
         if(sysUser == null){
             return failed("请重新登录");
         }
-        return succeed(musicGroupService.queryUserMusicGroups(1));
+        return succeed(musicGroupService.queryUserMusicGroups(sysUser.getId()));
     }
 
     @ApiOperation("获取学生个人中心乐团信息")
@@ -41,6 +40,16 @@ public class MusicGroupController extends BaseController {
         if(sysUser == null){
             return failed("请重新登录");
         }
-        return succeed(musicGroupService.queryPersonalMusicGroups(1));
+        return succeed(musicGroupService.queryPersonalMusicGroups(sysUser.getId()));
+    }
+
+    @ApiOperation(value = "根据学员编号，获取有关联的老师列表")
+    @GetMapping("/findTeachersByStuId")
+    public Object findTeachersByStuId(){
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if(sysUser == null){
+            return failed("请重新登录");
+        }
+        return succeed(musicGroupService.findTeachersByStuId(sysUser.getId()));
     }
 }

mec-web/src/main/java/com/ym/mec/web/controller/MusicGroupController.java

@@ -28,20 +28,6 @@ public class MusicGroupController extends BaseController {
     @Autowired
     private MusicGroupService musicGroupService;
 
-/*    @ApiOperation(value = "新增乐团")
-    @PostMapping("/add")
-    public Object add(@RequestBody MusicGroup musicGroup){
-        if(musicGroup != null){
-            if(StringUtils.isNotEmpty(musicGroup.getPaymentMonths())){
-                musicGroupService.add(musicGroup);
-            }else {
-                musicGroupService.insert(musicGroup);
-            }
-            return succeed();
-        }
-        return failed();
-    }*/
-
     @ApiOperation(value = "删除乐团")
     @PostMapping("/del/{id}")
     public Object del(@ApiParam(value = "乐团编号", required = true) @PathVariable("id") String id){

mec-web/src/main/java/com/ym/mec/web/controller/TeacherController.java

@@ -1,5 +1,6 @@
 package com.ym.mec.web.controller;
 
+import com.ym.mec.common.security.SecurityUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;