Merge branch 'dev_1_2_20220802' of http://git.dayaedu.com/yonge/cooleshow into dev_1_2_20220802

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/StudentDao.java

@@ -62,6 +62,6 @@ public interface StudentDao extends BaseMapper<Student> {
      * @param query
      * @return
      */
-    List<MyFollow> queryMyFollow(@Param("page") IPage<MyFollow> page, @Param("param") QueryMyFollowSearch query);
+    List<MyFollow> queryMyFollow(@Param("page") IPage page, @Param("param") QueryMyFollowSearch query);
 
 }

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

@@ -111,12 +111,9 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
         return subjectList;
     }
 
+    @Override
     public IPage<MyFollow> queryMyFollow(IPage<MyFollow> page,  QueryMyFollowSearch query) {
         List<MyFollow> teacherVos = baseMapper.queryMyFollow(page, query);
-        for(MyFollow myFollow : teacherVos){
-            TeacherHomeVo data = teacherService.queryTeacherHome(query.getUserId(), Long.parseLong(myFollow.getUserId())).getData();
-            myFollow.setTeacher(data);
-        }
         return page.setRecords(teacherVos);
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/MyFollow.java

@@ -1,14 +1,20 @@
 package com.yonge.cooleshow.biz.dal.vo;
 
+import com.yonge.cooleshow.biz.dal.entity.Teacher;
 import com.yonge.cooleshow.biz.dal.enums.GenderEnum;
 import com.yonge.cooleshow.common.entity.BaseEntity;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.io.Serializable;
+
 /**
  * @Author: cy
  * @Date: 2022/5/12
  */
-public class MyFollow extends BaseEntity {
+public class MyFollow implements Serializable {
+    private static final long serialVersionUID = 1L;
+
     @ApiModelProperty("用户id")
     private String userId;
     @ApiModelProperty("昵称")
@@ -19,7 +25,6 @@ public class MyFollow extends BaseEntity {
     private String avatar;
     @ApiModelProperty(value = "性别 0女 1男")
     private GenderEnum gender;
-
     @ApiModelProperty("星级")
     private Double starGrade;
     @ApiModelProperty("粉丝数")
@@ -27,18 +32,17 @@ public class MyFollow extends BaseEntity {
     @ApiModelProperty("已上课时数")
     private Integer expTime;
     @ApiModelProperty("是否在直播")
-    private Integer liveFlag;
+    private YesOrNoEnum liveFlag;
     @ApiModelProperty("房间编号")
     private String roomUid;
-
     @ApiModelProperty("音乐人(0:否 1:是)")
-    private Integer musicianFlag;
+    private YesOrNoEnum musicianFlag;
     @ApiModelProperty("老师入驻(0:否 1:是)")
-    private Integer entryFlag;
+    private YesOrNoEnum entryFlag;
     @ApiModelProperty("专业技能")
     private String subjectName;
     @ApiModelProperty("老师对象")
-    private TeacherHomeVo teacher;
+    private Teacher teacher;
 
     public String getRoomUid() {
         return roomUid;
@@ -48,11 +52,11 @@ public class MyFollow extends BaseEntity {
         this.roomUid = roomUid;
     }
 
-    public Integer getEntryFlag() {
+    public YesOrNoEnum getEntryFlag() {
         return entryFlag;
     }
 
-    public void setEntryFlag(Integer entryFlag) {
+    public void setEntryFlag(YesOrNoEnum entryFlag) {
         this.entryFlag = entryFlag;
     }
 
@@ -126,19 +130,19 @@ public class MyFollow extends BaseEntity {
         this.expTime = expTime;
     }
 
-    public Integer getLiveFlag() {
+    public YesOrNoEnum getLiveFlag() {
         return liveFlag;
     }
 
-    public void setLiveFlag(Integer liveFlag) {
+    public void setLiveFlag(YesOrNoEnum liveFlag) {
         this.liveFlag = liveFlag;
     }
 
-    public Integer getMusicianFlag() {
+    public YesOrNoEnum getMusicianFlag() {
         return musicianFlag;
     }
 
-    public void setMusicianFlag(Integer musicianFlag) {
+    public void setMusicianFlag(YesOrNoEnum musicianFlag) {
         this.musicianFlag = musicianFlag;
     }
 
@@ -150,11 +154,11 @@ public class MyFollow extends BaseEntity {
         this.subjectName = subjectName;
     }
 
-    public TeacherHomeVo getTeacher() {
+    public Teacher getTeacher() {
         return teacher;
     }
 
-    public void setTeacher(TeacherHomeVo teacher) {
+    public void setTeacher(Teacher teacher) {
         this.teacher = teacher;
     }
 }

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

@@ -139,21 +139,36 @@
         )
     </select>
 
-    <select id="queryMyFollow" resultType="com.yonge.cooleshow.biz.dal.vo.MyFollow">
+    <resultMap id="queryMyFollowResult" type="com.yonge.cooleshow.biz.dal.vo.MyFollow">
+        <id column="userId" property="userId" />
+        <result column="avatar" property="avatar" />
+        <result column="userName" property="userName" />
+        <result column="realName" property="realName" />
+        <result column="gender" property="gender" />
+        <result column="starGrade" property="starGrade" />
+        <result column="fansNum" property="fansNum" />
+        <result column="liveFlag" property="liveFlag" />
+        <result column="subjectName" property="subjectName" />
+        <result column="roomUid" property="roomUid" />
+        <association property="teacher"  javaType="com.yonge.cooleshow.biz.dal.entity.Teacher" resultMap="com.yonge.cooleshow.biz.dal.dao.TeacherDao.BaseResultMap"/>
+    </resultMap>
+
+    <select id="queryMyFollow" resultMap="queryMyFollowResult">
         SELECT
-            s.teacher_id_ AS userId,
-            u.avatar_ AS avatar,
-            u.username_ AS userName,
-            u.real_name_ AS realName,
-            u.gender_ AS gender,
-            t.star_grade_ AS starGrade,
-            t.fans_num_ AS fansNum,
-            t.live_flag_ AS liveFlag,
-            t.exp_time_ AS expTime,
-            tr.musician_flag_ AS musicianFlag,
-            tr.entry_flag_ AS entryFlag,
+            s.teacher_id_ as userId,
+            u.avatar_ as avatar,
+            u.username_ as userName,
+            u.real_name_ as realName,
+            u.gender_ as gender,
+            t.star_grade_ as starGrade,
+            t.fans_num_ as fansNum,
+            t.live_flag_ as liveFlag,
+            t.exp_time_ as expTime,
             (SELECT group_concat( name_ ) FROM `subject` WHERE find_in_set( id_, tr.subject_id_ )) AS subjectName,
-            r.room_uid_ AS roomUid
+            r.room_uid_ as roomUid,
+            tr.entry_flag_ as entryFlag,
+            tr.musician_flag_ as musicianFlag,
+            tr.*
         FROM student_star s
         LEFT JOIN sys_user u ON s.teacher_id_ = u.id_
         LEFT JOIN teacher_total t ON s.teacher_id_ = t.user_id_