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

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/Teacher.java

@@ -84,6 +84,13 @@ public class Teacher implements Serializable {
     @ApiModelProperty("音乐人审核状态   1、审核中 2、通过 3、不通过 ")
 	@TableField(value = "musician_auth_status_")
     private Integer musicianAuthStatus;
+    /**
+     * 直播权限 0 否 1 是
+     */
+    @ApiModelProperty("直播权限 0 否 1 是")
+    @TableField(value = "live_flag_")
+    private Integer liveFlag;
+
     /** 
     * 音乐人认证时间 
     */
@@ -274,4 +281,12 @@ public class Teacher implements Serializable {
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
+
+    public Integer getLiveFlag() {
+        return liveFlag;
+    }
+
+    public void setLiveFlag(Integer liveFlag) {
+        this.liveFlag = liveFlag;
+    }
 }

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.yonge.cooleshow.biz.dal.dto.req.TeacherSetReq;
 import com.yonge.cooleshow.biz.dal.entity.Teacher;
 import com.yonge.cooleshow.biz.dal.vo.TeacherVo;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
 
 /**
  * 教师表 服务类
@@ -36,5 +37,12 @@ public interface TeacherService extends IService<Teacher>  {
      * @updateTime 2022/3/22 11:04
      */
     void submitSetDetail(TeacherSetReq setReq, Long id);
-
+    /***
+     * 开通直播
+     * @author liweifan
+     * @param: setReq
+     * @param: id
+     * @updateTime 2022/3/22 11:04
+     */
+    HttpResponseResult<Boolean> openLive(Long id);
 }

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

@@ -6,6 +6,7 @@ import com.yonge.cooleshow.biz.dal.dao.SubjectDao;
 import com.yonge.cooleshow.biz.dal.dto.req.TeacherSetReq;
 import com.yonge.cooleshow.biz.dal.entity.Subject;
 import com.yonge.cooleshow.biz.dal.vo.TeacherVo;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.yonge.cooleshow.biz.dal.entity.Teacher;
@@ -36,4 +37,16 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
         baseMapper.updatetSetDetail(setReq, id);
     }
 
+    @Override
+    public HttpResponseResult<Boolean> openLive(Long id) {
+        //todo 根据老师规则，判断老师直播权限
+        if(true){
+            Teacher teacher = new Teacher();
+            teacher.setUserId(id);
+            teacher.setLiveFlag(1);
+            baseMapper.updateById(teacher);
+        }
+        return HttpResponseResult.status(true);
+    }
+
 }

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

@@ -1,9 +1,13 @@
 package com.yonge.cooleshow.biz.dal.vo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yonge.cooleshow.biz.dal.entity.Teacher;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
 
 /**
  * @Author: liweifan
@@ -25,6 +29,10 @@ public class TeacherHomeVo {
     private Integer unExpTime;
     @ApiModelProperty("老师入驻状态  1、审核中 2、通过 3、不通过 ")
     private Integer entryStatus;
+    @ApiModelProperty("音乐人审核状态  1、审核中 2、通过 3、不通过 ")
+    private Integer musicianAuthStatus;
+    @ApiModelProperty("是否有直播权限 0 否 1 是")
+    private Integer liveFlag;
 
     public String getHeardUrl() {
         return heardUrl;
@@ -81,4 +89,20 @@ public class TeacherHomeVo {
     public void setEntryStatus(Integer entryStatus) {
         this.entryStatus = entryStatus;
     }
+
+    public Integer getMusicianAuthStatus() {
+        return musicianAuthStatus;
+    }
+
+    public void setMusicianAuthStatus(Integer musicianAuthStatus) {
+        this.musicianAuthStatus = musicianAuthStatus;
+    }
+
+    public Integer getLiveFlag() {
+        return liveFlag;
+    }
+
+    public void setLiveFlag(Integer liveFlag) {
+        this.liveFlag = liveFlag;
+    }
 }

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

@@ -39,25 +39,28 @@ public class TeacherController extends BaseController {
 		TeacherHomeVo teacherHomeVo = new TeacherHomeVo();
 		teacherHomeVo.setHeardUrl(user.getAvatar());
 		teacherHomeVo.setUsername(user.getUsername());
+
+        teacherHomeVo.setEntryStatus(teacher.getEntryStatus());
+        teacherHomeVo.setMusicianAuthStatus(teacher.getMusicianAuthStatus());
+        teacherHomeVo.setLiveFlag(teacher.getLiveFlag());
+
 		//todo 老师授课信息
 		teacherHomeVo.setStarGrade(1);
 		teacherHomeVo.setFansNum(1);
 		teacherHomeVo.setExpTime(1);
 		teacherHomeVo.setUnExpTime(1);
 
-		teacherHomeVo.setEntryStatus(teacher.getEntryStatus());
 		return succeed(teacherHomeVo);
     }
 
-    @ApiOperation(value = "判断老师直播权限")
-    @GetMapping("/checkLiveAuth")
-    public HttpResponseResult<Boolean> checkLiveAuth(){
+    @ApiOperation(value = "开通直播")
+    @GetMapping("/openLive")
+    public HttpResponseResult<Boolean> openLive(){
         SysUser user = sysUserFeignService.queryUserInfo();
         if (user == null) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
-        //todo 根据老师规则，判断老师直播权限
-        return HttpResponseResult.succeed(true);
+        return  teacherService.openLive(user.getId());
     }
 
     @GetMapping("/getSetDetail")
@@ -83,5 +86,4 @@ public class TeacherController extends BaseController {
         return succeed(teacherService.getSetDetail(user.getId()));
     }
 
-
 }