学员设置声部接口

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-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-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/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/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/TeacherServiceImpl.java

@@ -315,4 +315,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/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/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 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,5 +1,7 @@
 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;
@@ -9,6 +11,7 @@ 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.*;
 
 import java.util.List;
@@ -17,32 +20,22 @@ import java.util.List;
 @Api(tags = "声部服务")
 @RestController
 public class SubjectController extends BaseController {
+    @Autowired
+    private SubjectService subjectService;
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+
+    @ApiOperation(value = "根据声部编号查询声部")
+    @GetMapping("/get/{id}")
+    public Object get(@ApiParam(value = "声部编号", required = true) @PathVariable("id") Long id) {
+        return succeed(subjectService.get(id));
+    }
 
-	@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("/subjectSelect")
-    public HttpResponseResult<List<SubjectSelectVo>> subjectSelect(){
+    @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-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/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 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().