考试code和考试名称代码调整

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

@@ -3,6 +3,7 @@ package cn.com.qmth.examcloud.exchange.outer.api.provider;
 import java.util.ArrayList;
 import java.util.List;
 
+import cn.com.qmth.examcloud.commons.util.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
@@ -37,10 +38,10 @@ import cn.com.qmth.examcloud.web.support.StatusResponse;
 public class GetScoreDataServiceProvider extends ControllerSupport implements GetScoreDataService {
 
 	/**
-	 * 
+	 *
 	 */
 	private static final long serialVersionUID = 1857049574734356057L;
-	
+
 	@Autowired
 	private ExamScoreDataCloudService examScoreDataCloudService;
 
@@ -62,7 +63,7 @@ public class GetScoreDataServiceProvider extends ControllerSupport implements Ge
 		GetScoreDataReq getScoreDataReq = new GetScoreDataReq();
 		getScoreDataReq.setExamRecordDataId(req.getExamRecordDataId());
 		GetScoreDataResp scoreDataResp = examScoreDataCloudService.getScoreData(getScoreDataReq);
-		
+
 		OuterGetScoreDataResp outerGetScoreDataResp = new OuterGetScoreDataResp();
 		OuterScoreDataBean outerScoreDataBean = new OuterScoreDataBean();
 		outerScoreDataBean.setExamRecordDataId(scoreDataResp.getExamRecordDataId());
@@ -80,7 +81,7 @@ public class GetScoreDataServiceProvider extends ControllerSupport implements Ge
 		outerGetScoreDataResp.setOuterScoreDataBean(outerScoreDataBean);
 		return outerGetScoreDataResp;
 	}
-	
+
 	@ApiOperation(value = "按考试名称，rootOrgId,courseCode，身份证号或学号获取成绩数据", httpMethod = "POST")
 	@ApiResponses({@ApiResponse(code = 200, message = "成功", response = OuterQueryScoreDataResp.class),
 			@ApiResponse(code = 500, message = "系统异常(异常信息见响应体)", response = StatusResponse.class)})
@@ -93,9 +94,7 @@ public class GetScoreDataServiceProvider extends ControllerSupport implements Ge
 		if (!getEnterpriseRootOrgId().equals(req.getRootOrgId())) {
 			throw new StatusException("1000002", "rootOrgId错误");
 		}
-		if(StringUtils.isBlank(req.getExamName())){
-			throw new StatusException("1000003", "考试名称不能为空");
-		}
+
 		if(StringUtils.isBlank(req.getCourseCode())){
 			throw new StatusException("1000004", "课程code不能为空");
 		}
@@ -107,7 +106,17 @@ public class GetScoreDataServiceProvider extends ControllerSupport implements Ge
 		}
 		QueryScoreDataReq queryScoreDataReq = new QueryScoreDataReq();
 		queryScoreDataReq.setCourseCode(req.getCourseCode());
-		queryScoreDataReq.setExamCode(req.getExamCode());
+
+		//如果考试名称不为空，则把考试名称作为考试编码
+		if (StringUtils.isNoneBlank(req.getExamName())) {
+			queryScoreDataReq.setExamCode(req.getExamName());
+		} else {
+			queryScoreDataReq.setExamCode(req.getExamCode());
+		}
+		if(StringUtils.isBlank(queryScoreDataReq.getExamCode())){
+			throw new StatusException("1000003", "考试代码不能为空");
+		}
+
 		queryScoreDataReq.setExamName(req.getExamName());
 		queryScoreDataReq.setIdentityNumber(req.getIdentityNumber());
 		queryScoreDataReq.setRootOrgId(req.getRootOrgId());

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

@@ -34,16 +34,16 @@ import cn.com.qmth.examcloud.web.support.StatusResponse;
 public class ScoreQueueServiceProvider extends ControllerSupport implements ScoreQueueService {
 
 	/**
-	 * 
+	 *
 	 */
 	private static final long serialVersionUID = -7975687672489564748L;
-	
+
 	@Autowired
 	private ExamScoreObtainQueueCloudService examScoreObtainQueueCloudService;
 	@Autowired
 	private ExamCloudService examCloudService;
-	
-	
+
+
 
 	@ApiOperation(value = "取队列最顶层记录", httpMethod = "POST")
 	@ApiResponses({@ApiResponse(code = 200, message = "成功", response = OuterGetScoreQueueTopResp.class),
@@ -58,7 +58,7 @@ public class ScoreQueueServiceProvider extends ControllerSupport implements Scor
 		getTopExamScoreQueueReq.setRootOrgId(req.getRootOrgId());
 		GetTopExamScoreQueueResp getTopExamScoreQueueResp = examScoreObtainQueueCloudService.getTopExamScoreQueue(getTopExamScoreQueueReq);
 		OuterGetScoreQueueTopResp resp = new OuterGetScoreQueueTopResp();
-		
+
 		//返回值不为空数据
 		if(!getTopExamScoreQueueResp.getIsEmpty()){
 			resp.setQueueId(getTopExamScoreQueueResp.getQueueId());
@@ -70,10 +70,11 @@ public class ScoreQueueServiceProvider extends ControllerSupport implements Scor
 			GetExamResp getExamResp = examCloudService.getExam(getExamReq);
 			if(getExamResp!=null) {
 				resp.setExamId(examId);//考试id
-				resp.setExamCode(examId.toString());//考试编码，此记录为预留字段，暂时赋值为考试id
 				ExamBean examBean = getExamResp.getExamBean();
 				if(examBean!=null) {
-					resp.setExamName(examBean.getName());//考试名称
+					//需求调整201911216：code和name都返回为code
+					resp.setExamCode(examBean.getCode());
+					resp.setExamName(examBean.getCode());
 				}
 			}
 			resp.setIsEmpty(false);//返回的为非空数据
@@ -99,7 +100,7 @@ public class ScoreQueueServiceProvider extends ControllerSupport implements Scor
 		if(getTopExamScoreQueueResp.getQueueId()==null || (getTopExamScoreQueueResp.getQueueId()!=null && !getTopExamScoreQueueResp.getQueueId().equals(req.getQueueId()))){
 			throw new StatusException("1000003", "queueId is wrong");
 		}
-		
+
 		DeleteExamScoreQueueReq deleteExamScoreQueueReq = new DeleteExamScoreQueueReq();
 		deleteExamScoreQueueReq.setQueueId(req.getQueueId());
 		deleteExamScoreQueueReq.setRootOrgId(req.getRootOrgId());

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

@@ -4,7 +4,7 @@ import cn.com.qmth.examcloud.api.commons.exchange.EnterpriseRequest;
 import io.swagger.annotations.ApiModelProperty;
 
 /**
- * 
+ *
  * @author  	chenken
  * @date    	2018年11月27日 下午5:51:08
  * @company 	QMTH
@@ -13,22 +13,22 @@ import io.swagger.annotations.ApiModelProperty;
 public class OuterQueryScoreDataReq extends EnterpriseRequest{
 
 	/**
-	 * 
+	 *
 	 */
 	private static final long serialVersionUID = -5033520077132433253L;
 
 	@ApiModelProperty(value = "考试代码,推荐使用")
 	private String examCode;
-	@ApiModelProperty(value = "考试名称,已弃用,推荐使用examCode")
+	@ApiModelProperty(value = "考试名称(废弃属性,实际上作为考试编码使用)", example = "2018年6月期末考试", required = false)
 	@Deprecated
 	private String examName;
-	
+
 	private Long rootOrgId;
-	
+
 	private String studentCode;
-	
+
 	private String identityNumber;
-	
+
 	private String courseCode;
 
 	public String getExamName() {
@@ -78,5 +78,5 @@ public class OuterQueryScoreDataReq extends EnterpriseRequest{
 	public void setCourseCode(String courseCode) {
 		this.courseCode = courseCode;
 	}
-	
+
 }

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

@@ -4,7 +4,7 @@ import cn.com.qmth.examcloud.api.commons.exchange.EnterpriseResponse;
 import io.swagger.annotations.ApiModelProperty;
 
 /**
- * 
+ *
  * @author  	chenken
  * @date    	2018年11月16日 下午3:08:14
  * @company 	QMTH
@@ -13,23 +13,24 @@ import io.swagger.annotations.ApiModelProperty;
 public class OuterGetScoreQueueTopResp extends EnterpriseResponse{
 
 	/**
-	 * 
+	 *
 	 */
 	private static final long serialVersionUID = -2874809807909407199L;
-	
+
 	@ApiModelProperty(value = "队列ID", example = "1", required = true)
 	private Long queueId;
-	
+
 	@ApiModelProperty(value = "考试记录ID", example = "1", required = true)
 	private Long examRecordDataId;
-	
+
 	@ApiModelProperty(value = "考试ID", example = "1", required = true)
 	private Long examId;
-	
+
 	@ApiModelProperty(value = "考试编码", example = "1", required = true)
 	private String examCode;
-	
-	@ApiModelProperty(value = "考试名称", example = "1", required = true)
+
+	@ApiModelProperty(value = "考试名称(废弃属性,实际上返回的是考试编码)", example = "2018年6月期末考试", required = false)
+	@Deprecated
 	private String examName;
 	@ApiModelProperty(value = "对象数据是否为空", example = "true", required = true)
 	private Boolean isEmpty;
@@ -81,5 +82,5 @@ public class OuterGetScoreQueueTopResp extends EnterpriseResponse{
 	public void setIsEmpty(Boolean isEmpty) {
 		this.isEmpty = isEmpty;
 	}
-	
+
 }