1.修改后端PC权限控制

Author: fengsam6

interactive-class/class-system/src/main/java/com/code/classsystem/controller/ClassController.java

@@ -4,6 +4,7 @@
 import com.code.classsystem.entity.Class;
 import com.code.classsystem.entity.User;
 import com.code.classsystem.service.ClassService;
+import com.code.classsystem.vo.ClassSearchVo;
 import com.code.classsystem.vo.ClassVo;
 import com.code.core.entity.ResponseResult;
 import com.code.core.util.ResponseResultUtil;
@@ -73,9 +74,10 @@ public ResponseResult deleteClass(@RequestParam("ids") List<String> ids) {
  @ApiOperation(value = "分页查询班级", notes = "分页查询班级")
  @GetMapping("/listPage")
  @RequiresRoles(value ={"teacher","admin"},logical = Logical.OR)
- public ResponseResult listPage(Class cla, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
- PageInfo<ClassVo> classVoPageInfo = classService.listPage(cla, pageNum, pageSize);
+ public ResponseResult listPage(ClassSearchVo searchVo, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
+ PageInfo<ClassVo> classVoPageInfo = classService.listPage(searchVo, pageNum, pageSize);
  return ResponseResultUtil.renderSuccess(classVoPageInfo);
  }
+
 }
 

interactive-class/class-system/src/main/java/com/code/classsystem/controller/ClassUserController.java

@@ -8,6 +8,7 @@
 import com.code.classsystem.vo.ClassStudentVo;
 import com.code.core.entity.ResponseResult;
 import com.code.core.util.ResponseResultUtil;
+import com.code.core.util.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,7 +22,7 @@
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author coder
@@ -33,18 +34,29 @@
 public class ClassUserController {
  @Autowired
  private ClassUserService classUserService;
+
  @ApiOperation(value = "查看用户加入班级列表", notes = "查看用户加入班级列表")
  @GetMapping("/listClassByUserId")
  public ResponseResult listClassByUserId() {
  String userId = ShiroUtils.getUserId();
  List<Class> classList = classUserService.listClassByUserId(userId);
- return ResponseResultUtil.renderSuccess(classList,"查看用户加入班级列表成功！");
+ return ResponseResultUtil.renderSuccess(classList, "查看用户加入班级列表成功！");
+ }
+
+ @ApiOperation(value = "查看老师创建班级", notes = "查看老师创建班级")
+ @GetMapping("/listTeacherClasses")
+ public ResponseResult listTeacherClasses(String teacherId) {
+ if(StringUtils.isNull(teacherId)){
+ teacherId = ShiroUtils.getUserId();
+ }
+ List<Class> classList = classUserService.listTeacherClasses(teacherId);
+ return ResponseResultUtil.renderSuccess(classList, "查看老师创建班级成功！");
  }
 
  @ApiOperation(value = "加入班级", notes = "加入班级")
  @PostMapping("/joinClass")
  public ResponseResult joinClass(String classCode) {
-  classUserService.joinClass(classCode);
+ classUserService.joinClass(classCode);
  return ResponseResultUtil.renderSuccess("加入班级成功！");
  }
 
@@ -55,10 +67,12 @@ public ResponseResult showClassUsers(String classId) {
  return ResponseResultUtil.renderSuccess(users,"创建班级成功！");
  }*/
 
+
+
  @ApiOperation(value = "查看班级成员", notes = "查看班级成员")
  @PostMapping("/showClassUsers")
  public ResponseResult showClassUsers(ClassStudentVo classStudentVo) {
- List<ClassStudent> data=classUserService.queryStuStatus(classStudentVo);
+  List<ClassStudent> data = classUserService.queryStuStatus(classStudentVo);
  return ResponseResultUtil.renderSuccess(data);
  }
 }

interactive-class/class-system/src/main/java/com/code/classsystem/dao/ClassUserMapper.java

@@ -35,4 +35,6 @@ public interface ClassUserMapper extends BaseMapper<ClassUser> {
  * @return
  */
  List<ClassStudent> queryStuStatus(ClassStudentVo classStudentVo);
+
+ List<Class> listTeacherClasses(String teacherId);
 }

interactive-class/class-system/src/main/java/com/code/classsystem/service/ClassService.java

@@ -2,6 +2,7 @@
 
 import com.code.classsystem.entity.Class;
 import com.baomidou.mybatisplus.service.IService;
+import com.code.classsystem.vo.ClassSearchVo;
 import com.code.classsystem.vo.ClassVo;
 import com.github.pagehelper.PageInfo;
 
@@ -35,5 +36,5 @@ public interface ClassService extends IService<Class> {
  */
  Class getClassByClassNameAndCurId(String className);
 
- PageInfo<ClassVo> listPage(Class cla, int pageNum, int pageSize);
+ PageInfo<ClassVo> listPage(ClassSearchVo cla, int pageNum, int pageSize);
 }

interactive-class/class-system/src/main/java/com/code/classsystem/service/ClassUserService.java

@@ -28,4 +28,6 @@ public interface ClassUserService extends IService<ClassUser> {
  List<User> showClassUsers(String classId);
 
  List<ClassStudent> queryStuStatus(ClassStudentVo classStudentVo);
+
+ List<Class> listTeacherClasses(String teacherId);
 }

interactive-class/class-system/src/main/java/com/code/classsystem/service/impl/ClassServiceImpl.java

@@ -3,10 +3,12 @@
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.code.classsystem.entity.Class;
 import com.code.classsystem.dao.ClassMapper;
+import com.code.classsystem.entity.User;
 import com.code.classsystem.service.ClassService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.code.classsystem.service.ClassUserService;
 import com.code.classsystem.common.shiro.util.ShiroUtils;
+import com.code.classsystem.vo.ClassSearchVo;
 import com.code.classsystem.vo.ClassVo;
 import com.code.core.enums.ErrorEnum;
 import com.code.core.exception.BusinessException;
@@ -75,9 +77,21 @@ public Class getClassByClassNameAndCurId(String className) {
  }
 
  @Override
- public PageInfo<ClassVo> listPage(Class cla, int pageNum, int pageSize) {
+ public PageInfo<ClassVo> listPage(ClassSearchVo searchVo, int pageNum, int pageSize) {
+ if(searchVo==null){
+ searchVo=new ClassSearchVo();
+ }
+ User userEntity = ShiroUtils.getUserEntity();
+
+ Integer roleId = userEntity.getRoleId();
+ if(roleId==1){
+ throw new BusinessException(ErrorEnum.UNAUTHORIZED.setMsg("权限不够，禁止访问"));
+ }else if(roleId==2){
+ String userId = userEntity.getId();
+ searchVo.setCreatorId(userId);
+ }
  PageHelper.startPage(pageNum, pageSize);
- List<ClassVo> userInfoVos = classMapper.listPage(cla);
+ List<ClassVo> userInfoVos = classMapper.listPage(searchVo);
  return new PageInfo<>(userInfoVos);
  }
 

interactive-class/class-system/src/main/java/com/code/classsystem/service/impl/ClassUserServiceImpl.java

@@ -85,4 +85,9 @@ public List<ClassStudent> queryStuStatus(ClassStudentVo classStudentVo) {
  list=classUserMapper.queryStuStatus(classStudentVo);
  return list;
  }
+
+ @Override
+ public List<Class> listTeacherClasses(String teacherId) {
+ return classUserMapper.listTeacherClasses(teacherId);
+ }
 }

interactive-class/class-system/src/main/java/com/code/classsystem/service/impl/CourseServiceImpl.java

@@ -5,16 +5,16 @@
 import com.code.classsystem.entity.Course;
 import com.code.classsystem.dao.CourseMapper;
 import com.code.classsystem.entity.CourseResource;
+import com.code.classsystem.entity.User;
 import com.code.classsystem.service.ClassCourseService;
 import com.code.classsystem.service.CourseResourceService;
 import com.code.classsystem.util.DateUtils;
-import com.code.classsystem.vo.CourseAndClass;
+import com.code.classsystem.vo.*;
 import com.code.classsystem.service.ClassService;
 import com.code.classsystem.service.CourseService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.code.classsystem.vo.CourseInfoVo;
-import com.code.classsystem.vo.CourseVo;
-import com.code.classsystem.vo.TeacherCourseVo;
+import com.code.core.enums.ErrorEnum;
+import com.code.core.exception.BusinessException;
 import com.code.core.util.StringUtils;
 import com.code.core.util.UUIDUtil;
 import com.github.pagehelper.PageHelper;
@@ -83,9 +83,21 @@ public List<CourseAndClass> queryCourseInfo(String userId) {
  }
 
  @Override
- public PageInfo<CourseInfoVo> listPage(Course course, int pageNum, int pageSize) {
+ public PageInfo<CourseInfoVo> listPage(Course search, int pageNum, int pageSize) {
+ if (search == null) {
+ search = new Course();
+ }
+ User userEntity = ShiroUtils.getUserEntity();
+
+ Integer roleId = userEntity.getRoleId();
+ if (roleId == 1) {
+ throw new BusinessException(ErrorEnum.UNAUTHORIZED.setMsg("权限不够，禁止访问"));
+ } else if (roleId == 2) {
+ String userId = userEntity.getId();
+ search.setCreatedUserId(userId);
+ }
  PageHelper.startPage(pageNum, pageSize);
- List<CourseInfoVo> userInfoVos = courseMapper.listPage(course);
+ List<CourseInfoVo> userInfoVos = courseMapper.listPage(search);
  return new PageInfo<>(userInfoVos);
  }
 

interactive-class/class-system/src/main/java/com/code/classsystem/vo/ClassSearchVo.java

@@ -0,0 +1,15 @@
+package com.code.classsystem.vo;
+
+import com.code.classsystem.entity.Class;
+
+public class ClassSearchVo extends Class {
+ private String creatorId;
+
+ public String getCreatorId() {
+ return creatorId;
+ }
+
+ public void setCreatorId(String creatorId) {
+ this.creatorId = creatorId;
+ }
+}

interactive-class/class-system/src/main/resources/mapper/ClassMapper.xml

@@ -29,16 +29,22 @@
 </select>
 
  <select id="getClassByClassNameAndCurId" resultMap="BaseResultMap" parameterType="string">
- select * from class cl
+ select distinct * from class cl
  inner join class_user cu on cl.id = cu.class_id
  where cl.class_name = #{className} and cu.member_id = #{userId}
 </select>
 
- <select id="listPage" resultMap="BaseResultMap" parameterType="com.code.classsystem.entity.Class">
- select cl.*,u.name as createUserName
+ <select id="listPage" resultMap="BaseResultMap" parameterType="com.code.classsystem.vo.ClassSearchVo">
+ select distinct cl.*,u.name as createUserName
  from class cl
- left join class_user cu on cl.id = cu.class_id
+  left join class_user cu on cl.id = cu.class_id
  left join user u on u.id = cu.created_user_id
+ <where>
+ <if test="creatorId != null">
+ cu.created_user_id = #{creatorId}
+ </if>
+ </where>
+ order by cl.class_name
 </select>