...

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

@@ -180,7 +180,7 @@ public class ExamStudentApi extends ControllerSupport{
             if (StringUtils.isEmpty(examStudent.getPaperType())) {
                 examStudent.setPaperType("O");
             }
-            ExamStudent saveExamStu = examStudentService.saveExamStudent(examStudent);
+            ExamStudent saveExamStu = examStudentService.saveExamStudent(accessUser.getUserToken(),examStudent);
             return new ResponseEntity(saveExamStu, HttpStatus.OK);
         } catch (Exception e) {
             log.error("新增失败:",e);
@@ -191,13 +191,14 @@ public class ExamStudentApi extends ControllerSupport{
     @ApiOperation(value = "更新考试学生", notes = "更新")
     @PutMapping()
     public ResponseEntity updateExamStudent(@RequestBody ExamStudent examStudent) {
+        cn.com.qmth.examcloud.commons.web.security.bean.User accessUser = getAccessUser();
         try {
             Exam exam = examRepo.findOne(examStudent.getExam().getId());
             examStudent.setExam(exam);
             if (StringUtils.isEmpty(examStudent.getPaperType())) {
                 examStudent.setPaperType("O");
             }
-            ExamStudent saveExamStu = examStudentService.saveExamStudent(examStudent);
+            ExamStudent saveExamStu = examStudentService.saveExamStudent(accessUser.getUserToken(),examStudent);
             return new ResponseEntity(saveExamStu, HttpStatus.OK);
         } catch (Exception e) {
             log.error("更新失败:",e);
@@ -249,9 +250,10 @@ public class ExamStudentApi extends ControllerSupport{
     @ApiOperation(value = "导入考试学生", notes = "导入")
     @PostMapping("/import")
     public ResponseEntity importExamStudent(@RequestParam Long examId, @RequestParam CommonsMultipartFile file) {
-        try {
+        cn.com.qmth.examcloud.commons.web.security.bean.User accessUser = getAccessUser();
+    	try {
             File tempFile = ImportUtils.getUploadFile(file);
-            List<ExcelError> excelErrors = examStudentService.importExamStudent(examId, new FileInputStream(tempFile));
+            List<ExcelError> excelErrors = examStudentService.importExamStudent(accessUser.getUserToken(),examId, new FileInputStream(tempFile));
             return new ResponseEntity(excelErrors, HttpStatus.OK);
         } catch (Exception e) {
             log.error("导入失败:",e);

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

@@ -185,16 +185,16 @@ public class ExamStudentService {
      * @param examStudent
      * @return
      */
-    public ExamStudent saveExamStudent(ExamStudent examStudent)throws Exception{
+    public ExamStudent saveExamStudent(String token,ExamStudent examStudent)throws Exception{
     	checkExamStudent(examStudent);
-        return saveStudent(examStudent);
+        return saveStudent(token,examStudent);
     }
 
     /**
      * 导入考试学生
      * @return
      */
-	public List<ExcelError> importExamStudent(Long examId, InputStream inputStream) {
+	public List<ExcelError> importExamStudent(String token,Long examId, InputStream inputStream) {
 		log.info("导入考生开始");
 		Exam exam = examRepo.findOne(examId);
 		List<ExcelError> excelErrors = new ArrayList<ExcelError>();
@@ -211,13 +211,13 @@ public class ExamStudentService {
                 ExamStudentDTO dto = (ExamStudentDTO) obj;
                 dto.setRootOrgId(exam.getOrgId());
                 dto.setExam(exam);
-                ExcelError error = importCheck(dto);
+                ExcelError error = importCheck(token,dto);
                 if (error == null) {
                 	examStudents.add(examStudentAssembler.toDomain(dto));
                 }
                 int stu_num = examStudents.size();
                 if (stu_num % 5000 == 0) {
-                	saveStudentList(examStudents);
+                	saveStudentList(token,examStudents);
 					log.info("已导入"+stu_num+"条数据");
                 }
                 return error;
@@ -225,21 +225,21 @@ public class ExamStudentService {
 
         });
 		int stu_num = examStudents.size();
-        saveStudentList(examStudents);
+        saveStudentList(token,examStudents);
 		log.info("已导入"+stu_num+"条数据");
 		log.info("导入考生结束");
         return excelErrors;
 	}
 	
 
-	private void saveStudentList(List<ExamStudent> examStudents) {
+	private void saveStudentList(String token,List<ExamStudent> examStudents) {
 		for (ExamStudent examStudent : examStudents) {
-			saveStudent(examStudent);
+			saveStudent(token,examStudent);
 		}
 		examStudents.removeAll(examStudents);
 	}
 
-	private ExamStudent saveStudent(ExamStudent examStudent){
+	private ExamStudent saveStudent(String token,ExamStudent examStudent){
 		if(examStudent.getStudentId() == null){
 			Student student = new Student();
 			student.setIdentityNumber(examStudent.getIdentityNumber());
@@ -253,16 +253,16 @@ public class ExamStudentService {
 			user.setType(UserType.STUDENT);
 			user.setRootOrgId(examStudent.getRootOrgId());
 			student.setUser(user);
-			student = studentService.addStudent(student);
+			student = studentService.addStudent(token,student);
 			examStudent.setStudentId(student.getId());
 		}else{
-			Student student = studentService.getStudent(examStudent.getStudentId());
+			Student student = studentService.getStudent(token,examStudent.getStudentId());
 			student.setOrgId(examStudent.getOrgId());
 			student.setName(examStudent.getName());
 			student.setRootOrgId(examStudent.getRootOrgId());
 			student.setStudentCode(examStudent.getStudentCode());
 			student.setIdentityNumber(examStudent.getIdentityNumber());
-			studentService.updateStudent(student);
+			studentService.updateStudent(token,student);
 		}
 		examStudent.setFinished(false);
 		examStudent.setGraduated(false);
@@ -295,7 +295,7 @@ public class ExamStudentService {
 	 * @param dto
 	 * @return
 	 */
-	public ExcelError importCheck(ExamStudentDTO dto){
+	public ExcelError importCheck(String token,ExamStudentDTO dto){
 		if(StringUtils.isEmpty(dto.getName())){
 			return new ExcelError("姓名不能为空");
 		}
@@ -325,13 +325,13 @@ public class ExamStudentService {
 //		}
 //		dto.setSpecialtyName(specialty.getName());
 
-		Course course = courseService.findByOrgIdAndCode(dto.getRootOrgId(), dto.getCourseCode());
+		Course course = courseService.findByOrgIdAndCode(token,dto.getRootOrgId(), dto.getCourseCode());
 		if(course == null || !course.getEnable()){
 			return new ExcelError("课程不存在/被禁用");
 		}
 		dto.setCourseLevel(course.getLevel().toString());
 		dto.setCourseName(course.getName());
-		Org org = orgService.findByParentIdAndCode(dto.getRootOrgId(), dto.getOrgCode());
+		Org org = orgService.findByParentIdAndCode(token,dto.getRootOrgId(), dto.getOrgCode());
 		if(org == null || !org.getEnable()){
 			return new ExcelError("学习中心不存在/禁用");
 		}

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

@@ -19,14 +19,14 @@ public class CourseService {
 	@Autowired
 	CourseClient courseClient;
 
-	public Course findByOrgIdAndCode(Long orgId,String code) {
-		String json = courseClient.findByOrgIdAndCode(orgId,code);
+	public Course findByOrgIdAndCode(String token,Long orgId,String code) {
+		String json = courseClient.findByOrgIdAndCode(token,orgId,code);
 		Course domain = GsonUtil.getInstanceByJson(json, Course.class);
 		return domain;
 	}
 
-	public List<Course> findByOrgId(Long orgId) {
-		String json = courseClient.findByOrgId(orgId);
+	public List<Course> findByOrgId(String token,Long orgId) {
+		String json = courseClient.findByOrgId(token,orgId);
 		List<Course> courseList = GsonUtil.jsonToArrayList(json, Course.class);
 		return courseList;
 	}

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

@@ -13,11 +13,11 @@ public class OeService {
     @Autowired
     OeClient oeClient;
 
-    public int checkExamRecord(Long examId,String identityNumber){
-        return oeClient.checkExamRecord(examId,identityNumber);
+    public int checkExamRecord(String token,Long examId,String identityNumber){
+        return oeClient.checkExamRecord(token,examId,identityNumber);
     }
 
-    public int checkExamRecord(Long examId){
-        return oeClient.checkExamRecord(examId);
+    public int checkExamRecord(String token,Long examId){
+        return oeClient.checkExamRecord(token,examId);
     }
 }

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

@@ -20,8 +20,8 @@ public class OrgService {
 	@Autowired
 	OrgClient orgClient;
 
-	public Org findByParentIdAndCode(Long orgId,String code) {
-		String json = orgClient.findByParentIdAndCode(orgId, code);
+	public Org findByParentIdAndCode(String token,Long orgId,String code) {
+		String json = orgClient.findByParentIdAndCode(token,orgId, code);
 		Org domain = GsonUtil.getInstanceByJson(json, Org.class);
 		return domain;
 	}

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

@@ -20,8 +20,8 @@ public class SpecialtyService {
 	@Autowired
 	SpecialtyClient specialtyClient;
 
-	public Specialty findByOrgIdAndCode(Long orgId, String code) {
-		String json = specialtyClient.findByOrgIdAndCode(orgId,code);
+	public Specialty findByOrgIdAndCode(String token,Long orgId, String code) {
+		String json = specialtyClient.findByOrgIdAndCode(token,orgId,code);
 		Specialty domain = GsonUtil.getInstanceByJson(json, Specialty.class);
 		return domain;
 	}

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

@@ -18,32 +18,32 @@ public class StudentService {
 	@Autowired
 	StudentClient studentClient;
 
-	public Student updatePhoto(String identityNumber) {
-		String json = studentClient.updatePhoto(identityNumber);
+	public Student updatePhoto(String token,String identityNumber) {
+		String json = studentClient.updatePhoto(token,identityNumber);
 		Student domain = GsonUtil.getInstanceByJson(json, Student.class);
 		return domain;
 	}
 	
-	public Student addStudent(Student student) {
-		String json = studentClient.addStudent(student);
+	public Student addStudent(String token,Student student) {
+		String json = studentClient.addStudent(token,student);
 		Student domain = GsonUtil.getInstanceByJson(json, Student.class);
 		return domain;
 	}
 
-	public Student updateStudent(Student student) {
-		String json = studentClient.updateStudent(student);
+	public Student updateStudent(String token,Student student) {
+		String json = studentClient.updateStudent(token,student);
 		Student domain = GsonUtil.getInstanceByJson(json, Student.class);
 		return domain;
 	}
 
-	public Student getStudent(Long id) {
-		String json = studentClient.getStudent(id);
+	public Student getStudent(String token,Long id) {
+		String json = studentClient.getStudent(token,id);
 		Student domain = GsonUtil.getInstanceByJson(json, Student.class);
 		return domain;
 	}
 
-	public void deleteStudent(Long id) {
-		studentClient.deleteStudent(id);
+	public void deleteStudent(String token,Long id) {
+		studentClient.deleteStudent(token,id);
 	}
 
 }

examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/service/examwork/service/rpc/client/CourseClient.java

@@ -2,6 +2,7 @@ package cn.com.qmth.examcloud.service.examwork.service.rpc.client;
 
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -15,10 +16,10 @@ import org.springframework.web.bind.annotation.RequestParam;
 public interface CourseClient {
 
 	@RequestMapping(method = RequestMethod.GET, value = "${app.api.core}/course")
-	String findByOrgIdAndCode(@RequestParam("orgId") Long orgId,@RequestParam("code") String code);
+	String findByOrgIdAndCode(@RequestHeader("user_token") String token,@RequestParam("orgId") Long orgId,@RequestParam("code") String code);
 
 
 	@RequestMapping(method = RequestMethod.GET, value = "${app.api.core}/course/org/{orgId}")
-	String findByOrgId(@PathVariable("orgId") Long orgId);
+	String findByOrgId(@RequestHeader("user_token") String token,@PathVariable("orgId") Long orgId);
 
 }

examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/service/examwork/service/rpc/client/OeClient.java

@@ -1,6 +1,7 @@
 package cn.com.qmth.examcloud.service.examwork.service.rpc.client;
 
 import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -12,8 +13,8 @@ import org.springframework.web.bind.annotation.RequestParam;
 public interface OeClient {
 
     @RequestMapping(method = RequestMethod.GET, value = "/api/exam_record/count")
-    int checkExamRecord(@RequestParam("examId") Long examId, @RequestParam(value = "identityNumber", required = false) String identityNumber);
+    int checkExamRecord(@RequestHeader("user_token") String token,@RequestParam("examId") Long examId, @RequestParam(value = "identityNumber", required = false) String identityNumber);
 
     @RequestMapping(method = RequestMethod.GET, value = "/api/exam_record/count")
-    int checkExamRecord(@RequestParam("examId") Long examId);
+    int checkExamRecord(@RequestHeader("user_token") String token,@RequestParam("examId") Long examId);
 }

examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/service/examwork/service/rpc/client/OrgClient.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.*;
 public interface OrgClient {
 
 	@RequestMapping(method = RequestMethod.GET, value = "${app.api.core}/org")
-	String findByParentIdAndCode(@RequestParam("parentId") Long parentId,@RequestParam("code") String code);
+	String findByParentIdAndCode(@RequestHeader("user_token") String token,@RequestParam("parentId") Long parentId,@RequestParam("code") String code);
 
 	@RequestMapping(method = RequestMethod.GET, value = "${app.api.core}/org/sub/{parentId}")
 	String findByParentId(@RequestHeader("user_token") String token,

examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/service/examwork/service/rpc/client/SpecialtyClient.java

@@ -2,6 +2,7 @@ package cn.com.qmth.examcloud.service.examwork.service.rpc.client;
 
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -14,6 +15,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 public interface SpecialtyClient {
 
 	@RequestMapping(method = RequestMethod.GET, value = "${app.api.core}/specialty")
-	String findByOrgIdAndCode(@RequestParam("orgId") Long orgId, @RequestParam("code") String code);
+	String findByOrgIdAndCode(@RequestHeader("user_token") String token,@RequestParam("orgId") Long orgId, @RequestParam("code") String code);
 
 }

examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/service/examwork/service/rpc/client/StudentClient.java

@@ -14,18 +14,18 @@ import cn.com.qmth.examcloud.common.dto.core.Student;
 public interface StudentClient {
 
 	@RequestMapping(method = RequestMethod.GET, value = "${app.api.core}/student")
-	String updatePhoto(@RequestParam("identityNumber") String identityNumber);
+	String updatePhoto(@RequestHeader("user_token") String token,@RequestParam("identityNumber") String identityNumber);
 
 	@RequestMapping(method = RequestMethod.POST, value = "${app.api.core}/student")
-	String addStudent(@RequestBody Student student);
+	String addStudent(@RequestHeader("user_token") String token,@RequestBody Student student);
 
 	@RequestMapping(method = RequestMethod.GET, value = "${app.api.core}/student/{id}")
-	String getStudent(@PathVariable("id") Long id);
+	String getStudent(@RequestHeader("user_token") String token,@PathVariable("id") Long id);
 
 	@RequestMapping(method = RequestMethod.PUT, value = "${app.api.core}/student")
-	String updateStudent(@RequestBody Student student);
+	String updateStudent(@RequestHeader("user_token") String token,@RequestBody Student student);
 
 	@RequestMapping(method = RequestMethod.DELETE, value = "${app.api.core}/student/{id}")
-	void deleteStudent(@PathVariable("id") Long id);
+	void deleteStudent(@RequestHeader("user_token") String token,@PathVariable("id") Long id);
 
 }