接口增加权限拦截

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-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/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/entity/Subject.java

@@ -17,11 +17,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/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/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;
     }
 

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/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-student/src/main/java/com/yonge/cooleshow/student/controller/SubjectController.java

@@ -4,35 +4,45 @@ 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.web.bind.annotation.*;
 
 import java.util.List;
 
 @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();
         return succeed(subjectSelect);
     }
+
+	@ApiOperation(value = "设置用户声部")
+	@PostMapping("/setUserSubject")
+	public HttpResponseResult<List<SubjectSelectVo>> setUserSubject(@ApiParam(value = "主键集合", required = true) @RequestParam String ids){
+		if (StringUtil.isEmpty(ids)) {
+			return failed("参数不能为空");
+		}
+		List<SubjectSelectVo> subjectSelect = subjectService.subjectSelect();
+		return status(teacherWithdrawalService.removeByIds(StringUtil.toLongList(ids)));
+	}
+
+
 }

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();