修改获取用户方案

examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/service/examwork/api/ExamApi.java

@@ -80,7 +80,7 @@ public class ExamApi extends ControllerSupport {
 	@GetMapping("/exam/all/{curPage}/{pageSize}")
 	public ResponseEntity getAllExam(HttpServletRequest request, @ModelAttribute Exam examCriteria,
 			@PathVariable Integer curPage, @PathVariable Integer pageSize) {
-		AccessUser accessUser = (AccessUser) request.getAttribute("accessUser");
+		cn.com.qmth.examcloud.commons.web.security.bean.User accessUser = getAccessUser();
 		if (accessUser != null) {
 			examCriteria.setOrgId(accessUser.getRootOrgId());
 		} else {
@@ -96,7 +96,7 @@ public class ExamApi extends ControllerSupport {
 	@GetMapping("/exam/all")
 	public ResponseEntity getEnableExam(HttpServletRequest request,
 			@ModelAttribute Exam examCriteria) {
-		AccessUser accessUser = (AccessUser) request.getAttribute("accessUser");
+		cn.com.qmth.examcloud.commons.web.security.bean.User accessUser = getAccessUser();
 		if (accessUser != null) {
 			examCriteria.setOrgId(accessUser.getRootOrgId());
 		}
@@ -124,7 +124,7 @@ public class ExamApi extends ControllerSupport {
 	@GetMapping("/exam/all/both")
 	public ResponseEntity getAllExam(HttpServletRequest request,
 			@ModelAttribute Exam examCriteria) {
-		AccessUser accessUser = (AccessUser) request.getAttribute("accessUser");
+		cn.com.qmth.examcloud.commons.web.security.bean.User accessUser = getAccessUser();
 		if (accessUser != null) {
 			examCriteria.setOrgId(accessUser.getRootOrgId());
 		}
@@ -135,7 +135,7 @@ public class ExamApi extends ControllerSupport {
 	@GetMapping("/exam/name")
 	public ResponseEntity getEnableExamByName(HttpServletRequest request,
 			@ModelAttribute Exam examCriteria) {
-		AccessUser accessUser = (AccessUser) request.getAttribute("accessUser");
+		cn.com.qmth.examcloud.commons.web.security.bean.User accessUser = getAccessUser();
 		if (accessUser != null) {
 			examCriteria.setRootOrgId(accessUser.getRootOrgId());
 		}
@@ -164,7 +164,7 @@ public class ExamApi extends ControllerSupport {
 			throw new StatusException("EXAMWORK-001002", "作弊说明内容过大");
 		}
 
-		AccessUser accessUser = (AccessUser) request.getAttribute("accessUser");
+		cn.com.qmth.examcloud.commons.web.security.bean.User accessUser = getAccessUser();
 		if (accessUser != null) {
 			exam.setOrgId(accessUser.getOrgId());
 			exam.setRootOrgId(accessUser.getRootOrgId());

examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/service/examwork/api/ExamStudentApi.java

@@ -41,6 +41,7 @@ import cn.com.qmth.examcloud.common.dto.examwork.CommonExamStudent;
 import cn.com.qmth.examcloud.commons.base.util.ErrorMsg;
 import cn.com.qmth.examcloud.commons.base.util.excel.ExcelError;
 import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
+import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.service.examwork.assembler.ExamStudentAssembler;
 import cn.com.qmth.examcloud.service.examwork.dao.ExamRepo;
 import cn.com.qmth.examcloud.service.examwork.dao.ExamStudentRepo;
@@ -59,7 +60,7 @@ import io.swagger.annotations.ApiOperation;
  */
 @RestController
 @RequestMapping("${app.api.root}/exam_student")
-public class ExamStudentApi {
+public class ExamStudentApi extends ControllerSupport{
 
     private static final Logger log = LoggerFactory.getLogger(ExamStudentApi.class);
 
@@ -97,7 +98,7 @@ public class ExamStudentApi {
                                             @ModelAttribute ExamStudentDTO examStudent,
                                             @PathVariable Integer curPage,
                                             @PathVariable Integer pageSize) {
-        AccessUser accessUser = (AccessUser) request.getAttribute("accessUser");
+        cn.com.qmth.examcloud.commons.web.security.bean.User accessUser = getAccessUser();
         if (accessUser != null) {
             if (accessUser.getRootOrgId().longValue() == accessUser.getOrgId().longValue()
                     || examStudent.getStudentId() != null) {
@@ -138,7 +139,7 @@ public class ExamStudentApi {
     @GetMapping("/all")
     public ResponseEntity getAllExamStudent(HttpServletRequest request,
                                             @ModelAttribute ExamStudentDTO examStudent) {
-        AccessUser accessUser = (AccessUser) request.getAttribute("accessUser");
+        cn.com.qmth.examcloud.commons.web.security.bean.User accessUser = getAccessUser();
         if (accessUser != null) {
             if (accessUser.getRootOrgId().longValue() == accessUser.getOrgId().longValue()
                     || examStudent.getStudentId() != null) {
@@ -170,7 +171,7 @@ public class ExamStudentApi {
     public ResponseEntity addExamStudent(HttpServletRequest request,
                                          @RequestBody ExamStudent examStudent) {
         try {
-            AccessUser accessUser = (AccessUser) request.getAttribute("accessUser");
+            cn.com.qmth.examcloud.commons.web.security.bean.User accessUser = getAccessUser();
             if (accessUser != null) {
                 examStudent.setRootOrgId(accessUser.getRootOrgId());
             }

examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/service/examwork/service/ExamService.java

@@ -98,7 +98,7 @@ public class ExamService {
     }
 
     @Transactional
-    public Exam insertExam(Exam exam, AccessUser accessUser){
+    public Exam insertExam(Exam exam, cn.com.qmth.examcloud.commons.web.security.bean.User accessUser){
         ExamType examType = exam.getExamType();
         if(examType == ExamType.OFFLINE){
             Exam newExam = examRepo.save(exam);
@@ -113,10 +113,10 @@ public class ExamService {
      * @param exam
      * @param accessUser
      */
-    private void insertExamOrgTime(Exam exam,AccessUser accessUser){
+    private void insertExamOrgTime(Exam exam,cn.com.qmth.examcloud.commons.web.security.bean.User accessUser){
         Long examId = exam.getId();
         Long rootOrgId = accessUser.getRootOrgId();
-        String token = accessUser.getToken();
+        String token = accessUser.getUserToken();
         Date beginTime = exam.getBeginTime();
         Date endTime = exam.getEndTime();
         List<Org> orgList = orgService.findByParentId(token,rootOrgId);