wangwei 7 years ago
parent
commit
5f7bff8462

+ 8 - 5
examcloud-core-examwork-api-client/src/main/java/cn/com/qmth/examcloud/examwork/api/client/ExamStudentCloudServiceClient.java

@@ -5,20 +5,23 @@ import org.springframework.web.client.RestTemplate;
 
 import cn.com.qmth.examcloud.examwork.api.ExamStudentCloudService;
 import cn.com.qmth.examcloud.examwork.api.request.SaveExamStudentReq;
+import cn.com.qmth.examcloud.examwork.api.response.SaveExamStudentResp;
 
-public class ExamStudentCloudServiceClient extends BasicCloudClientSupport implements ExamStudentCloudService{
+public class ExamStudentCloudServiceClient extends BasicCloudClientSupport
+		implements
+			ExamStudentCloudService {
 
 	@Autowired
 	private RestTemplate restTemplate;
-	
+
 	@Override
-	public void saveExamStudent(SaveExamStudentReq examStudentReq) {
-		post("examStudent", examStudentReq, SaveExamStudentReq.class);
+	public SaveExamStudentResp saveExamStudent(SaveExamStudentReq examStudentReq) {
+		return post("examStudent/saveExamStudent", examStudentReq, SaveExamStudentResp.class);
 	}
 
 	@Override
 	protected RestTemplate getRestTemplate() {
 		return restTemplate;
 	}
-	
+
 }

+ 22 - 2
examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/provider/ExamStudentCloudServiceProvider.java

@@ -31,7 +31,9 @@ import cn.com.qmth.examcloud.core.examwork.dao.entity.Exam;
 import cn.com.qmth.examcloud.core.examwork.dao.entity.ExamStudent;
 import cn.com.qmth.examcloud.core.examwork.service.impl.ExamStudentService;
 import cn.com.qmth.examcloud.examwork.api.ExamStudentCloudService;
+import cn.com.qmth.examcloud.examwork.api.bean.ExamStudentBean;
 import cn.com.qmth.examcloud.examwork.api.request.SaveExamStudentReq;
+import cn.com.qmth.examcloud.examwork.api.response.SaveExamStudentResp;
 import io.swagger.annotations.ApiOperation;
 
 /**
@@ -69,7 +71,7 @@ public class ExamStudentCloudServiceProvider extends ControllerSupport
 	@ApiOperation(value = "保存考生")
 	@PostMapping("saveExamStudent")
 	@Override
-	public void saveExamStudent(SaveExamStudentReq req) {
+	public SaveExamStudentResp saveExamStudent(SaveExamStudentReq req) {
 
 		Long rootOrgId = req.getRootOrgId();
 		GetOrgReq getOrgReq = new GetOrgReq();
@@ -144,10 +146,28 @@ public class ExamStudentCloudServiceProvider extends ControllerSupport
 		examStudent.setCourseName(courseName);
 		examStudent.setCourseLevel(courseBean.getLevel());
 		examStudent.setExam(exam);
+		examStudent.setIdentityNumber(studentInfo.getIdentityNumber());
+		examStudent.setStudentCode(studentInfo.getStudentCode());
 		examStudent.setPaperType(req.getPaperType());
+		ExamStudent saved = examStudentRepo.save(examStudent);
 
-		examStudentRepo.save(examStudent);
+		SaveExamStudentResp resp = new SaveExamStudentResp();
 
+		ExamStudentBean examStudentBean = new ExamStudentBean();
+		examStudentBean.setCourseCode(saved.getCourseCode());
+		examStudentBean.setCourseLevel(saved.getCourseLevel());
+		examStudentBean.setCourseName(saved.getCourseName());
+		examStudentBean.setExamId(saved.getExam().getId());
+		examStudentBean.setExamName(saved.getExam().getName());
+		examStudentBean.setIdentityNumber(saved.getIdentityNumber());
+		examStudentBean.setStudentCode(saved.getStudentCode());
+		examStudentBean.setPaperType(saved.getPaperType());
+		examStudentBean.setRootOrgId(saved.getRootOrgId());
+		examStudentBean.setStudentName(studentInfo.getName());
+
+		resp.setExamStudentBean(examStudentBean);
+
+		return resp;
 	}
 
 }

+ 3 - 2
examcloud-core-examwork-api/src/main/java/cn/com/qmth/examcloud/examwork/api/ExamStudentCloudService.java

@@ -1,6 +1,7 @@
 package cn.com.qmth.examcloud.examwork.api;
 
 import cn.com.qmth.examcloud.examwork.api.request.SaveExamStudentReq;
+import cn.com.qmth.examcloud.examwork.api.response.SaveExamStudentResp;
 
 /**
  * 考生信息服务
@@ -13,10 +14,10 @@ import cn.com.qmth.examcloud.examwork.api.request.SaveExamStudentReq;
 public interface ExamStudentCloudService {
 
 	/**
-	 * 保存考生信息、机构、课程
+	 * 保存考生信息
 	 * 
 	 * @param examStudentReq
 	 */
-	public void saveExamStudent(SaveExamStudentReq req);
+	SaveExamStudentResp saveExamStudent(SaveExamStudentReq req);
 
 }

+ 138 - 0
examcloud-core-examwork-api/src/main/java/cn/com/qmth/examcloud/examwork/api/bean/ExamStudentBean.java

@@ -0,0 +1,138 @@
+package cn.com.qmth.examcloud.examwork.api.bean;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
+
+public class ExamStudentBean implements JsonSerializable {
+	private static final long serialVersionUID = 2079003980099252759L;
+
+	/**
+	 * 顶级机构ID
+	 */
+	private Long rootOrgId;
+
+	/**
+	 * 考试ID
+	 */
+	private Long examId;
+
+	/**
+	 * 考试名称
+	 */
+	private String examName;
+
+	/**
+	 * 学生姓名
+	 */
+	private String studentName;
+
+	/**
+	 * 学生学号
+	 */
+	private String studentCode;
+
+	/**
+	 * 学生身份证号
+	 */
+	private String identityNumber;
+
+	/**
+	 * 考试课程名称
+	 */
+	private String courseName;
+
+	/**
+	 * 考试课程code
+	 */
+	private String courseCode;
+
+	/**
+	 * 考试课程level
+	 */
+	private String courseLevel;
+
+	/**
+	 * 试卷类型
+	 */
+	private String paperType;
+
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+
+	public Long getExamId() {
+		return examId;
+	}
+
+	public void setExamId(Long examId) {
+		this.examId = examId;
+	}
+
+	public String getExamName() {
+		return examName;
+	}
+
+	public void setExamName(String examName) {
+		this.examName = examName;
+	}
+
+	public String getStudentName() {
+		return studentName;
+	}
+
+	public void setStudentName(String studentName) {
+		this.studentName = studentName;
+	}
+
+	public String getStudentCode() {
+		return studentCode;
+	}
+
+	public void setStudentCode(String studentCode) {
+		this.studentCode = studentCode;
+	}
+
+	public String getIdentityNumber() {
+		return identityNumber;
+	}
+
+	public void setIdentityNumber(String identityNumber) {
+		this.identityNumber = identityNumber;
+	}
+
+	public String getCourseName() {
+		return courseName;
+	}
+
+	public void setCourseName(String courseName) {
+		this.courseName = courseName;
+	}
+
+	public String getCourseCode() {
+		return courseCode;
+	}
+
+	public void setCourseCode(String courseCode) {
+		this.courseCode = courseCode;
+	}
+
+	public String getCourseLevel() {
+		return courseLevel;
+	}
+
+	public void setCourseLevel(String courseLevel) {
+		this.courseLevel = courseLevel;
+	}
+
+	public String getPaperType() {
+		return paperType;
+	}
+
+	public void setPaperType(String paperType) {
+		this.paperType = paperType;
+	}
+
+}

+ 6 - 125
examcloud-core-examwork-api/src/main/java/cn/com/qmth/examcloud/examwork/api/response/SaveExamStudentResp.java

@@ -1,139 +1,20 @@
 package cn.com.qmth.examcloud.examwork.api.response;
 
 import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
+import cn.com.qmth.examcloud.examwork.api.bean.ExamStudentBean;
 
 public class SaveExamStudentResp extends BaseResponse {
 
 	private static final long serialVersionUID = 5003024673163742249L;
 
-	/**
-	 * 顶级机构ID
-	 */
-	private Long rootOrgId;
+	private ExamStudentBean examStudentBean;
 
-	/**
-	 * 考试ID
-	 */
-	private Long examId;
-
-	/**
-	 * 考试名称
-	 */
-	private String examName;
-
-	/**
-	 * 学生姓名
-	 */
-	private String studentName;
-
-	/**
-	 * 学生学号
-	 */
-	private String studentCode;
-
-	/**
-	 * 学生身份证号
-	 */
-	private String identityNumber;
-
-	/**
-	 * 考试课程名称
-	 */
-	private String courseName;
-
-	/**
-	 * 考试课程code
-	 */
-	private String courseCode;
-
-	/**
-	 * 考试课程level
-	 */
-	private String courseLevel;
-
-	/**
-	 * 试卷类型
-	 */
-	private String paperType;
-
-	public Long getRootOrgId() {
-		return rootOrgId;
-	}
-
-	public void setRootOrgId(Long rootOrgId) {
-		this.rootOrgId = rootOrgId;
-	}
-
-	public Long getExamId() {
-		return examId;
-	}
-
-	public void setExamId(Long examId) {
-		this.examId = examId;
-	}
-
-	public String getExamName() {
-		return examName;
-	}
-
-	public void setExamName(String examName) {
-		this.examName = examName;
-	}
-
-	public String getStudentName() {
-		return studentName;
-	}
-
-	public void setStudentName(String studentName) {
-		this.studentName = studentName;
-	}
-
-	public String getStudentCode() {
-		return studentCode;
-	}
-
-	public void setStudentCode(String studentCode) {
-		this.studentCode = studentCode;
-	}
-
-	public String getIdentityNumber() {
-		return identityNumber;
-	}
-
-	public void setIdentityNumber(String identityNumber) {
-		this.identityNumber = identityNumber;
-	}
-
-	public String getCourseName() {
-		return courseName;
-	}
-
-	public void setCourseName(String courseName) {
-		this.courseName = courseName;
-	}
-
-	public String getCourseCode() {
-		return courseCode;
-	}
-
-	public void setCourseCode(String courseCode) {
-		this.courseCode = courseCode;
-	}
-
-	public String getCourseLevel() {
-		return courseLevel;
-	}
-
-	public void setCourseLevel(String courseLevel) {
-		this.courseLevel = courseLevel;
-	}
-
-	public String getPaperType() {
-		return paperType;
+	public ExamStudentBean getExamStudentBean() {
+		return examStudentBean;
 	}
 
-	public void setPaperType(String paperType) {
-		this.paperType = paperType;
+	public void setExamStudentBean(ExamStudentBean examStudentBean) {
+		this.examStudentBean = examStudentBean;
 	}
 
 }