重新规划考试编码

examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/ExamOuterServiceProvider.java

@@ -105,6 +105,10 @@ public class ExamOuterServiceProvider extends ControllerSupport implements ExamO
 		Long id = req.getId();
 		String name = req.getName();
 		String code = req.getCode();
+		// name有值时,当code使用
+		if (StringUtils.isNotBlank(name)) {
+			code = name;
+		}
 		Long rootOrgId = req.getRootOrgId();
 
 		GetExamReq getExamReq = new GetExamReq();
@@ -123,7 +127,8 @@ public class ExamOuterServiceProvider extends ControllerSupport implements ExamO
 		resp.setExamTimes(e.getExamTimes());
 		resp.setExamType(e.getExamType());
 		resp.setId(e.getId());
-		resp.setName(e.getName());
+		// code当name
+		resp.setName(e.getCode());
 		resp.setRemark(e.getRemark());
 		resp.setRootOrgId(e.getRootOrgId());
 

examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/ExamStudentOuterServiceProvider.java

@@ -2,6 +2,7 @@ package cn.com.qmth.examcloud.exchange.outer.api.provider;
 
 import java.util.List;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -11,12 +12,16 @@ import org.springframework.web.bind.annotation.RestController;
 import com.google.common.collect.Lists;
 
 import cn.com.qmth.examcloud.commons.exception.StatusException;
+import cn.com.qmth.examcloud.examwork.api.ExamCloudService;
 import cn.com.qmth.examcloud.examwork.api.ExamStudentCloudService;
+import cn.com.qmth.examcloud.examwork.api.bean.ExamBean;
 import cn.com.qmth.examcloud.examwork.api.bean.ExamStudentBean;
 import cn.com.qmth.examcloud.examwork.api.bean.ExamStudentBean4Reset;
+import cn.com.qmth.examcloud.examwork.api.request.GetExamReq;
 import cn.com.qmth.examcloud.examwork.api.request.ResetExamStudentReq;
 import cn.com.qmth.examcloud.examwork.api.request.SaveExamStudentReq;
 import cn.com.qmth.examcloud.examwork.api.request.UpdateExamStudentStatusReq;
+import cn.com.qmth.examcloud.examwork.api.response.GetExamResp;
 import cn.com.qmth.examcloud.examwork.api.response.ResetExamStudentResp;
 import cn.com.qmth.examcloud.examwork.api.response.SaveExamStudentResp;
 import cn.com.qmth.examcloud.exchange.outer.api.ExamStudentOuterService;
@@ -60,6 +65,9 @@ public class ExamStudentOuterServiceProvider extends ControllerSupport
 	@Autowired
 	ExamStudentCloudService examStudentCloudService;
 
+	@Autowired
+	ExamCloudService examCloudService;
+
 	@ApiOperation(value = "保存考生信息", httpMethod = "POST")
 	@ApiResponses({
 			@ApiResponse(code = 200, message = "成功", response = OuterSaveExamStudentResp.class),
@@ -73,13 +81,25 @@ public class ExamStudentOuterServiceProvider extends ControllerSupport
 			throw new StatusException("1000001", "rootOrgId is wrong");
 		}
 
+		String examCode = req.getExamCode();
+		String examName = req.getExamName();
+		if (StringUtils.isNotBlank(examName)) {
+			examCode = examName;
+		}
+
+		GetExamReq getExamReq = new GetExamReq();
+		getExamReq.setCode(examCode);
+		getExamReq.setRootOrgId(req.getRootOrgId());
+		GetExamResp r = examCloudService.getExam(getExamReq);
+		ExamBean examBean = r.getExamBean();
+
 		SaveExamStudentReq request = new SaveExamStudentReq();
 
 		request.setCourseCode(req.getCourseCode());
 		request.setCourseLevel(req.getCourseLevel());
 		request.setCourseName(req.getCourseName());
 		request.setExamId(req.getExamId());
-		request.setExamName(req.getExamName());
+		request.setExamName(examBean.getName());
 		request.setIdentityNumber(req.getIdentityNumber());
 		request.setPaperType(req.getPaperType());
 		request.setRootOrgId(req.getRootOrgId());
@@ -127,10 +147,23 @@ public class ExamStudentOuterServiceProvider extends ControllerSupport
 	@Override
 	public OuterBatchSaveExamStudentResp batchSaveExamStudent(
 			@RequestBody @ApiParam(required = true) OuterBatchSaveExamStudentReq req) {
+
 		if (!getEnterpriseRootOrgId().equals(req.getRootOrgId())) {
 			throw new StatusException("1000001", "rootOrgId is wrong");
 		}
 
+		String examCode = req.getExamCode();
+		String examName = req.getExamName();
+		if (StringUtils.isNotBlank(examName)) {
+			examCode = examName;
+		}
+
+		GetExamReq getExamReq = new GetExamReq();
+		getExamReq.setCode(examCode);
+		getExamReq.setRootOrgId(req.getRootOrgId());
+		GetExamResp r = examCloudService.getExam(getExamReq);
+		ExamBean examBean = r.getExamBean();
+
 		List<ExamStudent4BatchBean> examStudentList = req.getExamStudentList();
 
 		List<ExamStudentStatus4BatchBean> successList = Lists.newArrayList();
@@ -143,7 +176,7 @@ public class ExamStudentOuterServiceProvider extends ControllerSupport
 			request.setCourseLevel(cur.getCourseLevel());
 			request.setCourseName(cur.getCourseName());
 			request.setExamId(req.getExamId());
-			request.setExamName(req.getExamName());
+			request.setExamName(examBean.getName());
 			request.setIdentityNumber(cur.getIdentityNumber());
 			request.setPaperType(cur.getPaperType());
 			request.setRootOrgId(req.getRootOrgId());
@@ -211,11 +244,23 @@ public class ExamStudentOuterServiceProvider extends ControllerSupport
 			throw new StatusException("1000001", "rootOrgId is wrong");
 		}
 
+		String examCode = req.getExamCode();
+		String examName = req.getExamName();
+		if (StringUtils.isNotBlank(examName)) {
+			examCode = examName;
+		}
+
+		GetExamReq getExamReq = new GetExamReq();
+		getExamReq.setCode(examCode);
+		getExamReq.setRootOrgId(req.getRootOrgId());
+		GetExamResp r = examCloudService.getExam(getExamReq);
+		ExamBean examBean = r.getExamBean();
+
 		UpdateExamStudentStatusReq uessReq = new UpdateExamStudentStatusReq();
 		uessReq.setCourseCode(req.getCourseCode());
 		uessReq.setCourseId(req.getCourseId());
 		uessReq.setEnable(req.getEnable());
-		uessReq.setExamName(req.getExamName());
+		uessReq.setExamName(examBean.getName());
 		uessReq.setExamCode(req.getExamCode());
 		uessReq.setExamId(req.getExamId());
 		uessReq.setIdentityNumber(req.getIdentityNumber());
@@ -241,8 +286,20 @@ public class ExamStudentOuterServiceProvider extends ControllerSupport
 			throw new StatusException("1000001", "rootOrgId is wrong");
 		}
 
+		String examCode = req.getExamCode();
+		String examName = req.getExamName();
+		if (StringUtils.isNotBlank(examName)) {
+			examCode = examName;
+		}
+
+		GetExamReq getExamReq = new GetExamReq();
+		getExamReq.setCode(examCode);
+		getExamReq.setRootOrgId(req.getRootOrgId());
+		GetExamResp r = examCloudService.getExam(getExamReq);
+		ExamBean examBean = r.getExamBean();
+
 		ResetExamStudentReq resReq = new ResetExamStudentReq();
-		resReq.setExamName(req.getExamName());
+		resReq.setExamName(examBean.getName());
 		resReq.setExamCode(req.getExamCode());
 		resReq.setExamId(req.getExamId());
 		resReq.setIdentityNumber(req.getIdentityNumber());

examcloud-exchange-outer-api/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/bean/OuterExamStudentBean.java

@@ -30,7 +30,8 @@ public class OuterExamStudentBean implements JsonSerializable {
 	/**
 	 * 考试名称
 	 */
-	@ApiModelProperty(value = "考试名称", example = "2018年秋季入学考试", required = true)
+	@ApiModelProperty(value = "考试名称(废弃属性,实际上为考试编码)", example = "2018年秋季入学考试", required = true)
+	@Deprecated
 	private String examName;
 
 	/**

examcloud-exchange-outer-api/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/request/OuterBatchSaveExamStudentReq.java

@@ -23,9 +23,13 @@ public class OuterBatchSaveExamStudentReq extends EnterpriseRequest {
 	@ApiModelProperty(value = "考试ID", example = "100", required = false)
 	private Long examId;
 
-	@ApiModelProperty(value = "考试名称", example = "2018年秋季入学考试", required = true)
+	@ApiModelProperty(value = "考试名称(废弃属性,实际上作为考试编码使用)", example = "2018年秋季入学考试", required = false)
+	@Deprecated
 	private String examName;
 
+	@ApiModelProperty(value = "考试编码", example = "2018年秋季入学考试", required = true)
+	private String examCode;
+
 	@ApiModelProperty(value = "考生集合", example = "", required = true)
 	List<ExamStudent4BatchBean> examStudentList;
 
@@ -53,6 +57,14 @@ public class OuterBatchSaveExamStudentReq extends EnterpriseRequest {
 		this.examName = examName;
 	}
 
+	public String getExamCode() {
+		return examCode;
+	}
+
+	public void setExamCode(String examCode) {
+		this.examCode = examCode;
+	}
+
 	public List<ExamStudent4BatchBean> getExamStudentList() {
 		return examStudentList;
 	}

examcloud-exchange-outer-api/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/request/OuterResetExamStudentReq.java

@@ -16,10 +16,11 @@ public class OuterResetExamStudentReq extends EnterpriseRequest {
 	@ApiModelProperty(value = "考试ID", example = "100", required = false)
 	private Long examId;
 
-	@ApiModelProperty(value = "考试名称", example = "2018年秋季入学考试", required = false)
+	@ApiModelProperty(value = "考试名称(废弃属性,实际上作为考试编码使用)", example = "2018年秋季入学考试", required = false)
+	@Deprecated
 	private String examName;
 
-	@ApiModelProperty(value = "考试编码", example = "2018年秋季入学考试", required = false)
+	@ApiModelProperty(value = "考试编码", example = "2018年秋季入学考试", required = true)
 	private String examCode;
 
 	@ApiModelProperty(value = "学生姓名", example = "陈圆圆", required = true)

examcloud-exchange-outer-api/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/request/OuterSaveExamStudentReq.java

@@ -20,9 +20,13 @@ public class OuterSaveExamStudentReq extends EnterpriseRequest {
 	@ApiModelProperty(value = "考试ID", example = "100", required = false)
 	private Long examId;
 
-	@ApiModelProperty(value = "考试名称", example = "2018年秋季入学考试", required = true)
+	@ApiModelProperty(value = "考试名称(废弃属性,实际上作为考试编码使用)", example = "2018年秋季入学考试", required = false)
+	@Deprecated
 	private String examName;
 
+	@ApiModelProperty(value = "考试编码", example = "2018年秋季入学考试", required = true)
+	private String examCode;
+
 	@ApiModelProperty(value = "学生姓名", example = "陈圆圆", required = true)
 	private String studentName;
 
@@ -98,6 +102,14 @@ public class OuterSaveExamStudentReq extends EnterpriseRequest {
 		this.examName = examName;
 	}
 
+	public String getExamCode() {
+		return examCode;
+	}
+
+	public void setExamCode(String examCode) {
+		this.examCode = examCode;
+	}
+
 	public String getStudentName() {
 		return studentName;
 	}

examcloud-exchange-outer-api/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/request/OuterUpdateExamStudentStatusReq.java

@@ -13,12 +13,13 @@ public class OuterUpdateExamStudentStatusReq extends EnterpriseRequest {
 	@ApiModelProperty(value = "考试ID", example = "1", required = false)
 	private Long examId;
 
-	@ApiModelProperty(value = "考试编码", example = "1", required = false)
-	private String examCode;
-
-	@ApiModelProperty(value = "考试名称", example = "XX考试", required = false)
+	@ApiModelProperty(value = "考试名称(废弃属性,实际上作为考试编码使用)", example = "2018年秋季入学考试", required = false)
+	@Deprecated
 	private String examName;
 
+	@ApiModelProperty(value = "考试编码", example = "2018年秋季入学考试", required = true)
+	private String examCode;
+
 	@ApiModelProperty(value = "学生身份证号码", example = "XXXX", required = false)
 	private String identityNumber;
 

examcloud-exchange-outer-api/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/response/OuterGetExamResp.java

@@ -43,7 +43,7 @@ public class OuterGetExamResp extends EnterpriseResponse {
 	/**
 	 * 考试名称
 	 */
-	@ApiModelProperty(value = "考试名称", example = "2018年6月期末考试", required = true)
+	@ApiModelProperty(value = "考试名称(实际上为考试编码)", example = "2018年6月期末考试", required = true)
 	private String name;
 
 	/**