查询老师用户信息接口修改

.gitignore

@@ -51,4 +51,5 @@ mvnw.cmd
 .metadata
 target
 *.classpath
-/bin/
+/bin/
+**/bootstrap-local.yml

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

@@ -28,6 +28,7 @@ import com.yonge.cooleshow.common.enums.UserGenderEnum;
 import com.yonge.cooleshow.common.exception.BizException;
 import com.yonge.toolset.utils.idcard.IdcardInfoExtractor;
 import com.yonge.toolset.utils.string.StringUtil;
+import org.apache.commons.beanutils.BeanUtils;
 import org.apache.poi.ss.formula.functions.T;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,6 +38,7 @@ import com.yonge.cooleshow.biz.dal.dao.TeacherDao;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -70,7 +72,9 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
         List<TeacherStyleVideo> teacherStyleVideos = teacherStyleVideoService.selectListByUserId(userId);
         detail.setStyleVideo(teacherStyleVideos);
         TeacherAuthEntryRecordVo lastRecordByUserId = entryRecordService.getLastRecordByUserId(userId);
-        detail.setVerifyUser(lastRecordByUserId.getVerifyUser());
+        if(null != lastRecordByUserId){
+            detail.setVerifyUser(lastRecordByUserId.getVerifyUser());
+        }
         return detail;
     }
 
@@ -98,16 +102,16 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
             return HttpResponseResult.failed("未查询到老师信息");
         }
         TeacherHomeVo teacherHomeVo = new TeacherHomeVo();
-        teacherHomeVo.setUserId(user.getId());
-
+        try {
+            BeanUtils.copyProperties(teacherHomeVo,teacher);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         String avatar = user.getAvatar();
         if (StringUtil.isEmpty(avatar)) {
             avatar = sysConfigService.findConfigValue(SysConfigConstant.DEFAULT_HEARD_TEACHER);
         }
         teacherHomeVo.setHeardUrl(avatar);
-        teacherHomeVo.setUsername(user.getUsername());
-        teacherHomeVo.setLiveFlag(teacher.getLiveFlag());
-        teacherHomeVo.setSubjectId(teacher.getSubjectId());
 
         TeacherAuthEntryRecord entryRecord = entryRecordService.getLastRecordByUserId(user.getId());
         if (null == entryRecord) {

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

@@ -18,6 +18,8 @@ import java.util.Date;
  */
 @ApiModel(value = "TeacherHomeVo对象", description = "老师主页基本信息返回")
 public class TeacherHomeVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+
     @ApiModelProperty("对应user表用户编号")
     private Long userId;
     @ApiModelProperty("头像地址")
@@ -38,8 +40,10 @@ public class TeacherHomeVo implements Serializable {
     private AuthStatusEnum musicianAuthStatus;
     @ApiModelProperty("是否有直播权限 0 否 1 是")
     private YesOrNoEnum liveFlag;
-    @ApiModelProperty("专业技能（支持多个，用逗号分隔），对应科目表编号 ")
+    @ApiModelProperty(value = "声部id（支持多个，用逗号分隔） ")
     private String subjectId;
+    @ApiModelProperty(value = "声部名称（支持多个，用逗号分隔） ")
+    private String subjectName;
 
     public Long getUserId() {
         return userId;
@@ -128,4 +132,12 @@ public class TeacherHomeVo implements Serializable {
     public void setSubjectId(String subjectId) {
         this.subjectId = subjectId;
     }
+
+    public String getSubjectName() {
+        return subjectName;
+    }
+
+    public void setSubjectName(String subjectName) {
+        this.subjectName = subjectName;
+    }
 }

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

@@ -11,6 +11,8 @@ import java.io.Serializable;
  */
 @ApiModel(value = "TeacherTotalVo对象", description = "老师统计信息返回")
 public class TeacherTotalVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+
     @ApiModelProperty("对应user表用户编号")
     private Long userId;
     @ApiModelProperty("星级")

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

@@ -17,6 +17,8 @@ import java.util.List;
  */
 @ApiModel(value = "TeacherVo对象", description = "教师详情")
 public class TeacherVo extends Teacher {
+    private static final long serialVersionUID = 1L;
+
     @ApiModelProperty("头像地址")
     private String avatar;
     @ApiModelProperty("老师昵称")

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

@@ -116,7 +116,7 @@
             (case when isnull(b.user_id_) then 0 else 1 end) as isBank,
             (
                 SELECT GROUP_CONCAT(name_) FROM subject WHERE FIND_IN_SET(id_,t.subject_id_)
-            ) as subjectName,
+            ) as subjectName
         FROM teacher t
         left join sys_user u on t.user_id_ = u.id_
         left join (