diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java index 6f73f26..5833c27 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java @@ -58,7 +58,6 @@ public class SysLoginController String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), loginBody.getUuid()); ajax.put(Constants.TOKEN, token); - System.out.println("======="+ajax); return ajax; } @@ -88,8 +87,6 @@ public class SysLoginController Long roleId = roleService.getRoleByUserId(user.getUserId()); roleService.checkRoleDataScope(roleId); ajax.put("role", roleService.selectRoleById(roleId).getRoleName()); - - System.out.println("------------------"+ajax); return ajax; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java index 3251336..8717e20 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java @@ -115,6 +115,7 @@ public class SysUserController extends BaseController ajax.put("postIds", postService.selectPostListByUserId(userId)); ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList())); } + System.out.println("================"+ajax); return ajax; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/gl/AnswerSheetController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/gl/AnswerSheetController.java index 1c4f726..a785a1e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/gl/AnswerSheetController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/gl/AnswerSheetController.java @@ -25,9 +25,6 @@ import java.util.Map; @RequestMapping("/gl/answerSheet") public class AnswerSheetController { - @Autowired - private IUserService iUserService; - @Autowired private IAnswerSheetDOService iAnswerSheetDOService; @@ -54,14 +51,12 @@ public class AnswerSheetController { public R answer(@RequestBody AnswerDO answerDO) { SysUser sysUser = SecurityUtils.getLoginUser().getUser(); Long id = sysUser.getUserId(); - String sender = iUserService.user(iUserService.selectByzhid(id)).getTname(); List answerVos = answerDO.getList(); Gson gson = new Gson(); String answerVo = gson.toJson(answerVos); Answer answer = new Answer(); - answer.setSender(sender); answer.setTestid(answerDO.getTestid()); answer.setIdanswer(answerVo); answer.setTime(answerDO.getTime()); @@ -78,9 +73,8 @@ public class AnswerSheetController { public R answerDisplay( Long id) { SysUser sysUser = SecurityUtils.getLoginUser().getUser(); Long userid = sysUser.getUserId(); - String sender = iUserService.user(iUserService.selectByzhid(id)).getTname(); List list = iExamCreateService.selectListByPid(id); - Answer answer = iAnswerService.selectByTestId(userid,sender, id); + Answer answer = iAnswerService.selectByTestId(userid, id); QuestionAnswerDO questionAnswerDO = iQuestionanswerService.createTest(list, answer); if (iQuestionanswerService.addTest(questionAnswerDO) != 0) { return R.ok("该学生客观题已改完！"); @@ -91,8 +85,8 @@ public class AnswerSheetController { @ApiOperation("查看学生的考试情况(最新)") @GetMapping("selectQuestionanswer") - public R selectQuestionanswer(Long senderId,String sender, Long testid) { - return R.ok(iQuestionanswerService.selectQuestionanswer(senderId,sender,testid)); + public R selectQuestionanswer(Long senderId, Long testid) { + return R.ok(iQuestionanswerService.selectQuestionanswer(senderId,testid)); } @ApiOperation("批改客观题") @@ -107,8 +101,8 @@ public class AnswerSheetController { @ApiOperation("试卷批改完毕提交") @PostMapping("addmarkedtest") - public R addmarkedtest(Long senderId,String sender,Long testid){ - if(iMarkedtestService.addmarkedtest(senderId,sender,testid)!=0){ + public R addmarkedtest(Long senderId,Long testid){ + if(iMarkedtestService.addmarkedtest(senderId,testid)!=0){ return R.ok("提交完成！"); } return R.fail("提交失败！"); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/gl/TaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/gl/TaskController.java index c7d384f..2715e7c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/gl/TaskController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/gl/TaskController.java @@ -7,7 +7,6 @@ import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.test.domain.Task; import com.ruoyi.test.domain.Vo.TaskVo; import com.ruoyi.test.seriver.ITaskService; -import com.ruoyi.test.seriver.IUserService; import com.ruoyi.web.controller.tool.testTool.ResultVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -25,8 +24,6 @@ public class TaskController { @Autowired private ITaskService iTaskService; - @Autowired - private IUserService iUserService; @ApiOperation("任务列表") @GetMapping("selectList") @@ -51,9 +48,8 @@ public class TaskController { @PostMapping("addTask") public R addTask(@RequestBody TaskVo taskVo){ SysUser sysUser = SecurityUtils.getLoginUser().getUser(); - Long userId = sysUser.getUserId(); - String tname = iUserService.user(iUserService.selectByzhid(userId)).getTname(); - if(iTaskService.addTask(taskVo,tname)!=0){ + String sender = sysUser.getUserName(); + if(iTaskService.addTask(taskVo,sender)!=0){ return R.ok("任务添加成功！"); } return R.fail("任务添加失败"); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/gl/UserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/gl/UserController.java index 64ceafd..b8a5497 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/gl/UserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/gl/UserController.java @@ -1,158 +1,155 @@ -package com.ruoyi.web.controller.test.gl; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.test.domain.User; -import com.ruoyi.test.domain.Vo.UserVo; -import com.ruoyi.test.seriver.IUserService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@Api(tags = "管理端用户管理") -@RestController -@RequestMapping("/gl/users") -public class UserController { - @Autowired - private IUserService iUserService; - - /* - 获取学生列表 - */ - @ApiOperation("学生列表") - @GetMapping("student") - public R> selectList(int pagenum){ - return R.ok(iUserService.selectStudentList(pagenum)); - } - /*获取学生用户名查询查询记录 - *@param name 用户名 - */ - @ApiOperation("学生用户名查询") - @GetMapping("/seleteStudentName") - public R> selectStudent(int pagenum,String name){ - return R.ok(iUserService.selectStudent(pagenum,name)); - } - - /*增加学生用户信息 - *@param name 用户名 - */ - @ApiOperation("学生添加用户") - @PostMapping("/insertStudent") - public R inserStudent(@RequestBody UserVo userVo){ - User user = new User(); - user.setAge(userVo.getAge()); - user.setBirthday(userVo.getBirthday()); - user.setGrade(userVo.getGrade()); - user.setSex(userVo.getSex()); - user.setName(userVo.getName()); - user.setTname(userVo.getTname()); - user.setTelephone(userVo.getTelephone()); - user.setRoleKey("2"); - user.setState(0L); - SysUser sysUser = SecurityUtils.getLoginUser().getUser(); - Long zhid = sysUser.getUserId(); - user.setZhId(zhid); - List list = iUserService.selectStudentByZhid(zhid); - if(list.size()==0){ - if(iUserService.insertUser(user)!=0){ - return R.ok("添加成功！"); - }else{ - return R.fail("添加失败！"); - } - } - return R.fail("该账号已绑定用户了！"); - } - - - - @ApiOperation("教师列表") - @GetMapping("/teacher") - public R> selectTeacher(int pagenum){ - return R.ok(iUserService.selectTeacherList(pagenum)); - } - /*获取教师用户名查询查询记录 - *@param name 用户名 - */ - @ApiOperation("教师用户名查询") - @GetMapping("/seleteTeacherName") - public R> selectTeacher(int pagenum,String name){ - return R.ok(iUserService.selectTeacher(pagenum,name)); - } - /*增加教师用户信息 - *@param name 用户名 - */ - @ApiOperation("老师添加用户") - @PostMapping("/insertTeacher") - public R insertTeacher(@RequestBody UserVo userVo){ - User user = new User(); - user.setAge(userVo.getAge()); - user.setBirthday(userVo.getBirthday()); - user.setGrade(userVo.getGrade()); - user.setSex(userVo.getSex()); - user.setName(userVo.getName()); - user.setTname(userVo.getTname()); - user.setTelephone(userVo.getTelephone()); - user.setRoleKey("3"); - user.setState(0L); - SysUser sysUser = SecurityUtils.getLoginUser().getUser(); - Long zhid = sysUser.getUserId(); - user.setZhId(zhid); - List list = iUserService.selectStudentByZhid(zhid); - if(list.size()==0){ - if(iUserService.insertUser(user)!=0){ - return R.ok("添加成功！"); - }else{ - return R.fail("添加失败！"); - } - } - return R.fail("该账号已绑定用户了！"); - } - - @ApiOperation("管理员列表") - @GetMapping("/Gl") - public R> selectGl(int pagenum){ - return R.ok(iUserService.selectGlList(pagenum)); - } - /*获取管理员用户名查询查询记录 - *@param name 用户名 - */ - @ApiOperation("管理员用户名查询") - @GetMapping("/seleteGlName") - public R> selectGl(int pagenum,String name){ - return R.ok(iUserService.selectGl(pagenum,name)); - } - /*增加管理员用户信息 - *@param name 用户名 - */ - @ApiOperation("管理员添加用户") - @PostMapping("/insertGl") - public R insertGl(@RequestBody UserVo userVo){ - User user = new User(); - user.setAge(userVo.getAge()); - user.setBirthday(userVo.getBirthday()); - user.setGrade(userVo.getGrade()); - user.setSex(userVo.getSex()); - user.setName(userVo.getName()); - user.setTname(userVo.getTname()); - user.setTelephone(userVo.getTelephone()); - user.setRoleKey("4"); - user.setState(0L); - SysUser sysUser = SecurityUtils.getLoginUser().getUser(); - Long zhid = sysUser.getUserId(); - user.setZhId(zhid); - List list = iUserService.selectStudentByZhid(zhid); - if(list.size()==0){ - if(iUserService.insertUser(user)!=0){ - return R.ok("添加成功！"); - }else{ - return R.fail("添加失败！"); - } - } - return R.fail("该账号已绑定用户了！"); - } -} +//package com.ruoyi.web.controller.test.gl; +// +//import com.baomidou.mybatisplus.core.metadata.IPage; +//import com.ruoyi.common.core.domain.R; +//import com.ruoyi.common.core.domain.entity.SysUser; +//import com.ruoyi.common.utils.SecurityUtils; +//import io.swagger.annotations.Api; +//import io.swagger.annotations.ApiOperation; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.web.bind.annotation.*; +// +//import java.util.List; +// +//@Api(tags = "管理端用户管理") +//@RestController +//@RequestMapping("/gl/users") +//public class UserController { +// @Autowired +// private IUserService iUserService; +// +// /* +// 获取学生列表 +// */ +// @ApiOperation("学生列表") +// @GetMapping("student") +// public R> selectList(int pagenum){ +// return R.ok(iUserService.selectStudentList(pagenum)); +// } +// /*获取学生用户名查询查询记录 +// *@param name 用户名 +// */ +// @ApiOperation("学生用户名查询") +// @GetMapping("/seleteStudentName") +// public R> selectStudent(int pagenum,String name){ +// return R.ok(iUserService.selectStudent(pagenum,name)); +// } +// +// /*增加学生用户信息 +// *@param name 用户名 +// */ +// @ApiOperation("学生添加用户") +// @PostMapping("/insertStudent") +// public R inserStudent(@RequestBody UserVo userVo){ +// User user = new User(); +// user.setAge(userVo.getAge()); +// user.setBirthday(userVo.getBirthday()); +// user.setGrade(userVo.getGrade()); +// user.setSex(userVo.getSex()); +// user.setName(userVo.getName()); +// user.setTname(userVo.getTname()); +// user.setTelephone(userVo.getTelephone()); +// user.setRoleKey("2"); +// user.setState(0L); +// SysUser sysUser = SecurityUtils.getLoginUser().getUser(); +// Long zhid = sysUser.getUserId(); +// user.setZhId(zhid); +// List list = iUserService.selectStudentByZhid(zhid); +// if(list.size()==0){ +// if(iUserService.insertUser(user)!=0){ +// return R.ok("添加成功！"); +// }else{ +// return R.fail("添加失败！"); +// } +// } +// return R.fail("该账号已绑定用户了！"); +// } +// +// +// +// @ApiOperation("教师列表") +// @GetMapping("/teacher") +// public R> selectTeacher(int pagenum){ +// return R.ok(iUserService.selectTeacherList(pagenum)); +// } +// /*获取教师用户名查询查询记录 +// *@param name 用户名 +// */ +// @ApiOperation("教师用户名查询") +// @GetMapping("/seleteTeacherName") +// public R> selectTeacher(int pagenum,String name){ +// return R.ok(iUserService.selectTeacher(pagenum,name)); +// } +// /*增加教师用户信息 +// *@param name 用户名 +// */ +// @ApiOperation("老师添加用户") +// @PostMapping("/insertTeacher") +// public R insertTeacher(@RequestBody UserVo userVo){ +// User user = new User(); +// user.setAge(userVo.getAge()); +// user.setBirthday(userVo.getBirthday()); +// user.setGrade(userVo.getGrade()); +// user.setSex(userVo.getSex()); +// user.setName(userVo.getName()); +// user.setTname(userVo.getTname()); +// user.setTelephone(userVo.getTelephone()); +// user.setRoleKey("3"); +// user.setState(0L); +// SysUser sysUser = SecurityUtils.getLoginUser().getUser(); +// Long zhid = sysUser.getUserId(); +// user.setZhId(zhid); +// List list = iUserService.selectStudentByZhid(zhid); +// if(list.size()==0){ +// if(iUserService.insertUser(user)!=0){ +// return R.ok("添加成功！"); +// }else{ +// return R.fail("添加失败！"); +// } +// } +// return R.fail("该账号已绑定用户了！"); +// } +// +// @ApiOperation("管理员列表") +// @GetMapping("/Gl") +// public R> selectGl(int pagenum){ +// return R.ok(iUserService.selectGlList(pagenum)); +// } +// /*获取管理员用户名查询查询记录 +// *@param name 用户名 +// */ +// @ApiOperation("管理员用户名查询") +// @GetMapping("/seleteGlName") +// public R> selectGl(int pagenum,String name){ +// return R.ok(iUserService.selectGl(pagenum,name)); +// } +// /*增加管理员用户信息 +// *@param name 用户名 +// */ +// @ApiOperation("管理员添加用户") +// @PostMapping("/insertGl") +// public R insertGl(@RequestBody UserVo userVo){ +// User user = new User(); +// user.setAge(userVo.getAge()); +// user.setBirthday(userVo.getBirthday()); +// user.setGrade(userVo.getGrade()); +// user.setSex(userVo.getSex()); +// user.setName(userVo.getName()); +// user.setTname(userVo.getTname()); +// user.setTelephone(userVo.getTelephone()); +// user.setRoleKey("4"); +// user.setState(0L); +// SysUser sysUser = SecurityUtils.getLoginUser().getUser(); +// Long zhid = sysUser.getUserId(); +// user.setZhId(zhid); +// List list = iUserService.selectStudentByZhid(zhid); +// if(list.size()==0){ +// if(iUserService.insertUser(user)!=0){ +// return R.ok("添加成功！"); +// }else{ +// return R.fail("添加失败！"); +// } +// } +// return R.fail("该账号已绑定用户了！"); +// } +//} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/student/StudentErrorBookController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/student/StudentErrorBookController.java index b58a8f7..5476d0d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/student/StudentErrorBookController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/student/StudentErrorBookController.java @@ -10,7 +10,6 @@ import com.ruoyi.test.domain.Vo.ErrorbookVo; import com.ruoyi.test.seriver.IErrorbookService; import com.ruoyi.test.seriver.IMarkedtestService; import com.ruoyi.test.seriver.IQuestionbankService; -import com.ruoyi.test.seriver.IUserService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -24,9 +23,6 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("student/errorBook") public class StudentErrorBookController { - @Autowired - private IUserService iUserService; - @Autowired private IMarkedtestService iMarkedtestService; @@ -41,10 +37,8 @@ public class StudentErrorBookController { public R addErrorBook(Long qid){ SysUser sysUser = SecurityUtils.getLoginUser().getUser(); Long id = sysUser.getUserId(); - String sender = iUserService.user(iUserService.selectByzhid(id)).getTname(); Questionbank questionbank = iQuestionbankService.selectById(qid); Errorbook errorbook = new Errorbook(); - errorbook.setSender(sender); errorbook.setContent(questionbank.getContent()); errorbook.setChance(questionbank.getChance()); errorbook.setDifficulty(questionbank.getDifficulty()); @@ -64,8 +58,7 @@ public class StudentErrorBookController { public R> selectErrorBook(int pagenum){ SysUser sysUser = SecurityUtils.getLoginUser().getUser(); Long id = sysUser.getUserId(); - String sender = iUserService.user(iUserService.selectByzhid(id)).getTname(); - return R.ok(iErrorbookService.selectErrorBook(pagenum,sender)); + return R.ok(iErrorbookService.selectErrorBook(pagenum,id)); } @ApiOperation("查询错题(根据学科)") @@ -73,8 +66,7 @@ public class StudentErrorBookController { public R> selectErrorBookBySubject(int pagenum,String subject){ SysUser sysUser = SecurityUtils.getLoginUser().getUser(); Long id = sysUser.getUserId(); - String sender = iUserService.user(iUserService.selectByzhid(id)).getTname(); - return R.ok(iErrorbookService.selectErrorBookBySubject(pagenum,sender,subject)); + return R.ok(iErrorbookService.selectErrorBookBySubject(pagenum,id,subject)); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/student/StudentExamPaperController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/student/StudentExamPaperController.java index e762956..30e7c9a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/student/StudentExamPaperController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/student/StudentExamPaperController.java @@ -23,9 +23,6 @@ import java.util.List; @RequestMapping("/student/examPaper") public class StudentExamPaperController { - @Autowired - private IUserService iUserService; - @Autowired private IStudentClassService iStudentClassService; @@ -46,8 +43,7 @@ public class StudentExamPaperController { public R selectByUserId(){ SysUser sysUser = SecurityUtils.getLoginUser().getUser(); Long id = sysUser.getUserId(); - Long userid = iUserService.selectByzhid(id); - return R.ok(iStudentClassService.selectById(userid)); + return R.ok(iStudentClassService.selectById(id)); } @ApiOperation("获取试卷") @@ -60,8 +56,8 @@ public class StudentExamPaperController { @GetMapping("whetherTest") public Boolean whetherTest(Long testId){ SysUser sysUser = SecurityUtils.getLoginUser().getUser(); - Long userid = iUserService.selectByzhid(sysUser.getUserId()); - return iAnswerService.selectBySenderIdAndTestId(userid,testId); + Long id = sysUser.getUserId(); + return iAnswerService.selectBySenderIdAndTestId(id,testId); } @@ -70,8 +66,7 @@ public class StudentExamPaperController { public R> examPaperByTypeAndSubject(int pagenum,int pagesize,String type,String subject){ SysUser sysUser = SecurityUtils.getLoginUser().getUser(); Long id = sysUser.getUserId(); - Long userid = iUserService.selectByzhid(id); - StudentClass studentClass = iStudentClassService.selectById(userid); + StudentClass studentClass = iStudentClassService.selectById(id); if(studentClass==null){ return R.fail("你还没有班级或你不是学生"); } @@ -81,6 +76,9 @@ public class StudentExamPaperController { List list1 = new ArrayList<>(); for(ClassExamPaper classExamPaper : list ){ ExamPaper examPaper = iExamPaperService.selectById(classExamPaper.getId()); + if(examPaper.getStatus()==0){ + continue; + } if(type!=null&&!examPaper.getType().equals(type)){ continue; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/student/StudentExamRecordController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/student/StudentExamRecordController.java index 0d4c602..7443535 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/student/StudentExamRecordController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/student/StudentExamRecordController.java @@ -24,9 +24,6 @@ import java.util.List; @RequestMapping("/student/examRecord") public class StudentExamRecordController { - @Autowired - private IUserService iUserService; - @Autowired private IClassExamPaperService iClassExamPaperService; @@ -53,8 +50,7 @@ public class StudentExamRecordController { public R> correction(int pagenum,int pagesize){ SysUser sysUser = SecurityUtils.getLoginUser().getUser(); Long id = sysUser.getUserId(); - String sender = iUserService.user(iUserService.selectByzhid(id)).getTname(); - List list = iAnswerService.selectBySender(sender); + List list = iAnswerService.selectBySenderId(id); List list1 = new ArrayList<>(); for(Answer answer : list){ CorrectionDO correctionDO = new CorrectionDO(); @@ -65,8 +61,8 @@ public class StudentExamRecordController { correctionDO.setSubject(examPaper.getSubject()); correctionDO.setType(examPaper.getType()); correctionDO.setName(examPaper.getName()); - if(iMarkedtestService.selectmarkedtestBySenderAndTestid(sender,testid)!=null){ - Markedtest markedtest = iMarkedtestService.selectmarkedtestBySenderAndTestid(sender,testid); + if(iMarkedtestService.selectmarkedtestBySenderIdAndTestid(answer.getSenderId(),testid)!=null){ + Markedtest markedtest = iMarkedtestService.selectmarkedtestBySenderIdAndTestid(answer.getSenderId(),testid); correctionDO.setTotalscore(markedtest.getTotalscore()); correctionDO.setScore(markedtest.getScore()); correctionDO.setTotalquestions(markedtest.getTotalquestions()); @@ -97,8 +93,7 @@ public class StudentExamRecordController { public R> correctionBySubject(int pagenum,String subject){ SysUser sysUser = SecurityUtils.getLoginUser().getUser(); Long id = sysUser.getUserId(); - String sender = iUserService.user(iUserService.selectByzhid(id)).getTname(); - List list = iAnswerService.selectBySender(sender); + List list = iAnswerService.selectBySenderId(id); List list1 = new ArrayList<>(); for(Answer answer : list){ Long testid = answer.getTestid(); @@ -112,8 +107,8 @@ public class StudentExamRecordController { correctionDO.setSubject(examPaper.getSubject()); correctionDO.setType(examPaper.getType()); correctionDO.setName(examPaper.getName()); - if(iMarkedtestService.selectmarkedtestBySenderAndTestid(sender,testid)!=null){ - Markedtest markedtest = iMarkedtestService.selectmarkedtestBySenderAndTestid(sender,testid); + if(iMarkedtestService.selectmarkedtestBySenderIdAndTestid(id,testid)!=null){ + Markedtest markedtest = iMarkedtestService.selectmarkedtestBySenderIdAndTestid(id,testid); correctionDO.setTotalscore(markedtest.getTotalscore()); correctionDO.setScore(markedtest.getScore()); correctionDO.setTotalquestions(markedtest.getTotalquestions()); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/student/StudentHomePageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/student/StudentHomePageController.java index 334fa8c..4d8d387 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/student/StudentHomePageController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/student/StudentHomePageController.java @@ -1,20 +1,22 @@ package com.ruoyi.web.controller.test.student; import com.google.gson.Gson; +import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.test.domain.Answer; +import com.ruoyi.system.service.ISysUserService; +import com.ruoyi.test.domain.*; import com.ruoyi.test.domain.DO.AnswerDO; import com.ruoyi.test.domain.DO.AnswerSheetDO; import com.ruoyi.test.domain.DO.QuestionAnswerDO; import com.ruoyi.test.domain.DO.UserDO; -import com.ruoyi.test.domain.Markedtest; -import com.ruoyi.test.domain.Questionbank; import com.ruoyi.test.domain.Vo.AnswerVo; import com.ruoyi.test.seriver.*; +import com.ruoyi.web.controller.system.SysUserController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,9 +27,6 @@ import java.util.List; @RequestMapping("/student/homepage") public class StudentHomePageController { - @Autowired - private IUserService iUserService; - @Autowired private IAnswerService iAnswerService; @@ -43,6 +42,40 @@ public class StudentHomePageController { @Autowired private IExamCreateService iExamCreateService; + @Autowired + private IStudentClassService iStudentClassService; + + @Autowired + private ITeacherManageClassService iTeacherManageClassService; + + @Autowired + private ISysUserService iSysUserService; + + @Autowired + private IInstructorManageClassService iInstructorManageClassService; + + @ApiOperation("获取用户信息") + @GetMapping("getUser") + public R getUser() { + SysUser sysUser = SecurityUtils.getLoginUser().getUser(); + Long id = sysUser.getUserId(); + SysUser sysUser2 = iSysUserService.selectUserById(id); + UserDO userDO = new UserDO(); + BeanUtils.copyProperties(sysUser2, userDO); + StudentClass studentClass = iStudentClassService.selectById(id); + userDO.setGrade(studentClass.getGrade()); + userDO.setClass1(studentClass.getClass1()); + InstructorManageClass instructorManageClass = iInstructorManageClassService.selectByGradeAndClass1(userDO.getGrade(),userDO.getClass1()); + SysUser sysUser1 = iSysUserService.selectUserById(instructorManageClass.getId()); + userDO.setTeacherName(sysUser1.getUserName()); + return R.ok(userDO); + } + + @ApiOperation("更新用户信息") + @PostMapping("updateUser") + public R updateUser(@RequestBody SysUser user) { + return R.ok(iSysUserService.updateUser(user)); + } @ApiOperation("试卷") @GetMapping("task_paper") @@ -55,14 +88,12 @@ public class StudentHomePageController { public R taskAnswer(@RequestBody AnswerDO answerDO){ SysUser sysUser = SecurityUtils.getLoginUser().getUser(); Long id = sysUser.getUserId(); - String sender = iUserService.user(iUserService.selectByzhid(id)).getTname(); List answerVos = answerDO.getList(); Gson gson = new Gson(); String answerVo = gson.toJson(answerVos); Answer answer = new Answer(); answer.setSenderId(id); - answer.setSender(sender); answer.setTestid(answerDO.getTestid()); answer.setIdanswer(answerVo); answer.setTime(answerDO.getTime()); @@ -78,8 +109,7 @@ public class StudentHomePageController { public R> taskScore(){ SysUser sysUser = SecurityUtils.getLoginUser().getUser(); Long id = sysUser.getUserId(); - String sender = iUserService.user(iUserService.selectByzhid(id)).getTname(); - return R.ok(iMarkedtestService.selectmarkedtestListBySenderAndSenderId(sender,id)); + return R.ok(iMarkedtestService.selectmarkedtestListSenderId(id)); } @ApiOperation("获取某一张的分数") @@ -95,8 +125,7 @@ public class StudentHomePageController { public R selectQuestionanswer(Long testid) { SysUser sysUser = SecurityUtils.getLoginUser().getUser(); Long id = sysUser.getUserId(); - String sender = iUserService.user(iUserService.selectByzhid(id)).getTname(); - return R.ok(iQuestionanswerService.selectQuestionanswer(id,sender,testid)); + return R.ok(iQuestionanswerService.selectQuestionanswer(id,testid)); } //主观题自动更改 @@ -105,9 +134,8 @@ public class StudentHomePageController { public R taskAnswerDisplay(Long id) { SysUser sysUser = SecurityUtils.getLoginUser().getUser(); Long id1 = sysUser.getUserId(); - String sender = iUserService.user(iUserService.selectByzhid(id1)).getTname(); List list = iExamCreateService.selectListByPid(id); - Answer answer = iAnswerService.selectByTestId(id1,sender, id); + Answer answer = iAnswerService.selectByTestId(id1, id); QuestionAnswerDO questionAnswerDO = iQuestionanswerService.createTest(list, answer); if (iQuestionanswerService.addTest(questionAnswerDO) != 0) { return R.ok("该学生客观题已改完！"); @@ -124,12 +152,4 @@ public class StudentHomePageController { return R.fail("批改提交失败！"); } - @ApiOperation("获取user信息") - @GetMapping("getUserById") - public R getUserById() { - SysUser sysUser = SecurityUtils.getLoginUser().getUser(); - Long id = sysUser.getUserId(); - return R.ok(iUserService.getUserById(id)); - } - } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/student/StudentVideoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/student/StudentVideoController.java index 265f5aa..e1f1773 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/student/StudentVideoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/student/StudentVideoController.java @@ -10,7 +10,6 @@ import com.ruoyi.test.domain.StudentClass; import com.ruoyi.test.domain.Video; import com.ruoyi.test.seriver.IClassVedioService; import com.ruoyi.test.seriver.IStudentClassService; -import com.ruoyi.test.seriver.IUserService; import com.ruoyi.test.seriver.IVideoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -26,10 +25,6 @@ import java.util.List; @RestController @RequestMapping("/student/video") public class StudentVideoController { - - @Autowired - private IUserService iUserService; - @Autowired private IStudentClassService iStudentClassService; @@ -44,8 +39,7 @@ public class StudentVideoController { public R> vedioList(int pagenum,int pagesize){ SysUser sysUser = SecurityUtils.getLoginUser().getUser(); Long id = sysUser.getUserId(); - Long userId = iUserService.user(iUserService.selectByzhid(id)).getUserId(); - StudentClass studentClass = iStudentClassService.selectById(userId); + StudentClass studentClass = iStudentClassService.selectById(id); String grade = studentClass.getGrade(); String Class1 = studentClass.getClass1(); List list= iClassVedioService.selectClassVideo(grade,Class1); @@ -66,8 +60,7 @@ public class StudentVideoController { public R> vedioListBySubject(int pagenum,String subject,int pagesize){ SysUser sysUser = SecurityUtils.getLoginUser().getUser(); Long id = sysUser.getUserId(); - Long userId = iUserService.user(iUserService.selectByzhid(id)).getUserId(); - StudentClass studentClass = iStudentClassService.selectById(userId); + StudentClass studentClass = iStudentClassService.selectById(id); String grade = studentClass.getGrade(); String Class1 = studentClass.getClass1(); List list= iClassVedioService.selectClassVideo(grade,Class1); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/teacher/TeacherAnalysisController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/teacher/TeacherAnalysisController.java index c00f1a1..d7b32d5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/teacher/TeacherAnalysisController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/teacher/TeacherAnalysisController.java @@ -26,9 +26,6 @@ import java.util.Map; @RequestMapping("teacher/analysis") public class TeacherAnalysisController { - @Autowired - private IUserService iUserService; - @Autowired private ITeacherManageClassService iTeacherManageClassService; @@ -51,9 +48,8 @@ public class TeacherAnalysisController { @GetMapping("examPaperList") public R> examPaperList(int pagenum){ SysUser sysUser = SecurityUtils.getLoginUser().getUser(); - Long zhid = sysUser.getUserId(); - Long teacherid = iUserService.selectByzhid(zhid); - List list = iTeacherManageClassService.totalClass(teacherid); + Long id1 = sysUser.getUserId(); + List list = iTeacherManageClassService.totalClass(id1); List list1 = new ArrayList<>(); Map> map = new HashMap<>(); for(TeacherManageClass teacherManageClass : list){ @@ -103,11 +99,9 @@ public class TeacherAnalysisController { Double sum = 0.0; for(StudentClass studentClass : list){ Long studentid = studentClass.getStudentid(); - String tname = iUserService.user(studentid).getTname(); - System.out.println(tname); Double score = 0.0; - if(iMarkedtestService.selectmarkedtestBySenderAndTestid(studentClass.getStudentid(),testid)!=null){ - score =iMarkedtestService.selectmarkedtestBySenderAndTestid(studentClass.getStudentid(),testid).getScore(); + if(iMarkedtestService.selectmarkedtestBySenderIdAndTestid(studentClass.getStudentid(),testid)!=null){ + score =iMarkedtestService.selectmarkedtestBySenderIdAndTestid(studentClass.getStudentid(),testid).getScore(); } sum+=score; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/teacher/TeacherAnswerSheetController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/teacher/TeacherAnswerSheetController.java index deeee7b..ca75ece 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/teacher/TeacherAnswerSheetController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/teacher/TeacherAnswerSheetController.java @@ -22,8 +22,6 @@ import java.util.List; @RequestMapping("/teacher/answerSheet") public class TeacherAnswerSheetController { - @Autowired - private IUserService iUserService; @Autowired private IAnswerSheetDOService iAnswerSheetDOService; @@ -47,8 +45,8 @@ public class TeacherAnswerSheetController { @ApiOperation("查看学生的考试情况(最新)") @GetMapping("selectQuestionanswer") - public R selectQuestionanswer(Long senderId,String sender, Long testid) { - return R.ok(iQuestionanswerService.selectQuestionanswer(senderId,sender,testid)); + public R selectQuestionanswer(Long senderId, Long testid) { + return R.ok(iQuestionanswerService.selectQuestionanswer(senderId,testid)); } @ApiOperation("批改客观题") @@ -63,8 +61,8 @@ public class TeacherAnswerSheetController { @ApiOperation("试卷批改完毕提交") @PostMapping("addmarkedtest") - public R addmarkedtest(Long senderId,String sender,Long testid){ - if(iMarkedtestService.addmarkedtest(senderId,sender,testid)!=0){ + public R addmarkedtest(Long senderId,Long testid){ + if(iMarkedtestService.addmarkedtest(senderId,testid)!=0){ return R.ok("提交完成！"); } return R.fail("提交失败！"); @@ -74,8 +72,7 @@ public class TeacherAnswerSheetController { @GetMapping("selectmarkedtest") public R> selectmarkedtest(int pagenum){ SysUser sysUser = SecurityUtils.getLoginUser().getUser(); - Long zhid = sysUser.getUserId(); - Long teacherid = iUserService.selectByzhid(zhid); + Long teacherid = sysUser.getUserId(); List list = iTeacherManageClassService.totalClass(teacherid); List list1 = new ArrayList<>(); for(TeacherManageClass teacherManageClass : list){ @@ -89,14 +86,12 @@ public class TeacherAnswerSheetController { @GetMapping("selectmarkedtestBySubject") public R> selectmarkedtestBySubject(int pagenum,String subject){ SysUser sysUser = SecurityUtils.getLoginUser().getUser(); - Long zhid = sysUser.getUserId(); - Long teacherid = iUserService.selectByzhid(zhid); + Long teacherid = sysUser.getUserId(); List list = iTeacherManageClassService.totalClass(teacherid); List list1 = new ArrayList<>(); for(TeacherManageClass teacherManageClass : list){ list1.addAll(iStudentClassService.selectByGradeAndClass(teacherManageClass.getGrade(),teacherManageClass.getClass1())); } - System.out.println(11111+" "+list1); return R.ok(iMarkedtestService.selectmarkedtestBySubject(pagenum,list1,subject)); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/teacher/TeacherClassController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/teacher/TeacherClassController.java index 4beab3d..0deed7f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/teacher/TeacherClassController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/teacher/TeacherClassController.java @@ -11,7 +11,6 @@ import com.ruoyi.test.domain.TeacherManageClass; import com.ruoyi.test.seriver.IClass1Service; import com.ruoyi.test.seriver.IStudentClassService; import com.ruoyi.test.seriver.ITeacherManageClassService; -import com.ruoyi.test.seriver.IUserService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -25,9 +24,6 @@ import java.util.List; @RequestMapping("teacher/class") public class TeacherClassController { - @Autowired - private IUserService iUserService; - @Autowired private ITeacherManageClassService iTeacherManageClassService; @@ -41,9 +37,8 @@ public class TeacherClassController { @GetMapping("classList") public R> classList(int pagenum){ SysUser sysUser = SecurityUtils.getLoginUser().getUser(); - Long zhid = sysUser.getUserId(); - Long teacherid = iUserService.selectByzhid(zhid); - List list = iTeacherManageClassService.totalClass(teacherid); + Long id = sysUser.getUserId(); + List list = iTeacherManageClassService.totalClass(id); List list1 = new ArrayList<>(); for(TeacherManageClass teacherManageClass : list){ String grade = teacherManageClass.getGrade(); @@ -85,9 +80,8 @@ public class TeacherClassController { public R addclass1(String name,String grade,String Class1){ if(iClass1Service.addclass1(name,grade,Class1)!=0){ SysUser sysUser = SecurityUtils.getLoginUser().getUser(); - Long zhid = sysUser.getUserId(); - Long teacherid = iUserService.selectByzhid(zhid); - iTeacherManageClassService.addclass1(teacherid,grade,Class1); + Long id = sysUser.getUserId(); + iTeacherManageClassService.addclass1(id,grade,Class1); return R.ok("创建成功！"); } return R.fail("创建失败！"); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/teacher/TeacherExamPaperController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/teacher/TeacherExamPaperController.java index 2e87446..00c6ec2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/teacher/TeacherExamPaperController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/teacher/TeacherExamPaperController.java @@ -26,9 +26,6 @@ import java.util.Map; @RequestMapping("/teacher/examPaper") public class TeacherExamPaperController { - @Autowired - private IUserService iUserService; - @Autowired private IExamPaperService iExamPaperService; @@ -51,9 +48,8 @@ public class TeacherExamPaperController { @GetMapping("examPaperList") public R> examPaperList(int pagenum){ SysUser sysUser = SecurityUtils.getLoginUser().getUser(); - Long zhid = sysUser.getUserId(); - Long teacherid = iUserService.selectByzhid(zhid); - List list = iTeacherManageClassService.totalClass(teacherid); + Long id1 = sysUser.getUserId(); + List list = iTeacherManageClassService.totalClass(id1); List list1 = new ArrayList<>(); Map> map = new HashMap<>(); for(TeacherManageClass teacherManageClass : list){ @@ -97,8 +93,7 @@ public class TeacherExamPaperController { @GetMapping("examPaperListById") public R examPaperListById(int pagenum,Long id){ SysUser sysUser = SecurityUtils.getLoginUser().getUser(); - Long zhid = sysUser.getUserId(); - Long teacherid = iUserService.selectByzhid(zhid); + Long teacherid = sysUser.getUserId(); List list = iTeacherManageClassService.totalClass(teacherid); ClassExamPaperDO classExamPaperDO = new ClassExamPaperDO(); classExamPaperDO.setId(id); @@ -128,8 +123,7 @@ public class TeacherExamPaperController { @GetMapping("examPaperListByStuject") public R> examPaperListById(int pagenum,String subject){ SysUser sysUser = SecurityUtils.getLoginUser().getUser(); - Long zhid = sysUser.getUserId(); - Long teacherid = iUserService.selectByzhid(zhid); + Long teacherid = sysUser.getUserId(); List list3 = iExamPaperService.selectBySubject(subject); List list = iTeacherManageClassService.totalClass(teacherid); List list1 = new ArrayList<>(); @@ -177,8 +171,7 @@ public class TeacherExamPaperController { @PostMapping("Class") public R> Class(){ SysUser sysUser = SecurityUtils.getLoginUser().getUser(); - Long zhid = sysUser.getUserId(); - Long teacherid = iUserService.selectByzhid(zhid); + Long teacherid = sysUser.getUserId(); List list = iTeacherManageClassService.totalClass(teacherid); List list1 = new ArrayList<>(); for(TeacherManageClass teacherManageClass : list){ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/teacher/TeacherHomePageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/teacher/TeacherHomePageController.java index 13b4700..e527957 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/teacher/TeacherHomePageController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/teacher/TeacherHomePageController.java @@ -26,9 +26,6 @@ public class TeacherHomePageController { @Autowired private ITeacherManageClassService iTeacherManageClassService; - @Autowired - private IUserService iUserService; - @Autowired private IStudentClassService iStudentClassService; @@ -48,8 +45,7 @@ public class TeacherHomePageController { @GetMapping("homepagesuju") public R homepagesuju(){ SysUser sysUser = SecurityUtils.getLoginUser().getUser(); - Long zhid = sysUser.getUserId(); - Long teacherid = iUserService.selectByzhid(zhid); + Long teacherid = sysUser.getUserId(); HomepageDO homepageDO = new HomepageDO(); Integer total = iTeacherManageClassService.totalClass(teacherid).size(); homepageDO.setSumclass(total); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/teacher/TeacherUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/teacher/TeacherUserController.java index c90e8b6..d3137d7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/teacher/TeacherUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/teacher/TeacherUserController.java @@ -8,11 +8,9 @@ import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.test.domain.DO.StudentListDO; import com.ruoyi.test.domain.StudentClass; import com.ruoyi.test.domain.TeacherManageClass; -import com.ruoyi.test.domain.User; import com.ruoyi.test.seriver.IStudentClassService; import com.ruoyi.test.seriver.IClassExamPaperService; import com.ruoyi.test.seriver.ITeacherManageClassService; -import com.ruoyi.test.seriver.IUserService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -28,9 +26,6 @@ import java.util.List; @RequestMapping("/teacher/users") public class TeacherUserController { - @Autowired - private IUserService iUserService; - @Autowired private ITeacherManageClassService iTeacherManageClassService; @@ -44,9 +39,8 @@ public class TeacherUserController { @GetMapping("studentList") public R> studentList(int pagenum){ SysUser sysUser = SecurityUtils.getLoginUser().getUser(); - Long zhid = sysUser.getUserId(); - Long teacherid = iUserService.selectByzhid(zhid); - List list = iTeacherManageClassService.totalClass(teacherid); + Long id = sysUser.getUserId(); + List list = iTeacherManageClassService.totalClass(id); List list1 = new ArrayList<>(); for(TeacherManageClass teacherManageClass : list){ String grade = teacherManageClass.getGrade(); @@ -60,11 +54,12 @@ public class TeacherUserController { studentListDO.setGrade(studentClass.getGrade()); studentListDO.setClass1(studentClass.getClass1()); studentListDO.setAddtime(studentClass.getAddtime()); - User user = iUserService.user(studentClass.getStudentid()); - studentListDO.setName(user.getName()); - studentListDO.setTname(user.getTname()); - studentListDO.setSex(user.getSex()); - studentListDO.setTelephone(user.getTelephone()); +// User user = iUserService.user(studentClass.getStudentid()); +// SysUser sysUser1 = +// studentListDO.setName(user.getName()); +// studentListDO.setTname(user.getTname()); +// studentListDO.setSex(user.getSex()); +// studentListDO.setTelephone(user.getTelephone()); listDOS.add(studentListDO); } Page page = new Page<>(pagenum,10); @@ -77,9 +72,8 @@ public class TeacherUserController { @GetMapping("studentListByName") public R> studentListByName(int pagenum,String name){ SysUser sysUser = SecurityUtils.getLoginUser().getUser(); - Long zhid = sysUser.getUserId(); - Long teacherid = iUserService.selectByzhid(zhid); - List list = iTeacherManageClassService.totalClass(teacherid); + Long id = sysUser.getUserId(); + List list = iTeacherManageClassService.totalClass(id); List list1 = new ArrayList<>(); for(TeacherManageClass teacherManageClass : list){ String grade = teacherManageClass.getGrade(); @@ -88,19 +82,19 @@ public class TeacherUserController { } List listDOS = new ArrayList<>(); for(StudentClass studentClass : list1){ - User user = iUserService.user(studentClass.getStudentid()); - if(!user.getName().equals(name)){ - continue; - } +// User user = iUserService.user(studentClass.getStudentid()); +// if(!user.getName().equals(name)){ +// continue; +// } StudentListDO studentListDO = new StudentListDO(); studentListDO.setId(studentClass.getStudentid()); studentListDO.setGrade(studentClass.getGrade()); studentListDO.setClass1(studentClass.getClass1()); studentListDO.setAddtime(studentClass.getAddtime()); - studentListDO.setName(user.getName()); - studentListDO.setTname(user.getTname()); - studentListDO.setSex(user.getSex()); - studentListDO.setTelephone(user.getTelephone()); +// studentListDO.setName(user.getName()); +// studentListDO.setTname(user.getTname()); +// studentListDO.setSex(user.getSex()); +// studentListDO.setTelephone(user.getTelephone()); listDOS.add(studentListDO); } Page page = new Page<>(pagenum,10); @@ -113,9 +107,8 @@ public class TeacherUserController { @GetMapping("studentListByClass") public R> studentListByClass(int pagenum,String Class){ SysUser sysUser = SecurityUtils.getLoginUser().getUser(); - Long zhid = sysUser.getUserId(); - Long teacherid = iUserService.selectByzhid(zhid); - List list = iTeacherManageClassService.totalClass(teacherid); + Long id = sysUser.getUserId(); + List list = iTeacherManageClassService.totalClass(id); List list1 = new ArrayList<>(); for(TeacherManageClass teacherManageClass : list){ String grade = teacherManageClass.getGrade(); @@ -126,16 +119,16 @@ public class TeacherUserController { } List listDOS = new ArrayList<>(); for(StudentClass studentClass : list1){ - User user = iUserService.user(studentClass.getStudentid()); +// User user = iUserService.user(studentClass.getStudentid()); StudentListDO studentListDO = new StudentListDO(); studentListDO.setId(studentClass.getStudentid()); studentListDO.setGrade(studentClass.getGrade()); studentListDO.setClass1(studentClass.getClass1()); studentListDO.setAddtime(studentClass.getAddtime()); - studentListDO.setName(user.getName()); - studentListDO.setTname(user.getTname()); - studentListDO.setSex(user.getSex()); - studentListDO.setTelephone(user.getTelephone()); +// studentListDO.setName(user.getName()); +// studentListDO.setTname(user.getTname()); +// studentListDO.setSex(user.getSex()); +// studentListDO.setTelephone(user.getTelephone()); listDOS.add(studentListDO); } Page page = new Page<>(pagenum,10); diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java index d169139..491e13e 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java @@ -70,6 +70,16 @@ public class SysUser extends BaseEntity @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT) private Date loginDate; + private String studentnumber; + + public String getStudentnumber() { + return studentnumber; + } + + public void setStudentnumber(String studentnumber) { + this.studentnumber = studentnumber; + } + /** 部门对象 */ @Excels({ @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT), diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java index deca952..d0a6747 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java @@ -206,7 +206,7 @@ public class SysRoleServiceImpl implements ISysRoleService List roles = SpringUtils.getAopProxy(this).selectRoleList(role); if (StringUtils.isEmpty(roles)) { - throw new ServiceException("没有权限访问角色数据！"); +// throw new ServiceException("没有权限访问角色数据！"); } } } diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index 0856cb2..12d77b5 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -23,6 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -47,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, + select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.studentnumber, d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status from sys_user u @@ -190,6 +191,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" login_date = #{loginDate}, update_by = #{updateBy}, remark = #{remark}, + studentnumber = #{studentnumber}, update_time = sysdate() where user_id = #{userId} diff --git a/ruoyi-test/src/main/java/com/ruoyi/test/domain/Answer.java b/ruoyi-test/src/main/java/com/ruoyi/test/domain/Answer.java index d2052f6..44f92cb 100644 --- a/ruoyi-test/src/main/java/com/ruoyi/test/domain/Answer.java +++ b/ruoyi-test/src/main/java/com/ruoyi/test/domain/Answer.java @@ -9,7 +9,6 @@ import lombok.Data; public class Answer { private Long senderId; - private String sender; private Long testid; private String idanswer; private String finishtime; diff --git a/ruoyi-test/src/main/java/com/ruoyi/test/domain/DO/ExamPaperDO.java b/ruoyi-test/src/main/java/com/ruoyi/test/domain/DO/ExamPaperDO.java index 072cd4c..59f0ea4 100644 --- a/ruoyi-test/src/main/java/com/ruoyi/test/domain/DO/ExamPaperDO.java +++ b/ruoyi-test/src/main/java/com/ruoyi/test/domain/DO/ExamPaperDO.java @@ -12,5 +12,6 @@ public class ExamPaperDO { private String grade; private String name; private String createtime; + private Long status; } diff --git a/ruoyi-test/src/main/java/com/ruoyi/test/domain/DO/QuestionAnswerDO.java b/ruoyi-test/src/main/java/com/ruoyi/test/domain/DO/QuestionAnswerDO.java index f073e9c..7987387 100644 --- a/ruoyi-test/src/main/java/com/ruoyi/test/domain/DO/QuestionAnswerDO.java +++ b/ruoyi-test/src/main/java/com/ruoyi/test/domain/DO/QuestionAnswerDO.java @@ -7,8 +7,7 @@ import java.util.List; @Data public class QuestionAnswerDO { - - private String sender; + private Long senderId; private long testid; private List list; diff --git a/ruoyi-test/src/main/java/com/ruoyi/test/domain/DO/UserDO.java b/ruoyi-test/src/main/java/com/ruoyi/test/domain/DO/UserDO.java index 79cd8d7..04276e0 100644 --- a/ruoyi-test/src/main/java/com/ruoyi/test/domain/DO/UserDO.java +++ b/ruoyi-test/src/main/java/com/ruoyi/test/domain/DO/UserDO.java @@ -5,12 +5,12 @@ import lombok.Data; @Data public class UserDO { private Long userId; - private String name; - private String tname; + private String userName; + private String nickName; private Long age; private String sex; private String birthday; - private String telephone; + private String phonenumber; private String grade; private String Class1; private String teacherName; diff --git a/ruoyi-test/src/main/java/com/ruoyi/test/domain/Errorbook.java b/ruoyi-test/src/main/java/com/ruoyi/test/domain/Errorbook.java index e5edb9d..87d3933 100644 --- a/ruoyi-test/src/main/java/com/ruoyi/test/domain/Errorbook.java +++ b/ruoyi-test/src/main/java/com/ruoyi/test/domain/Errorbook.java @@ -7,7 +7,7 @@ import lombok.Data; @TableName("errorbook") public class Errorbook { - private String sender; + private Long senderId; private String content; private String chance; private String answer; diff --git a/ruoyi-test/src/main/java/com/ruoyi/test/domain/ExamPaper.java b/ruoyi-test/src/main/java/com/ruoyi/test/domain/ExamPaper.java index 244721e..09d58ec 100644 --- a/ruoyi-test/src/main/java/com/ruoyi/test/domain/ExamPaper.java +++ b/ruoyi-test/src/main/java/com/ruoyi/test/domain/ExamPaper.java @@ -6,11 +6,12 @@ import lombok.Data; @TableName("exam_paper") public class ExamPaper { - private long id; + private Long id; private String grade; private String subject; private String createtime; private String name; private String type; private Integer time; + private Integer status; } diff --git a/ruoyi-test/src/main/java/com/ruoyi/test/domain/InstructorManageClass.java b/ruoyi-test/src/main/java/com/ruoyi/test/domain/InstructorManageClass.java new file mode 100644 index 0000000..7e3bf35 --- /dev/null +++ b/ruoyi-test/src/main/java/com/ruoyi/test/domain/InstructorManageClass.java @@ -0,0 +1,12 @@ +package com.ruoyi.test.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +@Data +@TableName("instructor_manage_class") +public class InstructorManageClass { + private Long id; + private String grade; + private String Class1; +} diff --git a/ruoyi-test/src/main/java/com/ruoyi/test/domain/Markedtest.java b/ruoyi-test/src/main/java/com/ruoyi/test/domain/Markedtest.java index 2ec6eda..3ecaa99 100644 --- a/ruoyi-test/src/main/java/com/ruoyi/test/domain/Markedtest.java +++ b/ruoyi-test/src/main/java/com/ruoyi/test/domain/Markedtest.java @@ -8,7 +8,6 @@ import lombok.Data; public class Markedtest { private Long senderId; - private String sender; private long testid; private double score; private double totalscore; diff --git a/ruoyi-test/src/main/java/com/ruoyi/test/domain/Questionanswer.java b/ruoyi-test/src/main/java/com/ruoyi/test/domain/Questionanswer.java index 7391d83..90e64f9 100644 --- a/ruoyi-test/src/main/java/com/ruoyi/test/domain/Questionanswer.java +++ b/ruoyi-test/src/main/java/com/ruoyi/test/domain/Questionanswer.java @@ -6,9 +6,7 @@ import lombok.Data; @Data @TableName("questionanswer") public class Questionanswer { - private Long senderId; - private String sender; private long testid; private String qa; private String createtime; diff --git a/ruoyi-test/src/main/java/com/ruoyi/test/domain/StudentClass.java b/ruoyi-test/src/main/java/com/ruoyi/test/domain/StudentClass.java index ad950e3..04306b3 100644 --- a/ruoyi-test/src/main/java/com/ruoyi/test/domain/StudentClass.java +++ b/ruoyi-test/src/main/java/com/ruoyi/test/domain/StudentClass.java @@ -11,7 +11,6 @@ public class StudentClass { private Long studentid; private String grade; private String Class1; - private String addtime; } diff --git a/ruoyi-test/src/main/java/com/ruoyi/test/domain/TeacherManageClass.java b/ruoyi-test/src/main/java/com/ruoyi/test/domain/TeacherManageClass.java index 66dc0df..ef1fd97 100644 --- a/ruoyi-test/src/main/java/com/ruoyi/test/domain/TeacherManageClass.java +++ b/ruoyi-test/src/main/java/com/ruoyi/test/domain/TeacherManageClass.java @@ -8,7 +8,7 @@ import lombok.Data; @TableName("teacher_manage_class") public class TeacherManageClass { - private long teacherid; + private Long teacherid; private String grade; private String Class1; diff --git a/ruoyi-test/src/main/java/com/ruoyi/test/domain/User.java b/ruoyi-test/src/main/java/com/ruoyi/test/domain/User.java deleted file mode 100644 index 1b90b92..0000000 --- a/ruoyi-test/src/main/java/com/ruoyi/test/domain/User.java +++ /dev/null @@ -1,133 +0,0 @@ -package com.ruoyi.test.domain; - -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -@Data -@TableName("user") -public class User { - - private long userId; - private String name; - private String tname; - private long age; - private String sex; - private String birthday; - private String telephone; - private String grade; - private String createtime; - private long state; - private String roleKey; - private long zhId; - private String email; - private String studentnumber; - - - public long getUserId() { - return userId; - } - - public void setUserId(long userId) { - this.userId = userId; - } - - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - - public String getTname() { - return tname; - } - - public void setTname(String tname) { - this.tname = tname; - } - - - public long getAge() { - return age; - } - - public void setAge(long age) { - this.age = age; - } - - - public String getSex() { - return sex; - } - - public void setSex(String sex) { - this.sex = sex; - } - - - public String getBirthday() { - return birthday; - } - - public void setBirthday(String birthday) { - this.birthday = birthday; - } - - - public String getTelephone() { - return telephone; - } - - public void setTelephone(String telephone) { - this.telephone = telephone; - } - - - public String getGrade() { - return grade; - } - - public void setGrade(String grade) { - this.grade = grade; - } - - - public String getCreatetime() { - return createtime; - } - - public void setCreatetime(String createtime) { - this.createtime = createtime; - } - - - public long getState() { - return state; - } - - public void setState(long state) { - this.state = state; - } - - - public String getRoleKey() { - return roleKey; - } - - public void setRoleKey(String roleKey) { - this.roleKey = roleKey; - } - - - public long getZhId() { - return zhId; - } - - public void setZhId(long zhId) { - this.zhId = zhId; - } - -} diff --git a/ruoyi-test/src/main/java/com/ruoyi/test/domain/Vo/ErrorbookVo.java b/ruoyi-test/src/main/java/com/ruoyi/test/domain/Vo/ErrorbookVo.java index 3410b41..f5f87ce 100644 --- a/ruoyi-test/src/main/java/com/ruoyi/test/domain/Vo/ErrorbookVo.java +++ b/ruoyi-test/src/main/java/com/ruoyi/test/domain/Vo/ErrorbookVo.java @@ -8,7 +8,7 @@ import java.util.Map; @Data public class ErrorbookVo { - private String sender; + private Long senderId; private String content; private List> chance; private String answer; diff --git a/ruoyi-test/src/main/java/com/ruoyi/test/domain/Vo/UserVo.java b/ruoyi-test/src/main/java/com/ruoyi/test/domain/Vo/UserVo.java deleted file mode 100644 index bc630f7..0000000 --- a/ruoyi-test/src/main/java/com/ruoyi/test/domain/Vo/UserVo.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.ruoyi.test.domain.Vo; - -import com.baomidou.mybatisplus.annotation.TableId; -import lombok.Data; - -import java.util.Date; - -@Data -public class UserVo { - - @TableId(value = "user_id") - private Long userId; - private String name; - private String tname; - private long age; - private String sex; - private String birthday; - private String telephone; - private String grade; - private long state; - private String email; - private String studentnumber; -} diff --git a/ruoyi-test/src/main/java/com/ruoyi/test/mapper/AnswerMapper.java b/ruoyi-test/src/main/java/com/ruoyi/test/mapper/AnswerMapper.java index cb71101..0261551 100644 --- a/ruoyi-test/src/main/java/com/ruoyi/test/mapper/AnswerMapper.java +++ b/ruoyi-test/src/main/java/com/ruoyi/test/mapper/AnswerMapper.java @@ -12,5 +12,5 @@ import java.util.List; public interface AnswerMapper extends BaseMapper { int answer(@Param("answer") Answer answer); - List selectBySender(@Param("sender") String sender); + List selectBySender(@Param("sender") Long senderId); } diff --git a/ruoyi-test/src/main/java/com/ruoyi/test/mapper/InstructorManageClassMapper.java b/ruoyi-test/src/main/java/com/ruoyi/test/mapper/InstructorManageClassMapper.java new file mode 100644 index 0000000..f4ee8c9 --- /dev/null +++ b/ruoyi-test/src/main/java/com/ruoyi/test/mapper/InstructorManageClassMapper.java @@ -0,0 +1,9 @@ +package com.ruoyi.test.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.test.domain.InstructorManageClass; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface InstructorManageClassMapper extends BaseMapper { +} diff --git a/ruoyi-test/src/main/java/com/ruoyi/test/mapper/UserMapper.java b/ruoyi-test/src/main/java/com/ruoyi/test/mapper/UserMapper.java deleted file mode 100644 index a2bc1db..0000000 --- a/ruoyi-test/src/main/java/com/ruoyi/test/mapper/UserMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.ruoyi.test.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.test.domain.User; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -@Mapper -public interface UserMapper extends BaseMapper { - -// List seleteUser(String name); - - int insertUser(User user); -} diff --git a/ruoyi-test/src/main/java/com/ruoyi/test/seriver/IAnswerService.java b/ruoyi-test/src/main/java/com/ruoyi/test/seriver/IAnswerService.java index aa7f72a..b153ca7 100644 --- a/ruoyi-test/src/main/java/com/ruoyi/test/seriver/IAnswerService.java +++ b/ruoyi-test/src/main/java/com/ruoyi/test/seriver/IAnswerService.java @@ -9,9 +9,9 @@ public interface IAnswerService { int answer(Answer answer); - Answer selectByTestId(Long senderId,String sender,Long testid); + Answer selectByTestId(Long senderId,Long testid); - List selectBySender(String sender); + List selectBySenderId(Long senderId); Boolean selectBySenderIdAndTestId(Long senderId,Long testid); diff --git a/ruoyi-test/src/main/java/com/ruoyi/test/seriver/IErrorbookService.java b/ruoyi-test/src/main/java/com/ruoyi/test/seriver/IErrorbookService.java index 97c56bb..2e1f254 100644 --- a/ruoyi-test/src/main/java/com/ruoyi/test/seriver/IErrorbookService.java +++ b/ruoyi-test/src/main/java/com/ruoyi/test/seriver/IErrorbookService.java @@ -8,7 +8,7 @@ public interface IErrorbookService { int addErrorBook(Errorbook errorbook); - IPage selectErrorBook(int pagenum,String sender); + IPage selectErrorBook(int pagenum,Long senderId); - IPage selectErrorBookBySubject(int pagenum,String sender,String subject); + IPage selectErrorBookBySubject(int pagenum,Long senderId,String subject); } diff --git a/ruoyi-test/src/main/java/com/ruoyi/test/seriver/IInstructorManageClassService.java b/ruoyi-test/src/main/java/com/ruoyi/test/seriver/IInstructorManageClassService.java new file mode 100644 index 0000000..a523036 --- /dev/null +++ b/ruoyi-test/src/main/java/com/ruoyi/test/seriver/IInstructorManageClassService.java @@ -0,0 +1,8 @@ +package com.ruoyi.test.seriver; + +import com.ruoyi.test.domain.InstructorManageClass; + +public interface IInstructorManageClassService { + + InstructorManageClass selectByGradeAndClass1(String grade ,String Class1); +} diff --git a/ruoyi-test/src/main/java/com/ruoyi/test/seriver/IMarkedtestService.java b/ruoyi-test/src/main/java/com/ruoyi/test/seriver/IMarkedtestService.java index 89ccec5..de5fdcf 100644 --- a/ruoyi-test/src/main/java/com/ruoyi/test/seriver/IMarkedtestService.java +++ b/ruoyi-test/src/main/java/com/ruoyi/test/seriver/IMarkedtestService.java @@ -8,7 +8,7 @@ import java.util.List; public interface IMarkedtestService { - int addmarkedtest(Long senderId,String sender,Long testid); + int addmarkedtest(Long senderId,Long testid); IPage selectmarkedtest(int pagenum); @@ -18,11 +18,11 @@ public interface IMarkedtestService { IPage selectmarkedtestBySubject(int pagenum,List list,String subject); - List selectmarkedtestListBySenderAndSenderId(String sender,Long senderId); + List selectmarkedtestListSenderId(Long senderId); - Markedtest selectmarkedtestBySenderAndTestid(String sender,Long senderId); + Markedtest selectmarkedtestBySenderId(Long senderId); - Markedtest selectmarkedtestBySenderAndTestid(Long senderId,Long testId); + Markedtest selectmarkedtestBySenderIdAndTestid(Long senderId,Long testId); Markedtest selectmarkedtestByTestid(Long id,Long testId); } diff --git a/ruoyi-test/src/main/java/com/ruoyi/test/seriver/IQuestionanswerService.java b/ruoyi-test/src/main/java/com/ruoyi/test/seriver/IQuestionanswerService.java index 247db14..11ee495 100644 --- a/ruoyi-test/src/main/java/com/ruoyi/test/seriver/IQuestionanswerService.java +++ b/ruoyi-test/src/main/java/com/ruoyi/test/seriver/IQuestionanswerService.java @@ -17,7 +17,7 @@ public interface IQuestionanswerService { int addTest(QuestionAnswerDO questionAnswerDO); - QuestionAnswerDO selectQuestionanswer(Long senderId,String sender,Long id); + QuestionAnswerDO selectQuestionanswer(Long senderId,Long id); int markObjectiveQuestions(QuestionAnswerDO questionAnswerDO); diff --git a/ruoyi-test/src/main/java/com/ruoyi/test/seriver/ITaskService.java b/ruoyi-test/src/main/java/com/ruoyi/test/seriver/ITaskService.java index 642886b..13dfa51 100644 --- a/ruoyi-test/src/main/java/com/ruoyi/test/seriver/ITaskService.java +++ b/ruoyi-test/src/main/java/com/ruoyi/test/seriver/ITaskService.java @@ -12,7 +12,7 @@ public interface ITaskService { IPage selectListByGrade(String grade,int pagenum); - int addTask(TaskVo taskVo,String username); + int addTask(TaskVo taskVo,String sender); int deleteTask(Long id); diff --git a/ruoyi-test/src/main/java/com/ruoyi/test/seriver/ITeacherManageClassService.java b/ruoyi-test/src/main/java/com/ruoyi/test/seriver/ITeacherManageClassService.java index b3d1b52..5c0605c 100644 --- a/ruoyi-test/src/main/java/com/ruoyi/test/seriver/ITeacherManageClassService.java +++ b/ruoyi-test/src/main/java/com/ruoyi/test/seriver/ITeacherManageClassService.java @@ -11,4 +11,6 @@ public interface ITeacherManageClassService { int deleteClass(String grade,String Class1); int addclass1(Long teacherid,String grade,String Class1); + + TeacherManageClass selectByGradeAndClass(String grade,String Class1); } diff --git a/ruoyi-test/src/main/java/com/ruoyi/test/seriver/IUserService.java b/ruoyi-test/src/main/java/com/ruoyi/test/seriver/IUserService.java deleted file mode 100644 index bf61e76..0000000 --- a/ruoyi-test/src/main/java/com/ruoyi/test/seriver/IUserService.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.ruoyi.test.seriver; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.ruoyi.test.domain.DO.UserDO; -import com.ruoyi.test.domain.User; -import com.ruoyi.test.domain.Vo.UserVo; - -import java.util.List; - -public interface IUserService { - //获取学生列表 - IPage selectStudentList(int pagenum); - //根据用户名查询学生用户 - IPage selectStudent(int pagenum,String name); - - //绑定学生/老师/管理员用户信息 - int insertUser(User user); - // - List selectStudentByZhid(Long zhid); - - //获取教师列表 - IPage selectTeacherList(int pagenum); - //根据用户名查询教师用户 - IPage selectTeacher(int pagenum,String name); - - IPage selectGlList(int pagenum); - //根据用户名查询学生用户 - IPage selectGl(int pagenum,String name); - - //通过账号查询用户id - Long selectByzhid(Long zhid); - - User user(Long id); - - UserDO getUserById(Long id); -} diff --git a/ruoyi-test/src/main/java/com/ruoyi/test/seriver/Impl/AnswerServiceImpl.java b/ruoyi-test/src/main/java/com/ruoyi/test/seriver/Impl/AnswerServiceImpl.java index 03a36ec..d2ec2d0 100644 --- a/ruoyi-test/src/main/java/com/ruoyi/test/seriver/Impl/AnswerServiceImpl.java +++ b/ruoyi-test/src/main/java/com/ruoyi/test/seriver/Impl/AnswerServiceImpl.java @@ -24,18 +24,17 @@ public class AnswerServiceImpl extends ServiceImpl impleme } @Override - public Answer selectByTestId(Long senderId,String sender,Long testid) { + public Answer selectByTestId(Long senderId,Long testid) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(Answer::getTestid,testid); - queryWrapper.eq(Answer::getSender,sender); queryWrapper.eq(Answer::getSenderId,senderId); queryWrapper.orderByDesc(Answer::getFinishtime).last("LIMIT 1"); return answerMapper.selectOne(queryWrapper); } @Override - public List selectBySender(String sender) { - return answerMapper.selectBySender(sender); + public List selectBySenderId(Long senderId) { + return answerMapper.selectBySender(senderId); } @Override diff --git a/ruoyi-test/src/main/java/com/ruoyi/test/seriver/Impl/ErrorbookServiceImpl.java b/ruoyi-test/src/main/java/com/ruoyi/test/seriver/Impl/ErrorbookServiceImpl.java index 90236ba..6334263 100644 --- a/ruoyi-test/src/main/java/com/ruoyi/test/seriver/Impl/ErrorbookServiceImpl.java +++ b/ruoyi-test/src/main/java/com/ruoyi/test/seriver/Impl/ErrorbookServiceImpl.java @@ -32,14 +32,14 @@ public class ErrorbookServiceImpl extends ServiceImpl selectErrorBook(int pagenum, String sender) { + public IPage selectErrorBook(int pagenum,Long senderId) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(Errorbook::getSender,sender); + queryWrapper.eq(Errorbook::getSenderId,senderId); List list = errorbookMapper.selectList(queryWrapper); List list1 = new ArrayList<>(); for(Errorbook errorbook : list){ ErrorbookVo errorbookVo = new ErrorbookVo(); - errorbookVo.setSender(sender); + errorbookVo.setSenderId(senderId); errorbookVo.setContent(errorbook.getContent()); errorbookVo.setDifficulty(errorbook.getDifficulty()); errorbookVo.setAnswer(errorbook.getAnswer()); @@ -63,15 +63,15 @@ public class ErrorbookServiceImpl extends ServiceImpl selectErrorBookBySubject(int pagenum, String sender, String subject) { + public IPage selectErrorBookBySubject(int pagenum, Long senderId, String subject) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(Errorbook::getSender,sender) + queryWrapper.eq(Errorbook::getSenderId,senderId) .eq(Errorbook::getSubject,subject); List list = errorbookMapper.selectList(queryWrapper); List list1 = new ArrayList<>(); for(Errorbook errorbook : list){ ErrorbookVo errorbookVo = new ErrorbookVo(); - errorbookVo.setSender(sender); + errorbookVo.setSenderId(senderId); errorbookVo.setContent(errorbook.getContent()); errorbookVo.setDifficulty(errorbook.getDifficulty()); errorbookVo.setAnswer(errorbook.getAnswer()); diff --git a/ruoyi-test/src/main/java/com/ruoyi/test/seriver/Impl/InstructorManageClassServiceImpl.java b/ruoyi-test/src/main/java/com/ruoyi/test/seriver/Impl/InstructorManageClassServiceImpl.java new file mode 100644 index 0000000..a202cc5 --- /dev/null +++ b/ruoyi-test/src/main/java/com/ruoyi/test/seriver/Impl/InstructorManageClassServiceImpl.java @@ -0,0 +1,24 @@ +package com.ruoyi.test.seriver.Impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.test.domain.InstructorManageClass; +import com.ruoyi.test.mapper.InstructorManageClassMapper; +import com.ruoyi.test.seriver.IInstructorManageClassService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class InstructorManageClassServiceImpl extends ServiceImpl implements IInstructorManageClassService { + + @Autowired + private InstructorManageClassMapper instructorManageClassMapper; + + @Override + public InstructorManageClass selectByGradeAndClass1(String grade, String Class1) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(InstructorManageClass::getGrade,grade) + .eq(InstructorManageClass::getClass1,Class1); + return instructorManageClassMapper.selectOne(queryWrapper); + } +} diff --git a/ruoyi-test/src/main/java/com/ruoyi/test/seriver/Impl/MarkedtestServiceImpl.java b/ruoyi-test/src/main/java/com/ruoyi/test/seriver/Impl/MarkedtestServiceImpl.java index a04822b..c4d7285 100644 --- a/ruoyi-test/src/main/java/com/ruoyi/test/seriver/Impl/MarkedtestServiceImpl.java +++ b/ruoyi-test/src/main/java/com/ruoyi/test/seriver/Impl/MarkedtestServiceImpl.java @@ -44,12 +44,10 @@ public class MarkedtestServiceImpl extends ServiceImpl selectmarkedtest(int pagenum, List list1) { List list = new ArrayList<>(); for(StudentClass studentClass : list1){ - String tname = iUserService.user(studentClass.getStudentid()).getTname(); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(Markedtest::getSender,tname); list.addAll(markedtestMapper.selectList(queryWrapper)); } Page page = new Page<>(pagenum,10); @@ -137,9 +132,7 @@ public class MarkedtestServiceImpl extends ServiceImpl list3 = new ArrayList<>(); for(StudentClass studentClass : list){ - String tname = iUserService.user(studentClass.getStudentid()).getTname(); LambdaQueryWrapper queryWrapper1 = new LambdaQueryWrapper<>(); - queryWrapper1.eq(Markedtest::getSender,tname); List list4 = markedtestMapper.selectList(queryWrapper1); for(Markedtest markedtest : list4){ if(list2.contains(markedtest.getTestid())){ @@ -154,23 +147,21 @@ public class MarkedtestServiceImpl extends ServiceImpl selectmarkedtestListBySenderAndSenderId(String sender, Long senderId) { + public List selectmarkedtestListSenderId(Long senderId) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(Markedtest::getSender,sender) - .eq(Markedtest::getSenderId,senderId); + queryWrapper.eq(Markedtest::getSenderId,senderId); return markedtestMapper.selectList(queryWrapper); } @Override - public Markedtest selectmarkedtestBySenderAndTestid(String sender,Long senderId) { + public Markedtest selectmarkedtestBySenderId(Long senderId) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(Markedtest::getSender,sender) - .eq(Markedtest::getSenderId,senderId); + queryWrapper.eq(Markedtest::getSenderId,senderId); return markedtestMapper.selectOne(queryWrapper); } @Override - public Markedtest selectmarkedtestBySenderAndTestid(Long senderId, Long testId) { + public Markedtest selectmarkedtestBySenderIdAndTestid(Long senderId, Long testId) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(Markedtest::getTestid,testId) .eq(Markedtest::getSenderId,senderId); diff --git a/ruoyi-test/src/main/java/com/ruoyi/test/seriver/Impl/QuestionanswerServiceImpl.java b/ruoyi-test/src/main/java/com/ruoyi/test/seriver/Impl/QuestionanswerServiceImpl.java index dd13d89..76f51f1 100644 --- a/ruoyi-test/src/main/java/com/ruoyi/test/seriver/Impl/QuestionanswerServiceImpl.java +++ b/ruoyi-test/src/main/java/com/ruoyi/test/seriver/Impl/QuestionanswerServiceImpl.java @@ -28,8 +28,8 @@ public class QuestionanswerServiceImpl extends ServiceImpl list, Answer answer) { QuestionAnswerDO questionAnswerDO = new QuestionAnswerDO(); // System.out.println(answer.getTestid()); - questionAnswerDO.setSender(answer.getSender()); questionAnswerDO.setTestid(answer.getTestid()); + questionAnswerDO.setSenderId(answer.getSenderId()); String idanswer = answer.getIdanswer(); Gson gson = new Gson(); Type listType = new TypeToken>(){}.getType(); @@ -81,7 +81,7 @@ public class QuestionanswerServiceImpl extends ServiceImpl list = questionAnswerDO.getList(); Gson gson = new Gson(); @@ -91,11 +91,9 @@ public class QuestionanswerServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(Questionanswer::getSenderId,senderId); - queryWrapper.eq(Questionanswer::getSender,sender); queryWrapper.eq(Questionanswer::getTestid,id); queryWrapper.orderByDesc(Questionanswer::getCreatetime).last("LIMIT 1"); Questionanswer questionanswer = questionanswerMapper.selectOne(queryWrapper); @@ -105,7 +103,6 @@ public class QuestionanswerServiceImpl extends ServiceImpl dataList = gson.fromJson(qa,List.class); QuestionAnswerDO questionAnswerDO = new QuestionAnswerDO(); - questionAnswerDO.setSender(questionanswer.getSender()); questionAnswerDO.setTestid(questionanswer.getTestid()); questionAnswerDO.setList(dataList); // System.out.println(questionAnswerDO); @@ -115,7 +112,6 @@ public class QuestionanswerServiceImpl extends ServiceImpl list = questionAnswerDO.getList(); Gson gson = new Gson(); diff --git a/ruoyi-test/src/main/java/com/ruoyi/test/seriver/Impl/TaskServiceImpl.java b/ruoyi-test/src/main/java/com/ruoyi/test/seriver/Impl/TaskServiceImpl.java index 0274bc5..6f4ef82 100644 --- a/ruoyi-test/src/main/java/com/ruoyi/test/seriver/Impl/TaskServiceImpl.java +++ b/ruoyi-test/src/main/java/com/ruoyi/test/seriver/Impl/TaskServiceImpl.java @@ -38,8 +38,8 @@ public class TaskServiceImpl extends ServiceImpl implements IT } @Override - public int addTask(TaskVo taskVo,String username) { - return taskMapper.addTask(taskVo,username); + public int addTask(TaskVo taskVo,String sender) { + return taskMapper.addTask(taskVo,sender); } @Override diff --git a/ruoyi-test/src/main/java/com/ruoyi/test/seriver/Impl/TeacherManageClassServiceImpl.java b/ruoyi-test/src/main/java/com/ruoyi/test/seriver/Impl/TeacherManageClassServiceImpl.java index 1f4476e..dcfcbb3 100644 --- a/ruoyi-test/src/main/java/com/ruoyi/test/seriver/Impl/TeacherManageClassServiceImpl.java +++ b/ruoyi-test/src/main/java/com/ruoyi/test/seriver/Impl/TeacherManageClassServiceImpl.java @@ -32,4 +32,12 @@ public class TeacherManageClassServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(TeacherManageClass::getGrade,grade) + .eq(TeacherManageClass::getClass1,Class1); + return teacherManageClassMapper.selectOne(queryWrapper); + } } diff --git a/ruoyi-test/src/main/java/com/ruoyi/test/seriver/Impl/UserServiceImpl.java b/ruoyi-test/src/main/java/com/ruoyi/test/seriver/Impl/UserServiceImpl.java deleted file mode 100644 index 0d47318..0000000 --- a/ruoyi-test/src/main/java/com/ruoyi/test/seriver/Impl/UserServiceImpl.java +++ /dev/null @@ -1,169 +0,0 @@ -package com.ruoyi.test.seriver.Impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.common.utils.bean.BeanUtils; -import com.ruoyi.test.domain.DO.UserDO; -import com.ruoyi.test.domain.StudentClass; -import com.ruoyi.test.domain.TeacherManageClass; -import com.ruoyi.test.domain.User; -import com.ruoyi.test.domain.Vo.UserVo; -import com.ruoyi.test.mapper.StudentClassMapper; -import com.ruoyi.test.mapper.TeacherManageClassMapper; -import com.ruoyi.test.mapper.UserMapper; -import com.ruoyi.test.seriver.IUserService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.List; - -@Resource -@Service -public class UserServiceImpl extends ServiceImpl implements IUserService { - - @Autowired - private UserMapper userMapper; - - @Autowired - private StudentClassMapper studentClassMapper; - - @Autowired - private TeacherManageClassMapper teacherManageClassMapper; - - @Override - public IPage selectStudentList(int pagenum) { - Page page = new Page<>(pagenum,10); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.select(User::getUserId,User::getName,User::getTname,User::getAge,User::getSex,User::getBirthday - ,User::getTelephone,User::getGrade,User::getState); - queryWrapper.eq(User::getRoleKey,2L); - IPage iPage = userMapper.selectPage(page,queryWrapper); - return iPage; - } - - @Override - public IPage selectStudent(int pagenum,String name) { - Page page = new Page<>(pagenum,10); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.select(User::getUserId,User::getName,User::getTname,User::getAge,User::getSex,User::getBirthday - ,User::getTelephone,User::getGrade,User::getState); - queryWrapper.eq(User::getName,name); - queryWrapper.eq(User::getRoleKey,2L); - IPage iPage = userMapper.selectPage(page,queryWrapper); - return iPage; - } - - @Override - public int insertUser(User user) { - return userMapper.insertUser(user); - } - - @Override - public List selectStudentByZhid(Long zhid) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(User::getZhId,zhid); - return userMapper.selectList(queryWrapper); - } - - @Override - public IPage selectTeacherList(int pagenum) { - Page page = new Page<>(pagenum,10); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.select(User::getUserId,User::getName,User::getTname,User::getAge,User::getSex,User::getBirthday - ,User::getTelephone,User::getGrade,User::getState); - queryWrapper.eq(User::getRoleKey,3L); - IPage iPage = userMapper.selectPage(page,queryWrapper); - return iPage; - } - - @Override - public IPage selectTeacher(int pagenum,String name) { - Page page = new Page<>(pagenum,10); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.select(User::getUserId,User::getName,User::getTname,User::getAge,User::getSex,User::getBirthday - ,User::getTelephone,User::getGrade,User::getState); - queryWrapper.eq(User::getName,name); - queryWrapper.eq(User::getRoleKey,3L); - IPage iPage = userMapper.selectPage(page,queryWrapper); - return iPage; - } - - @Override - public IPage selectGlList(int pagenum) { - Page page = new Page<>(pagenum,10); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.select(User::getUserId,User::getName,User::getTname,User::getAge,User::getSex,User::getBirthday - ,User::getTelephone,User::getGrade,User::getState); - queryWrapper.eq(User::getRoleKey,4L); - IPage iPage = userMapper.selectPage(page,queryWrapper); - return iPage; - } - - @Override - public IPage selectGl(int pagenum,String name) { - Page page = new Page<>(pagenum,10); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.select(User::getUserId,User::getName,User::getTname,User::getAge,User::getSex,User::getBirthday - ,User::getTelephone,User::getGrade,User::getState); - queryWrapper.eq(User::getName,name); - queryWrapper.eq(User::getRoleKey,4L); - IPage iPage = userMapper.selectPage(page,queryWrapper); - return iPage; - } - - @Override - public Long selectByzhid(Long zhid) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(User::getZhId,zhid); - return userMapper.selectOne(queryWrapper).getUserId(); - } - - @Override - public User user(Long id) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(User::getUserId,id); - return userMapper.selectOne(queryWrapper); - } - - @Override - public UserDO getUserById(Long id) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); - queryWrapper.eq(User::getUserId,id); - User user = userMapper.selectOne(queryWrapper); - UserDO userDO = new UserDO(); - BeanUtils.copyProperties(user,userDO); - StudentClass studentClass = studentClassMapper.selectOne(new LambdaQueryWrapper().eq(StudentClass::getStudentid, id)); - userDO.setClass1(studentClass.getClass1()); - TeacherManageClass teacherManageClass = teacherManageClassMapper.selectOne( - new LambdaQueryWrapper() - .eq(TeacherManageClass::getClass1, studentClass.getClass1()) - .eq(TeacherManageClass::getGrade, studentClass.getGrade())); - User user1 = userMapper.selectOne( - new LambdaQueryWrapper() - .eq(User::getUserId, teacherManageClass.getTeacherid())); - userDO.setTeacherName(user1.getTname()); - return userDO; - } - - public List up(List list){ - List list1 = new ArrayList<>(); - for(User user:list){ - UserVo userVo = new UserVo(); - userVo.setUserId(user.getUserId()); - userVo.setName(user.getName()); - userVo.setTname(user.getTname()); - userVo.setAge(user.getAge()); - userVo.setGrade(user.getGrade()); - userVo.setSex(user.getSex()); - userVo.setBirthday(user.getBirthday()); - userVo.setTelephone(user.getTelephone()); - list1.add(userVo); - } - return list1; - } -} diff --git a/ruoyi-test/src/main/resources/mapper/AnswerMapper.xml b/ruoyi-test/src/main/resources/mapper/AnswerMapper.xml index 3258eff..f30ae39 100644 --- a/ruoyi-test/src/main/resources/mapper/AnswerMapper.xml +++ b/ruoyi-test/src/main/resources/mapper/AnswerMapper.xml @@ -9,14 +9,12 @@ INSERT INTO answer ( sender_id, - sender, testid, idanswer, finishtime, time )VALUES( #{answer.senderId}, - #{answer.sender}, #{answer.testid}, #{answer.idanswer}, Now(), @@ -37,7 +35,7 @@ SELECT testid, MIN(ABS(TIMESTAMPDIFF(SECOND, STR_TO_DATE(finishtime, '%Y-%m-%d %H:%i:%s'), NOW()))) AS min_time_diff FROM answer - WHERE sender = #{sender} + WHERE senderId = #{senderId} GROUP BY testid ) b ON a.testid = b.testid AND ABS(TIMESTAMPDIFF(SECOND, STR_TO_DATE(a.finishtime, '%Y-%m-%d %H:%i:%s'), NOW())) = b.min_time_diff ) AS t; diff --git a/ruoyi-test/src/main/resources/mapper/InstructorManageClassMapper.xml b/ruoyi-test/src/main/resources/mapper/InstructorManageClassMapper.xml new file mode 100644 index 0000000..0bd1a5c --- /dev/null +++ b/ruoyi-test/src/main/resources/mapper/InstructorManageClassMapper.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/ruoyi-test/src/main/resources/mapper/QuestionanswerMapper.xml b/ruoyi-test/src/main/resources/mapper/QuestionanswerMapper.xml index 4dec7c3..25a70a0 100644 --- a/ruoyi-test/src/main/resources/mapper/QuestionanswerMapper.xml +++ b/ruoyi-test/src/main/resources/mapper/QuestionanswerMapper.xml @@ -7,12 +7,12 @@ insert into questionanswer( - sender, + sender_id, testid, qa, createtime )values ( - #{questionanswer.sender}, + #{questionanswer.senderId}, #{questionanswer.testid}, #{questionanswer.qa}, Now() diff --git a/ruoyi-test/src/main/resources/mapper/UserMapper.xml b/ruoyi-test/src/main/resources/mapper/UserMapper.xml deleted file mode 100644 index 230efdc..0000000 --- a/ruoyi-test/src/main/resources/mapper/UserMapper.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - insert into user( --- user_id, - name, - tname, - age, - sex, - birthday, - telephone, - grade, - state, - role_key, - zh_id, - createtime - ) values ( --- #{userId}, - #{name}, - #{tname}, - #{age}, - #{sex}, - #{birthday}, - #{telephone}, - #{grade}, - #{state}, - #{roleKey}, - #{zhId}, - NOW() -- 或者使用数据库的当前时间函数 - ) - - diff --git a/vue2/vue/src/components/Login.vue b/vue2/vue/src/components/Login.vue index fcce6e4..a72f909 100644 --- a/vue2/vue/src/components/Login.vue +++ b/vue2/vue/src/components/Login.vue @@ -1,17 +1,8 @@ + + diff --git a/vue2/vue/src/views/Teacher/HomePage.vue b/vue2/vue/src/views/Teacher/HomePage.vue new file mode 100644 index 0000000..6132980 --- /dev/null +++ b/vue2/vue/src/views/Teacher/HomePage.vue @@ -0,0 +1,190 @@ + + + + + diff --git a/vue2/vue/src/views/user/Profile.vue b/vue2/vue/src/views/user/Profile.vue index e26adf2..ab02cb1 100644 --- a/vue2/vue/src/views/user/Profile.vue +++ b/vue2/vue/src/views/user/Profile.vue @@ -1,16 +1,19 @@ -