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

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

@@ -97,10 +97,10 @@ public class SubjectServiceImpl extends BaseServiceImpl<Long, Subject> implement
     public List<SubjectSelectVo> subjectSelect() {
         List<Subject> allList = subjectDao.findAll(new HashMap<>());
         List<SubjectSelectVo> allListVo = new ArrayList<>();
-        allList.stream().forEach(o->{
+        allList.stream().forEach(o -> {
             SubjectSelectVo subjectSelectVo = new SubjectSelectVo();
             try {
-                BeanUtils.copyProperties(o,subjectSelectVo);
+                BeanUtils.copyProperties(subjectSelectVo, o);
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -116,14 +116,14 @@ public class SubjectServiceImpl extends BaseServiceImpl<Long, Subject> implement
                 .collect(Collectors.toList());
 
         for (SubjectSelectVo parent : parents) {
-            if(null == parent.getId()){
+            if (null == parent.getId()) {
                 continue;
             }
             for (SubjectSelectVo subject : subjects) {
-                if(null == subject.getId() || null == subject.getParentSubjectId()){
+                if (null == subject.getId() || null == subject.getParentSubjectId()) {
                     continue;
                 }
-                if(subject.getParentSubjectId().equals(parent.getId())){
+                if (subject.getParentSubjectId().equals(parent.getId())) {
                     parent.getChildren().add(subject);
                 }
             }

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

@@ -41,7 +41,7 @@ public class TeacherAuthEntryRecordServiceImpl extends ServiceImpl<TeacherAuthEn
         baseMapper.updateUserCard(teacherApplyDetailDto);
         //新增申请记录
         TeacherAuthEntryRecord teacherAuthEntryRecord = new TeacherAuthEntryRecord();
-        BeanUtils.copyProperties(teacherApplyDetailDto, teacherAuthEntryRecord);
+        BeanUtils.copyProperties(teacherAuthEntryRecord, teacherApplyDetailDto);
 
         return HttpResponseResult.status(baseMapper.insert(teacherAuthEntryRecord) > 0);
     }

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

@@ -0,0 +1,86 @@
+package com.yonge.cooleshow.biz.dal.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.yonge.cooleshow.biz.dal.entity.Teacher;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022/3/21 18:37
+ */
+@ApiModel(value = "TeacherHomeVo对象", description = "老师主页基本信息返回")
+public class TeacherHomeVo {
+    @ApiModelProperty("头像地址")
+    private String heardUrl;
+    @ApiModelProperty("老师姓名")
+    private String name;
+    @ApiModelProperty("星级")
+    private Integer starGrade;
+
+    @ApiModelProperty("粉丝数")
+    private Integer fansNum;
+    @ApiModelProperty("已上课时")
+    private Integer expTime;
+    @ApiModelProperty("未上课时")
+    private Integer unExpTime;
+
+    @ApiModelProperty("老师入驻状态  1、审核中 2、通过 3、不通过 ")
+    private Integer entryStatus;
+
+    public String getHeardUrl() {
+        return heardUrl;
+    }
+
+    public void setHeardUrl(String heardUrl) {
+        this.heardUrl = heardUrl;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Integer getStarGrade() {
+        return starGrade;
+    }
+
+    public void setStarGrade(Integer starGrade) {
+        this.starGrade = starGrade;
+    }
+
+    public Integer getFansNum() {
+        return fansNum;
+    }
+
+    public void setFansNum(Integer fansNum) {
+        this.fansNum = fansNum;
+    }
+
+    public Integer getExpTime() {
+        return expTime;
+    }
+
+    public void setExpTime(Integer expTime) {
+        this.expTime = expTime;
+    }
+
+    public Integer getUnExpTime() {
+        return unExpTime;
+    }
+
+    public void setUnExpTime(Integer unExpTime) {
+        this.unExpTime = unExpTime;
+    }
+
+    public Integer getEntryStatus() {
+        return entryStatus;
+    }
+
+    public void setEntryStatus(Integer entryStatus) {
+        this.entryStatus = entryStatus;
+    }
+}

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

@@ -1,6 +1,8 @@
 package com.yonge.cooleshow.teacher.controller;
 
+import com.yonge.cooleshow.biz.dal.vo.TeacherHomeVo;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 
@@ -8,6 +10,7 @@ import java.util.List;
 
 import javax.validation.Valid;
 
+import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -46,92 +49,103 @@ public class TeacherController extends BaseController {
 
     @ApiOperation(value = "根据教师编号查询教师基本信息")
     @GetMapping("/queryUserInfo")
-    public Object queryUserInfo() {
-    	SysUser user = sysUserFeignService.queryUserInfo();
-		if (user == null) {
-			return failed(HttpStatus.FORBIDDEN, "请登录");
-		}
-		Teacher teacher = teacherService.getById(user.getId());
-
-		return succeed(teacher);
+    public HttpResponseResult<TeacherHomeVo> queryUserInfo() {
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (user == null) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        Teacher teacher = teacherService.getById(user.getId());
+		TeacherHomeVo teacherHomeVo = new TeacherHomeVo();
+		teacherHomeVo.setHeardUrl(user.getAvatar());
+		teacherHomeVo.setName(user.getUsername());
+		//todo 老师授课信息
+		teacherHomeVo.setStarGrade(1);
+		teacherHomeVo.setFansNum(1);
+		teacherHomeVo.setExpTime(1);
+		teacherHomeVo.setUnExpTime(1);
+
+		teacherHomeVo.setEntryStatus(teacher.getEntryStatus());
+		return succeed(teacherHomeVo);
     }
 
-	/**
+    /**
      * 查询单条
      */
     @GetMapping("/detail")
     @ApiOperation(value = "详情", notes = "传入teacher")
     public HttpResponseResult<Teacher> detail(Teacher teacher) {
-		Teacher detail = teacherService.getOne(Condition.getQueryWrapper(teacher));
-		return succeed(detail);
-	}
-
-	/**
-	 * 查询单条
-	 */
-	@GetMapping("/detail1")
-	@ApiOperation(value = "详情", notes = "传入teacher")
-	public HttpResponseResult<Teacher> detail1(Teacher teacher) {
-		return succeed(teacherService.detail1(teacher.getUserId()));
-	}
-    
-    
+        Teacher detail = teacherService.getOne(Condition.getQueryWrapper(teacher));
+        return succeed(detail);
+    }
+
+    /**
+     * 查询单条
+     */
+    @GetMapping("/detail1")
+    @ApiOperation(value = "详情", notes = "传入teacher")
+    public HttpResponseResult<Teacher> detail1(Teacher teacher) {
+        return succeed(teacherService.detail1(teacher.getUserId()));
+    }
+
+
     /**
      * 查询集合
      */
     @GetMapping("/list")
     @ApiOperation(value = "查询集合", notes = "传入teacher")
     public HttpResponseResult<List<Teacher>> list(Teacher teacher) {
-		List<Teacher> list = teacherService.list();
-		return succeed(list);
-	}
-    
+        List<Teacher> list = teacherService.list();
+        return succeed(list);
+    }
+
     /**
      * 查询分页
      */
     @GetMapping("/page")
     @ApiOperation(value = "查询分页", notes = "传入teacher")
     public HttpResponseResult<IPage<Teacher>> page(Teacher teacher, Query query) {
-		IPage<Teacher> pages = teacherService.selectPage(Condition.getPage(query), teacher);
-		return succeed(pages);
-	}
-    
+        IPage<Teacher> pages = teacherService.selectPage(Condition.getPage(query), teacher);
+        return succeed(pages);
+    }
+
     /**
-	 * 新增
-	 */
-	@PostMapping("/save")
-	@ApiOperation(value = "新增", notes = "传入teacher")
-	public HttpResponseResult save(@Valid @RequestBody Teacher teacher) {
-    	return status(teacherService.save(teacher));
-	}
-    
+     * 新增
+     */
+    @PostMapping("/save")
+    @ApiOperation(value = "新增", notes = "传入teacher")
+    public HttpResponseResult save(@Valid @RequestBody Teacher teacher) {
+        return status(teacherService.save(teacher));
+    }
+
     /**
-	 * 修改
-	 */
-	@PostMapping("/update")
-	@ApiOperation(value = "修改", notes = "传入teacher")
-	public HttpResponseResult update(@Valid @RequestBody Teacher teacher) {
+     * 修改
+     */
+    @PostMapping("/update")
+    @ApiOperation(value = "修改", notes = "传入teacher")
+    public HttpResponseResult update(@Valid @RequestBody Teacher teacher) {
         return status(teacherService.updateById(teacher));
-	}
-    
+    }
+
     /**
-	 * 新增或修改
-	 */
+     * 新增或修改
+     */
     @PostMapping("/submit")
     @ApiOperation(value = "新增或修改", notes = "传入teacher")
-	public HttpResponseResult submit(@RequestBody Teacher teacher) {
+    public HttpResponseResult submit(@RequestBody Teacher teacher) {
         return status(teacherService.saveOrUpdate(teacher));
     }
 
- 	/**
-	 * 删除
-	 */
-	@PostMapping("/remove")
-	@ApiOperation(value = "逻辑删除", notes = "传入ids")
-	public HttpResponseResult remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+    /**
+     * 删除
+     */
+    @PostMapping("/remove")
+    @ApiOperation(value = "逻辑删除", notes = "传入ids")
+    public HttpResponseResult remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
         if (StringUtil.isEmpty(ids)) {
-			return failed("参数不能为空");
-		}
-		return status(teacherService.removeByIds(StringUtil.toLongList(ids)));
-	}
+            return failed("参数不能为空");
+        }
+        return status(teacherService.removeByIds(StringUtil.toLongList(ids)));
+    }
+
+
 }