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

.gitignore

@@ -23,6 +23,7 @@ mvnw.cmd
 *.ipr
 /toolset/codegen/src/main/resources/generateConfigration.xml
 **/bootstrap-dev.yml
+**/bootstrap-dev.properties
 
 
 ### 忽略子模块的文件 ###
@@ -55,5 +56,3 @@ target
 **/bootstrap-local.yml
 **/bootstrap-local.properties
 **/logback-spring.xml
-/.gitignore
-/.gitignore

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/dto/MenuQueryInfo.java

@@ -14,7 +14,7 @@ public class MenuQueryInfo extends QueryInfo{
     @ApiModelProperty(value = "节点状态，默认0显示，1不显示",required = false)
     private Integer hid;
 
-    @ApiModelProperty(value = "科目编号",required = false)
+    @ApiModelProperty(value = "声部编号",required = false)
     private Integer subjectId;
 
     private Long userId;

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/web/controller/UserController.java

@@ -437,7 +437,7 @@ public class UserController extends BaseController {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
         SysUser user = sysUserService.get(authUser.getUserId());
-        if (user == null) {
+        if (user == null || null == user.getId()) {
             return failed("用户不存在");
         }
         IdcardValidator idcardValidator = new IdcardValidator();
@@ -468,7 +468,7 @@ public class UserController extends BaseController {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
         SysUser user = sysUserService.get(authUser.getUserId());
-        if (user == null) {
+        if (user == null || null == user.getId()) {
             return failed("用户不存在");
         }
         UserSetVo detail = sysUserService.getSetDetail(user.getId());
@@ -483,7 +483,7 @@ public class UserController extends BaseController {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
         SysUser user = sysUserService.get(authUser.getUserId());
-        if (user == null) {
+        if (user == null || null == user.getId()) {
             return failed("用户不存在");
         }
         //设置

cooleshow-common/src/main/java/com/yonge/cooleshow/common/redis/config/RedisConfig.java

@@ -30,7 +30,7 @@ public class RedisConfig {
 	private int database;
 
 	@Bean
-	public RedisConnectionFactory jedisConnectionFactory() {
+	public JedisConnectionFactory jedisConnectionFactory() {
 		RedisStandaloneConfiguration config = new RedisStandaloneConfiguration();
 		config.setHostName(host);
 		config.setPort(port);
@@ -44,7 +44,7 @@ public class RedisConfig {
 	}
 
 	@Bean
-	public RedisTemplate<String, Serializable> redisTemplate(JedisConnectionFactory connectionFactory) {
+	public RedisTemplate<String, Serializable> redisTemplate(JedisConnectionFactory jedisConnectionFactory) {
 		RedisTemplate<String, Serializable> redisTemplate = new RedisTemplate<>();
 
 		StringRedisSerializer stringSerializer = new StringRedisSerializer();
@@ -53,7 +53,7 @@ public class RedisConfig {
 		redisTemplate.setHashKeySerializer(stringSerializer);
 		redisTemplate.setValueSerializer(new JdkSerializationRedisSerializer());
 		redisTemplate.setHashValueSerializer(new JdkSerializationRedisSerializer());
-		redisTemplate.setConnectionFactory(jedisConnectionFactory());
+		redisTemplate.setConnectionFactory(jedisConnectionFactory);
 		return redisTemplate;
 	}
 

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/EmployeeController.java

@@ -47,6 +47,7 @@ public class EmployeeController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "id", paramType = "path", dataType = "long", required = true),
     })
+    @PreAuthorize("@pcs.hasPermissions('employee/detail')")
     public HttpResponseResult<EmployeeVo> detail(@PathVariable("id") Long id){
         EmployeeVo detail = employeeService.detail(id);
         return succeed(detail);

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/HomeController.java

@@ -27,7 +27,7 @@ public class HomeController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('home/getUserToDoNum')")
     public HttpResponseResult<HomeTotalVo> getUserToDoNum() {
         SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null) {
+        if (user == null || null == user.getId()) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
         return succeed(homeService.getUserToDoNum(user.getId()));

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/StudentController.java

@@ -10,6 +10,7 @@ import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.page.PageInfo;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
@@ -24,6 +25,7 @@ public class StudentController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "id", paramType = "path", dataType = "long", required = true),
     })
+    @PreAuthorize("@pcs.hasPermissions('student/detail')")
     public HttpResponseResult<StudentVo> detail(@PathVariable("id") Long id){
 		StudentVo detail = studentService.detail(id);
 		return succeed(detail);
@@ -31,6 +33,7 @@ public class StudentController extends BaseController {
 
     @PostMapping("/page")
     @ApiOperation(value = "查询分页", notes = "传入StudentSearch")
+    @PreAuthorize("@pcs.hasPermissions('student/page')")
     public HttpResponseResult<PageInfo<StudentVo>> page(@RequestBody StudentSearch query) {
 		IPage<StudentVo> pages = studentService.selectPage(PageUtil.getPage(query), query);
         return succeed(PageUtil.pageInfo(pages));

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/SubjectController.java

@@ -24,21 +24,21 @@ import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.page.PageInfo;
 
 @RequestMapping("subject")
-@Api(tags = "科目服务")
+@Api(tags = "声部服务")
 @RestController
 public class SubjectController extends BaseController {
 
 	@Autowired
 	private SubjectService subjectService;
 
-	@ApiOperation(value = "根据科目编号查询科目")
+	@ApiOperation(value = "根据声部编号查询声部")
 	@GetMapping("/get/{id}")
 	@PreAuthorize("@pcs.hasPermissions('subject/get')")
-	public HttpResponseResult<Subject> get(@ApiParam(value = "科目编号", required = true) @PathVariable("id") Long id) {
+	public HttpResponseResult<Subject> get(@ApiParam(value = "声部编号", required = true) @PathVariable("id") Long id) {
 		return succeed(subjectService.get(id));
 	}
 
-	@ApiOperation(value = "分页查询科目列表")
+	@ApiOperation(value = "分页查询声部列表")
 	@GetMapping("/queryPage")
 	@PreAuthorize("@pcs.hasPermissions('subject/queryPage')")
 	public HttpResponseResult<PageInfo<Subject>> queryPage(SubjectQueryInfo queryInfo) {
@@ -55,14 +55,14 @@ public class SubjectController extends BaseController {
 		return succeed(pageInfo);
 	}
 
-	@ApiOperation(value = "分页查询科目树状列表")
+	@ApiOperation(value = "分页查询声部树状列表")
 	@GetMapping("/queryPageTree")
 	@PreAuthorize("@pcs.hasPermissions('subject/queryPageTree')")
 	public HttpResponseResult<PageInfo<Subject>> queryPageTree(SubjectQueryInfo queryInfo) {
 		return succeed(subjectService.queryPageTree(queryInfo));
 	}
 
-	@ApiOperation(value = "修改、新增科目")
+	@ApiOperation(value = "修改、新增声部")
 	@PostMapping("/upset")
 	@PreAuthorize("@pcs.hasPermissions('subject/upset')")
 	public Object update(@RequestBody Subject subject) {
@@ -70,10 +70,10 @@ public class SubjectController extends BaseController {
 		return succeed();
 	}
 
-	@ApiOperation(value = "删除指定科目")
+	@ApiOperation(value = "删除指定声部")
 	@PostMapping("/delete/{id}")
 	@PreAuthorize("@pcs.hasPermissions('subject/get')")
-	public HttpResponseResult<Subject> delete(@ApiParam(value = "科目编号", required = true) @PathVariable("id") Long id) {
+	public HttpResponseResult<Subject> delete(@ApiParam(value = "声部编号", required = true) @PathVariable("id") Long id) {
 		subjectService.deleteById(id);
 		return succeed();
 	}

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/TeacherAuthEntryRecordController.java

@@ -14,6 +14,7 @@ import com.yonge.cooleshow.common.page.PageInfo;
 import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -32,6 +33,7 @@ public class TeacherAuthEntryRecordController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "id", paramType = "path", dataType = "long", required = true),
     })
+    @PreAuthorize("@pcs.hasPermissions('teacherAuthEntryRecord/detail')")
     public HttpResponseResult<TeacherAuthEntryRecordVo> detail(@PathVariable("id") Long id) {
         TeacherAuthEntryRecordVo detail = teacherAuthEntryRecordService.detail(id);
         return succeed(detail);
@@ -39,6 +41,7 @@ public class TeacherAuthEntryRecordController extends BaseController {
 
     @PostMapping("/page")
     @ApiOperation(value = "查询分页", notes = "传入AuthEntryRecordSearch")
+    @PreAuthorize("@pcs.hasPermissions('teacherAuthEntryRecord/page')")
     public HttpResponseResult<PageInfo<TeacherAuthEntryRecordVo>> page(@RequestBody AuthEntryRecordSearch search) {
         IPage<TeacherAuthEntryRecordVo> pages = teacherAuthEntryRecordService.selectPage(PageUtil.getPage(search), search);
         return succeed(PageUtil.pageInfo(pages));
@@ -46,17 +49,9 @@ public class TeacherAuthEntryRecordController extends BaseController {
 
     @PostMapping("/doAuth")
     @ApiOperation(value = "审核", notes = "传入authOperaDto")
+    @PreAuthorize("@pcs.hasPermissions('teacherAuthEntryRecord/doAuth')")
     public HttpResponseResult<Boolean> doAuth(@Valid @RequestBody AuthOperaReq authOperaReq) throws Exception {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         return teacherAuthEntryRecordService.doAuth(authOperaReq, sysUser);
     }
-
-    @PostMapping("/remove")
-    @ApiOperation(value = "删除", notes = "传入ids")
-    public HttpResponseResult remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-        if (StringUtil.isEmpty(ids)) {
-            return failed("参数不能为空");
-        }
-        return status(teacherAuthEntryRecordService.removeByIds(StringUtil.toLongList(ids)));
-    }
 }

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/TeacherAuthMusicianRecordController.java

@@ -14,6 +14,7 @@ import com.yonge.cooleshow.common.page.PageInfo;
 import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -35,6 +36,7 @@ public class TeacherAuthMusicianRecordController extends BaseController {
 	@ApiImplicitParams({
 			@ApiImplicitParam(name = "id", value = "id", paramType = "path", dataType = "long", required = true),
 	})
+	@PreAuthorize("@pcs.hasPermissions('teacherAuthMusicianRecord/detail')")
 	public HttpResponseResult<MusicianAuthEntryRecordVo> detail(@PathVariable("id") Long id) {
 		MusicianAuthEntryRecordVo detail = teacherAuthMusicianRecordService.detail(id);
 		return succeed(detail);
@@ -45,6 +47,7 @@ public class TeacherAuthMusicianRecordController extends BaseController {
 	 */
 	@PostMapping("/page")
 	@ApiOperation(value = "查询分页", notes = "传入AuthEntryRecordSearch")
+	@PreAuthorize("@pcs.hasPermissions('teacherAuthMusicianRecord/page')")
 	public HttpResponseResult<PageInfo<MusicianAuthEntryRecordVo>> page(@RequestBody AuthEntryRecordSearch query) {
 		IPage<MusicianAuthEntryRecordVo> pages = teacherAuthMusicianRecordService.selectPage(PageUtil.getPage(query), query);
 		return succeed(PageUtil.pageInfo(pages));
@@ -52,20 +55,9 @@ public class TeacherAuthMusicianRecordController extends BaseController {
 
 	@PostMapping("/doAuth")
 	@ApiOperation(value = "审核", notes = "传入authOperaDto")
+	@PreAuthorize("@pcs.hasPermissions('teacherAuthMusicianRecord/doAuth')")
 	public HttpResponseResult<Boolean> doAuth(@Valid @RequestBody AuthOperaReq authOperaReq) throws Exception {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		return teacherAuthMusicianRecordService.doAuth(authOperaReq, sysUser);
 	}
-
- 	/**
-	 * 删除
-	 */
-	@PostMapping("/remove")
-	@ApiOperation(value = "逻辑删除", notes = "传入ids")
-	public HttpResponseResult remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-        if (StringUtil.isEmpty(ids)) {
-			return failed("参数不能为空");
-		}
-		return status(teacherAuthMusicianRecordService.removeByIds(StringUtil.toLongList(ids)));
-	}
 }

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

@@ -6,9 +6,9 @@ import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.page.PageInfo;
 import com.yonge.cooleshow.biz.dal.support.PageUtil;
 
-import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -34,6 +34,7 @@ public class TeacherController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "id", paramType = "path", dataType = "long", required = true),
     })
+    @PreAuthorize("@pcs.hasPermissions('teacher/detail')")
     public HttpResponseResult<TeacherVo> detail(@PathVariable("id") Long userId) {
         TeacherVo detail = teacherService.detail(userId);
         return succeed(detail);
@@ -44,6 +45,7 @@ public class TeacherController extends BaseController {
      */
     @PostMapping("/page")
     @ApiOperation(value = "查询分页", notes = "传入teacher")
+    @PreAuthorize("@pcs.hasPermissions('teacher/page')")
     public HttpResponseResult<PageInfo<TeacherVo>> page(@RequestBody TeacherSearch query) {
         IPage<TeacherVo> pages = teacherService.selectPage(PageUtil.getPage(query), query);
         return succeed(PageUtil.pageInfo(pages));
@@ -54,20 +56,8 @@ public class TeacherController extends BaseController {
      */
     @PostMapping("/submit")
     @ApiOperation(value = "新增或修改", notes = "传入teacher")
+    @PreAuthorize("@pcs.hasPermissions('teacher/submit')")
     public HttpResponseResult<Boolean> submit(@Valid @RequestBody TeacherSubmitReq teacherSubmitReq) {
         return teacherService.submit(teacherSubmitReq);
     }
-
-    /**
-     * 删除
-     */
-    @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)));
-    }
-
 }

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

@@ -9,18 +9,27 @@ import com.yonge.cooleshow.biz.dal.entity.Student;
 import com.yonge.cooleshow.biz.dal.vo.StudentVo;
 import org.apache.ibatis.annotations.Param;
 
-public interface StudentDao extends BaseMapper<Student>{
+public interface StudentDao extends BaseMapper<Student> {
+    /***
+     * 查询详情
+     * @author liweifan
+     * @param: userId
+     * @updateTime 2022/3/24 18:14
+     * @return: com.yonge.cooleshow.biz.dal.vo.StudentVo
+     */
+    StudentVo detail(@Param("userId") Long userId);
+
+    /**
+     * 自定义分页
+     */
+    List<StudentVo> selectPage(@Param("page") IPage page, @Param("param") StudentSearch studentSearch);
 	/***
-	 * 查询详情
+	 * 设置学员声部
 	 * @author liweifan
-	 * @param: userId
-	 * @updateTime 2022/3/24 18:14
-	 * @return: com.yonge.cooleshow.biz.dal.vo.StudentVo
-	 */
-	StudentVo detail(@Param("userId") Long userId);
-	/**
-	 * 自定义分页
+	 * @param: id
+	 * @param: subjectIds
+	 * @updateTime 2022/4/7 10:12
+	 * @return: java.lang.Integer
 	 */
-	List<StudentVo> selectPage(@Param("page") IPage page,@Param("param") StudentSearch studentSearch);
-
+    Integer setSubject(@Param("id") Long id, @Param("subjectIds") String subjectIds);
 }

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

@@ -17,6 +17,7 @@ public interface SubjectDao extends BaseDAO<Long, Subject> {
      * @return: java.util.List<com.yonge.cooleshow.biz.dal.entity.Subject>
      */
     List<Subject> findBySubjectIds(@Param("subjectIds") List<Long> subjectIds);
+
     /***
      * 通过声部id（字符串拼接）查询声部
      * @param: subjectIdList
@@ -24,6 +25,7 @@ public interface SubjectDao extends BaseDAO<Long, Subject> {
      * @return: java.util.List<com.yonge.cooleshow.biz.dal.entity.Subject>
      */
     List<Subject> findBySubjectByIdList(@Param("subjectIdList") String subjectIdList);
+
     /***
      * 根据父级id查询子级列表
      * @param: parentId
@@ -32,6 +34,7 @@ public interface SubjectDao extends BaseDAO<Long, Subject> {
      * @return: java.util.List<com.yonge.cooleshow.biz.dal.entity.Subject>
      */
     List<Subject> findByParentId(@Param("parentId") Long parentId, @Param("delFlag") YesOrNoEnum delFlag);
+
     /***
      * 通过id删除
      * @param: id
@@ -39,5 +42,4 @@ public interface SubjectDao extends BaseDAO<Long, Subject> {
      * @return: int
      */
     int deleteById(Long id);
-
 }

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

@@ -50,4 +50,13 @@ public interface TeacherDao extends BaseMapper<Teacher> {
      * @date 2022/3/25 09:38
      */
     List<Subject> querySubject(@Param("userId") Long userId);
+    /***
+     * 设置学员声部
+     * @author liweifan
+     * @param: id
+     * @param: subjectIds
+     * @updateTime 2022/4/7 10:12
+     * @return: java.lang.Integer
+     */
+    Integer setSubject(@Param("id") Long id, @Param("subjectIds") String subjectIds);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/req/TeacherMusicSheetAuditReq.java

@@ -21,7 +21,7 @@ public class TeacherMusicSheetAuditReq {
     @NotNull(message = "曲目id不能为空 ")
     private Long musicSheetId;
 
-    @ApiModelProperty(value = "审批状态（2：通过，3：不通过）",required = true)
+    @ApiModelProperty(value = "审批状态（PASS：通过，UNPASS：不通过）",required = true)
     @NotNull(message = "审批状态不为空 ")
     private AuthStatusEnum authStatus;
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/MusicSheetSearch.java

@@ -37,7 +37,7 @@ public class MusicSheetSearch  extends QueryInfo{
     @ApiModelProperty("曲目状态（0：停用，1：启用））")
     private YesOrNoEnum state;
 
-    @ApiModelProperty("曲目审核状态(0:待审核;1:通过;2:未通过)")
+    @ApiModelProperty("曲目审核状态(DOING:待审核;PASS:通过;UNPASS:未通过)")
     private AuthStatusEnum auditStatus;
 
     @ApiModelProperty(value = "创建人id （老师id）")

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/TeacherMusicSheetAuditSearch.java

@@ -36,7 +36,7 @@ public class TeacherMusicSheetAuditSearch extends QueryInfo{
     private Date endTime;
 
 
-    @ApiModelProperty(value = "审核状态  0、未申请 1、审核中 2、通过 3、不通过")
+    @ApiModelProperty(value = "审核状态  UNPAALY、未申请 DOING、审核中 PASS、通过 UNPASS、不通过")
     private AuthStatusEnum authStatus;
 
     @ApiModelProperty(value = "假删除 0 : 未删除 1：已删除",hidden = true)

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

@@ -15,11 +15,11 @@ public class Subject {
 	private Long id;
 	
 	/**  */
-	@ApiModelProperty(value = "科目名称",required = false)
+	@ApiModelProperty(value = "声部名称",required = false)
 	private String name;
 	
 	/**  */
-	@ApiModelProperty(value = "科目编号",required = false)
+	@ApiModelProperty(value = "声部编号",required = false)
 	private String code;
 	
 	/**  */

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

@@ -56,7 +56,7 @@ public class Teacher implements Serializable {
 	@TableField(value = "work_unit_")
     private String workUnit;
     /** 
-    * 专业技能（支持多个，用逗号分隔），对应科目表编号 
+    * 专业技能（支持多个，用逗号分隔），对应声部表编号
     */
     @ApiModelProperty("声部id（支持多个，用逗号分隔） ")
 	@TableField(value = "subject_id_")

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/TeacherTypeEnum.java

@@ -2,6 +2,7 @@ package com.yonge.cooleshow.biz.dal.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import com.yonge.cooleshow.common.enums.BaseEnum;
+import com.yonge.toolset.utils.string.StringUtil;
 
 /***
  * 老师类型枚举
@@ -29,4 +30,44 @@ public enum TeacherTypeEnum implements BaseEnum<String, TeacherTypeEnum> {
         return msg;
     }
 
+    /***
+     * 字符串teacherType判断是否包含
+     * @author liweifan
+     * @param: teacherType
+     * @updateTime 2022/4/7 9:41
+     * @return: com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum
+     */
+    public YesOrNoEnum hasTeacherType(String teacherType) {
+        if (StringUtil.isEmpty(teacherType)) {
+            return YesOrNoEnum.NO;
+        }
+        if (teacherType.indexOf(this.getCode()) < 0) {
+            return YesOrNoEnum.NO;
+        }
+        return YesOrNoEnum.YES;
+    }
+
+    /***
+     * teacherType转字符串
+     * @author liweifan
+     * @param: entryFlag
+     * @param: musicianFlag
+     * @updateTime 2022/4/7 9:41
+     * @return: java.lang.String
+     */
+    public static String getTeacherType(YesOrNoEnum entryFlag, YesOrNoEnum musicianFlag) {
+        String teacherType = "";
+        if (YesOrNoEnum.YES.equals(entryFlag)) {
+            teacherType += "," + TeacherTypeEnum.ENTRY.getCode();
+        }
+        if (YesOrNoEnum.YES.equals(musicianFlag)) {
+            teacherType += "," + TeacherTypeEnum.MUSICIAN.getCode();
+        }
+        if (teacherType.length() > 0) {
+            teacherType = teacherType.substring(1);
+        } else {
+            teacherType = TeacherTypeEnum.TOURIST.getCode();
+        }
+        return teacherType;
+    }
 }

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

@@ -47,4 +47,13 @@ public interface StudentService extends IService<Student>  {
      */
     StudentHomeVo queryUserInfo(SysUser user);
 
+    /***
+     * 设置声部
+     * @author liweifan
+     * @param: id
+     * @param: toLongList
+     * @updateTime 2022/4/7 9:56
+     * @return: java.lang.Integer
+     */
+    Integer setSubject(Long id, String subjectIds);
 }

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

@@ -46,7 +46,7 @@ public interface SubjectService extends BaseService<Long, Subject> {
 	 */
     int deleteById(Long id);
 	/***
-	 * 查询科目选择框
+	 * 查询声部选择框
 	 * @author liweifan
 	 * @updateTime 2022/3/21 17:23
 	 * @return: java.util.List<com.yonge.cooleshow.biz.dal.vo.SubjectSelectVo>

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

@@ -85,4 +85,14 @@ public interface TeacherService extends IService<Teacher>  {
      * @return: java.lang.Object
      */
     Object getRedisValueByKey(String key);
+
+    /***
+     * 设置声部
+     * @author liweifan
+     * @param: id
+     * @param: toLongList
+     * @updateTime 2022/4/7 9:56
+     * @return: java.lang.Integer
+     */
+    Integer setSubject(Long id, String subjectIds);
 }

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

@@ -124,4 +124,9 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
         studentHomeVo.setStarTeacherNum(null == totalVo.getStarTeacherNum() ? 0 : totalVo.getStarTeacherNum());
         return studentHomeVo;
     }
+
+    @Override
+    public Integer setSubject(Long id, String subjectIds) {
+        return baseMapper.setSubject(id,subjectIds);
+    }
 }

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

@@ -112,7 +112,6 @@ public class SubjectServiceImpl extends BaseServiceImpl<Long, Subject> implement
         return parents;
     }
 
-
     /***
      * 新增、修改声部
      * @param: subject

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

@@ -46,6 +46,7 @@ public class TeacherAuthEntryRecordServiceImpl extends ServiceImpl<TeacherAuthEn
         TeacherAuthEntryRecord build = baseMapper.selectById(authOperaReq.getId());
         build.setTeacherAuthStatus(authOperaReq.getPass() ? AuthStatusEnum.PASS : AuthStatusEnum.UNPASS);
         build.setReason(authOperaReq.getReason());
+        build.setVerifyUserId(sysUser.getId());
 
         //修改teacher表
         Teacher teacher = new Teacher();
@@ -75,6 +76,7 @@ public class TeacherAuthEntryRecordServiceImpl extends ServiceImpl<TeacherAuthEn
         //新增申请记录
         TeacherAuthEntryRecord teacherAuthEntryRecord = new TeacherAuthEntryRecord();
         BeanUtils.copyProperties(teacherAuthEntryRecord, teacherApplyDetailDto);
+        teacherAuthEntryRecord.setTeacherAuthStatus(AuthStatusEnum.DOING);
 
         return HttpResponseResult.status(baseMapper.insert(teacherAuthEntryRecord) > 0);
     }

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

@@ -75,6 +75,8 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
         if (null != lastRecordByUserId) {
             detail.setVerifyUser(lastRecordByUserId.getVerifyUser());
         }
+        String teacherType = TeacherTypeEnum.getTeacherType(detail.getEntryFlag(), detail.getMusicianFlag());
+        detail.setTeacherType(teacherType);
         return detail;
     }
 
@@ -154,8 +156,10 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
             teacher.setUserId(id);
             teacher.setLiveFlag(YesOrNoEnum.YES);
             baseMapper.updateById(teacher);
+            return HttpResponseResult.status(true);
+        }else{
+            return HttpResponseResult.failed("不满足开通条件");
         }
-        return HttpResponseResult.status(true);
     }
 
     @Override
@@ -313,4 +317,9 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
         }
         return teacher;
     }
+
+    @Override
+    public Integer setSubject(Long id, String subjectIds) {
+        return baseMapper.setSubject(id,subjectIds);
+    }
 }

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

@@ -26,7 +26,7 @@ public class StudentVo extends Student {
     private String phone;
     @ApiModelProperty(value = "是否实名 0否 1是")
     private YesOrNoEnum isReal;
-    @ApiModelProperty(value = "是否会员 0否 1是")
+    @ApiModelProperty(value = "是否绑卡 0否 1是")
     private YesOrNoEnum isBank;
     @ApiModelProperty(value = "真实姓名")
     private String realName;

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

@@ -11,7 +11,7 @@ import io.swagger.annotations.ApiModelProperty;
  */
 @ApiModel(value = "TeacherAuthEntryRecordVo对象", description = "老师入驻审核详情")
 public class TeacherAuthEntryRecordVo extends TeacherAuthEntryRecord {
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1123L;
 
     @ApiModelProperty(value = "真实姓名")
     private String realName;

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

@@ -47,6 +47,8 @@ public class TeacherVo extends Teacher {
     private UserLockFlag lockFlag;
     @ApiModelProperty(value = "声部名称（支持多个，用逗号分隔） ")
     private String subjectName;
+    @ApiModelProperty(value = "老师类型（支持多个，用逗号分隔） ENTRY 认证老师 MUSICIAN 音乐人 ")
+    private String teacherType;
     @ApiModelProperty(value = "老师风采视频")
     private List<TeacherStyleVideo> styleVideo;
 
@@ -153,4 +155,12 @@ public class TeacherVo extends Teacher {
     public void setLockFlag(UserLockFlag lockFlag) {
         this.lockFlag = lockFlag;
     }
+
+    public String getTeacherType() {
+        return teacherType;
+    }
+
+    public void setTeacherType(String teacherType) {
+        this.teacherType = teacherType;
+    }
 }

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

@@ -64,7 +64,8 @@
         ,su.avatar_ as addUserAvatar
         ,(select group_concat(mt.name_) from music_tag mt
             where find_in_set(mt.id_,t.music_tag_) and mt.del_flag_ = 0) as musicTagNames
-        ,(select group_concat(s.name_) from subject s where find_in_set(s.id_,t.music_subject_) ) as subjectNames
+        ,(select group_concat(s.name_) from subject s
+            where find_in_set(s.id_,t.music_subject_) and s.del_flag_ = 0 ) as subjectNames
         from music_sheet t
         left join sys_user su on t.create_by_ = su.id_
         <where>
@@ -201,7 +202,8 @@
         ,su.avatar_ as addUserAvatar
         ,(select group_concat(mt.name_) from music_tag mt
         where find_in_set(mt.id_,t.music_tag_) and mt.del_flag_ = 0) as musicTagNames
-        ,(select group_concat(s.name_) from subject s where find_in_set(s.id_,t.music_subject_) ) as subjectNames
+        ,(select group_concat(s.name_) from subject s
+        where find_in_set(s.id_,t.music_subject_)  and s.del_flag_ = 0) as subjectNames
         <if test="param.studentId != null">
             ,if(mf.id_ is not null,1,0) as favorite
         </if>
@@ -221,7 +223,8 @@
         ,su.avatar_ as addUserAvatar
         ,(select group_concat(mt.name_) from music_tag mt
         where find_in_set(mt.id_,t.music_tag_) and mt.del_flag_ = 0) as musicTagNames
-        ,(select group_concat(s.name_) from subject s where find_in_set(s.id_,t.music_subject_) ) as subjectNames
+        ,(select group_concat(s.name_) from subject s
+        where find_in_set(s.id_,t.music_subject_) and s.del_flag_ = 0 ) as subjectNames
         from music_sheet t
         left join sys_user su on t.create_by_ = su.id_
         left join music_sheet_purchase_record mspr on mspr.music_sheet_id_ = t.id_
@@ -240,7 +243,8 @@
         ,su.avatar_ as addUserAvatar
         ,(select group_concat(mt.name_) from music_tag mt
         where find_in_set(mt.id_,t.music_tag_) and mt.del_flag_ = 0) as musicTagNames
-        ,(select group_concat(s.name_) from subject s where find_in_set(s.id_,t.music_subject_) ) as subjectNames
+        ,(select group_concat(s.name_) from subject s
+        where find_in_set(s.id_,t.music_subject_) and s.del_flag_ = 0 ) as subjectNames
         ,if(mf.id_ is not null,1,0) as favorite
         from music_sheet t
         left join sys_user su on t.create_by_ = su.id_

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

@@ -26,6 +26,9 @@
         , t.create_time_ as "createTime"
         , t.update_time_ as "updateTime"
         </sql>
+    <update id="setSubject">
+        update student set subject_id_list_ = #{subjectIds} where user_id_ = #{id}
+    </update>
     <select id="detail" resultType="com.yonge.cooleshow.biz.dal.vo.StudentVo">
         SELECT
             <include refid="baseColumns"/>,

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

@@ -62,10 +62,11 @@
             u.real_name_ as realName,
             u.id_card_no_ as idCardNo,
             u.phone_ as phone,
-            u.gender_ as gender
+            u.gender_ as gender,
+            v.username_ as verifyUser
         FROM teacher_auth_entry_record t
         left join sys_user u on t.user_id_ = u.id_
-        left join sys_user v on t.verify_user_id_ = u.id_
+        left join sys_user v on t.verify_user_id_ = v.id_
         <where>
             <if test="null != param.search and '' != param.search">
                 AND (

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

@@ -38,13 +38,14 @@
     <!-- 分页查询 -->
     <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.MusicianAuthEntryRecordVo">
         SELECT
-        <include refid="baseColumns"/>,
-        u.real_name_ as realName,
-        u.id_card_no_ as idCardNo,
-        u.phone_ as phone
+            <include refid="baseColumns"/>,
+            u.real_name_ as realName,
+            u.id_card_no_ as idCardNo,
+            u.phone_ as phone,
+            v.username_ as verifyUser
         FROM teacher_auth_musician_record t
         left join sys_user u on t.user_id_ = u.id_
-        left join sys_user v on t.verify_user_id_ = u.id_
+        left join sys_user v on t.verify_user_id_ = v.id_
         <where>
             <if test="null != param.search and '' != param.search">
                 AND (

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

@@ -130,4 +130,8 @@
         LEFT JOIN `subject` s ON FIND_IN_SET(s.id_,t.subject_id_)
         WHERE t.user_id_ = #{userId}
     </select>
+
+    <update id="setSubject">
+        update teacher set subject_id_ = #{subjectIds} where user_id_ = #{id}
+    </update>
 </mapper>

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/StudentController.java

@@ -3,10 +3,13 @@ package com.yonge.cooleshow.student.controller;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.vo.StudentHomeVo;
+import com.yonge.cooleshow.biz.dal.vo.SubjectSelectVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
@@ -14,6 +17,8 @@ import org.springframework.web.bind.annotation.*;
 import com.yonge.cooleshow.biz.dal.entity.Student;
 import com.yonge.cooleshow.biz.dal.service.StudentService;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("/student")
 @Api(value = "学生表", tags = "学生表")
@@ -27,7 +32,7 @@ public class StudentController extends BaseController {
     @GetMapping("/queryUser")
     public HttpResponseResult<Student> queryUser() throws Exception {
         SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null) {
+        if (user == null || null == user.getId()) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
         Student student = studentService.getById(user.getId());
@@ -38,10 +43,23 @@ public class StudentController extends BaseController {
     @GetMapping("/queryUserInfo")
     public HttpResponseResult<StudentHomeVo> queryUserInfo() throws Exception {
         SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null) {
+        if (user == null || null == user.getId()) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
         return succeed(studentService.queryUserInfo(user));
     }
 
+    @ApiOperation(value = "设置声部")
+    @PostMapping("/setSubject")
+    public HttpResponseResult<List<SubjectSelectVo>> setSubject(@ApiParam(value = "声部主键集合", required = true) @RequestParam("subjectIds") String subjectIds) {
+        if (StringUtil.isEmpty(subjectIds)) {
+            return failed("参数不能为空");
+        }
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (user == null || null == user.getId()) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        return status(studentService.setSubject(user.getId(), subjectIds) > 0);
+    }
+
 }

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/SubjectController.java

@@ -1,38 +1,41 @@
 package com.yonge.cooleshow.student.controller;
 
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.service.SubjectService;
 import com.yonge.cooleshow.biz.dal.vo.SubjectSelectVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
 @RequestMapping("subject")
-@Api(tags = "科目服务")
+@Api(tags = "声部服务")
 @RestController
 public class SubjectController extends BaseController {
+    @Autowired
+    private SubjectService subjectService;
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
 
-	@Autowired
-	private SubjectService subjectService;
-
-	@ApiOperation(value = "根据科目编号查询科目")
-	@GetMapping("/get/{id}")
-	public Object get(@ApiParam(value = "科目编号", required = true) @PathVariable("id") Long id) {
-		return succeed(subjectService.get(id));
-	}
+    @ApiOperation(value = "根据声部编号查询声部")
+    @GetMapping("/get/{id}")
+    public Object get(@ApiParam(value = "声部编号", required = true) @PathVariable("id") Long id) {
+        return succeed(subjectService.get(id));
+    }
 
-	@ApiOperation(value = "获取科目")
-	@GetMapping("/subjectSelect")
-    public HttpResponseResult<List<SubjectSelectVo>> subjectSelect(){
+    @ApiOperation(value = "获取声部")
+    @GetMapping("/subjectSelect")
+    public HttpResponseResult<List<SubjectSelectVo>> subjectSelect() {
         List<SubjectSelectVo> subjectSelect = subjectService.subjectSelect();
         return succeed(subjectSelect);
     }
+
 }

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/UserOrderController.java

@@ -48,7 +48,7 @@ public class UserOrderController extends BaseController {
     @PostMapping("/executeOrder")
     public HttpResponseResult<UserOrder> executeOrder(@Valid @RequestBody OrderReq orderReq) {
         SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null) {
+        if (user == null || null == user.getId()) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
         orderReq.setUserId(user.getId());
@@ -69,7 +69,7 @@ public class UserOrderController extends BaseController {
     @PostMapping("/orderPay")
     public HttpResponseResult<OrderPayRes> orderPay(@Valid @RequestBody OrderPayReq payReq, HttpServletRequest request) {
         SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null) {
+        if (user == null || null == user.getId()) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
         payReq.setUserId(user.getId());

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

@@ -10,10 +10,7 @@ import com.yonge.cooleshow.biz.dal.vo.LiveCourseInfoVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.page.PageInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.*;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -38,7 +35,7 @@ public class CourseGroupController extends BaseController {
 
     @ApiOperation("直播课详情")
     @GetMapping("/queryLiveCourseInfo")
-    public HttpResponseResult<LiveCourseInfoVo> queryLiveCourseInfo(@RequestParam(value = "groupId", name = "课程组id") Long groupId) {
+    public HttpResponseResult<LiveCourseInfoVo> queryLiveCourseInfo(@ApiParam(value = "课程组id", required = true) @RequestParam(value = "groupId") Long groupId) {
         return succeed(courseGroupService.queryLiveCourseInfo(groupId));
     }
 

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

@@ -19,20 +19,20 @@ import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 
 @RequestMapping("subject")
-@Api(tags = "科目服务")
+@Api(tags = "声部服务")
 @RestController
 public class SubjectController extends BaseController {
 
 	@Autowired
 	private SubjectService subjectService;
 
-	@ApiOperation(value = "根据科目编号查询科目")
+	@ApiOperation(value = "根据声部编号查询声部")
 	@GetMapping("/get/{id}")
-	public Object get(@ApiParam(value = "科目编号", required = true) @PathVariable("id") Long id) {
+	public Object get(@ApiParam(value = "声部编号", required = true) @PathVariable("id") Long id) {
 		return succeed(subjectService.get(id));
 	}
 
-	@ApiOperation(value = "获取科目")
+	@ApiOperation(value = "获取声部")
 	@GetMapping("/subjectSelect")
     public HttpResponseResult<List<SubjectSelectVo>> subjectSelect(){
         List<SubjectSelectVo> subjectSelect = subjectService.subjectSelect();

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

@@ -28,7 +28,7 @@ public class TeacherAuthEntryRecordController extends BaseController {
     @ApiOperation(value = "提交申请", notes = "传入teacherAuthEntryRecord")
     public HttpResponseResult<Boolean> doApply(@Valid @RequestBody TeacherApplyDetailReq teacherApplyDetailDto) throws Exception {
         SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null) {
+        if (user == null || null == user.getId()) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
         //处理老师申请逻辑

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

@@ -29,7 +29,7 @@ public class TeacherAuthMusicianRecordController extends BaseController {
     @ApiOperation(value = "获取音乐人审核状态")
     public HttpResponseResult<AuthStatusEnum> getMusicianAuthStatus() {
         SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null) {
+        if (user == null || null == user.getId()) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
         AuthStatusEnum musicianAuthStatus = teacherAuthMusicianRecordService.getMusicianAuthStatus(user.getId());

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

@@ -4,17 +4,17 @@ import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.entity.Subject;
 import com.yonge.cooleshow.biz.dal.service.TeacherService;
+import com.yonge.cooleshow.biz.dal.vo.SubjectSelectVo;
 import com.yonge.cooleshow.biz.dal.vo.TeacherHomeVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -31,7 +31,7 @@ public class TeacherController extends BaseController {
     @GetMapping("/queryUserInfo")
     public HttpResponseResult<TeacherHomeVo> queryUserInfo() {
         SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null) {
+        if (user == null || null == user.getId()) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
         return teacherService.queryUserInfo(user);
@@ -41,7 +41,7 @@ public class TeacherController extends BaseController {
     @GetMapping("/openLive")
     public HttpResponseResult<Boolean> openLive(){
         SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null) {
+        if (user == null || null == user.getId()) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
         return  teacherService.openLive(user.getId());
@@ -51,10 +51,22 @@ public class TeacherController extends BaseController {
     @PostMapping("/querySubject")
     public HttpResponseResult<List<Subject>> querySubject(){
         SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null) {
+        if (user == null || null == user.getId()) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
         return succeed(teacherService.querySubject(user.getId()));
     }
 
+    @ApiOperation(value = "设置声部")
+    @PostMapping("/setSubject")
+    public HttpResponseResult<List<SubjectSelectVo>> setSubject(@ApiParam(value = "声部主键集合", required = true) @RequestParam("subjectIds") String subjectIds) {
+        if (StringUtil.isEmpty(subjectIds)) {
+            return failed("参数不能为空");
+        }
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (user == null || null == user.getId()) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        return status(teacherService.setSubject(user.getId(), subjectIds) > 0);
+    }
 }

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

@@ -44,7 +44,7 @@ public class TeacherFreeTimeController extends BaseController {
     @PostMapping("/upSet")
     public HttpResponseResult upSet(@Valid @RequestBody TeacherFreeTime teacherFreeTime){
         SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null) {
+        if (user == null || null == user.getId()) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
         teacherFreeTime.setTeacherId(user.getId());
@@ -56,7 +56,7 @@ public class TeacherFreeTimeController extends BaseController {
     @PostMapping("/getDetail")
     public HttpResponseResult<TeacherFreeTime> detDetail(@Valid @RequestBody PracticeTimesSetting practiceTimesSetting){
         SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null) {
+        if (user == null || null == user.getId()) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
         return succeed(teacherFreeTimeService.getDao().