chenken 6 жил өмнө
parent
commit
4a77df09ea

+ 22 - 4
examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/GetExamRecordAuditInfoServiceProvider.java

@@ -5,12 +5,17 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.commons.web.support.StatusResponse;
+import cn.com.qmth.examcloud.core.oe.admin.api.ExamScoreDataCloudService;
+import cn.com.qmth.examcloud.core.oe.admin.api.request.GetAuditDataReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.response.GetAuditDataResp;
 import cn.com.qmth.examcloud.exchange.outer.api.GetExamRecordAuditInfoService;
 import cn.com.qmth.examcloud.exchange.outer.api.request.OuterGetExamRecordAuditInfoReq;
 import cn.com.qmth.examcloud.exchange.outer.api.response.OuterGetExamRecordAuditInfoResp;
@@ -18,16 +23,29 @@ import cn.com.qmth.examcloud.exchange.outer.api.response.OuterGetExamRecordAudit
 @Api("获取考试记录审核信息服务")
 @RestController
 @RequestMapping("${$rmp.cloud.exchange.outer}/examRecordAuditInfo")
-public class GetExamRecordAuditInfoServiceProvider implements GetExamRecordAuditInfoService{
-
+public class GetExamRecordAuditInfoServiceProvider  extends ControllerSupport implements GetExamRecordAuditInfoService{
+	
+	@Autowired
+	private ExamScoreDataCloudService examScoreDataCloudService;
+	
 	@ApiOperation(value = "获取考试记录审核信息", httpMethod = "GET")
 	@ApiResponses({@ApiResponse(code = 200, message = "成功", response = OuterGetExamRecordAuditInfoResp.class),
 			@ApiResponse(code = 500, message = "系统异常(异常信息见响应体)", response = StatusResponse.class)})
 	@PostMapping("/getExamRecordAuditInfo")
 	@Override
 	public OuterGetExamRecordAuditInfoResp getExamRecordAuditInfo(@RequestBody OuterGetExamRecordAuditInfoReq req) {
-		// TODO Auto-generated method stub
-		return null;
+		GetAuditDataReq getAuditDataReq = new GetAuditDataReq();
+		getAuditDataReq.setExamRecordDataId(req.getExamRecordDataId());
+		GetAuditDataResp auditDataResp = examScoreDataCloudService.getAuditData(getAuditDataReq);
+		OuterGetExamRecordAuditInfoResp resp = new OuterGetExamRecordAuditInfoResp();
+		resp.setExamRecordDataId(req.getExamRecordDataId());
+		if(auditDataResp!=null){
+			resp.setDisciplineType(auditDataResp.getDisciplineType());
+			resp.setDisciplineDetail(auditDataResp.getDisciplineDetail());
+			resp.setCreationTime(auditDataResp.getCreationTime());
+			resp.setAuditUserName(auditDataResp.getAuditUserName());
+		}
+		return resp;
 	}
 
 }

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

@@ -5,12 +5,17 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.commons.web.support.StatusResponse;
+import cn.com.qmth.examcloud.core.oe.admin.api.ExamScoreDataCloudService;
+import cn.com.qmth.examcloud.core.oe.admin.api.request.GetScoreDataReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.response.GetScoreDataResp;
 import cn.com.qmth.examcloud.exchange.outer.api.GetScoreDataService;
 import cn.com.qmth.examcloud.exchange.outer.api.request.OuterGetScoreDataReq;
 import cn.com.qmth.examcloud.exchange.outer.api.response.OuterGetScoreDataResp;
@@ -18,12 +23,15 @@ import cn.com.qmth.examcloud.exchange.outer.api.response.OuterGetScoreDataResp;
 @Api("获取成绩服务")
 @RestController
 @RequestMapping("${$rmp.cloud.exchange.outer}/score")
-public class GetScoreDataServiceProvider implements GetScoreDataService {
+public class GetScoreDataServiceProvider extends ControllerSupport implements GetScoreDataService {
 
 	/**
 	 * 
 	 */
 	private static final long serialVersionUID = 1857049574734356057L;
+	
+	@Autowired
+	private ExamScoreDataCloudService examScoreDataCloudService;
 
 	@ApiOperation(value = "获取成绩数据", httpMethod = "GET")
 	@ApiResponses({@ApiResponse(code = 200, message = "成功", response = OuterGetScoreDataResp.class),
@@ -31,8 +39,25 @@ public class GetScoreDataServiceProvider implements GetScoreDataService {
 	@PostMapping("/getScoreData")
 	@Override
 	public OuterGetScoreDataResp getScoreData(@RequestBody OuterGetScoreDataReq req) {
-		// TODO Auto-generated method stub
-		return null;
+		GetScoreDataReq getScoreDataReq = new GetScoreDataReq();
+		getScoreDataReq.setExamRecordDataId(req.getExamRecordDataId());
+		GetScoreDataResp scoreDataResp = examScoreDataCloudService.getScoreData(getScoreDataReq);
+		
+		OuterGetScoreDataResp outerGetScoreDataResp = new OuterGetScoreDataResp();
+		outerGetScoreDataResp.setExamRecordDataId(scoreDataResp.getExamRecordDataId());
+		outerGetScoreDataResp.setStudentCode(scoreDataResp.getStudentCode());
+		outerGetScoreDataResp.setStudentName(scoreDataResp.getStudentName());
+		outerGetScoreDataResp.setIdentityNumber(scoreDataResp.getIdentityNumber());
+		outerGetScoreDataResp.setCourseCode(scoreDataResp.getCourseCode());
+		outerGetScoreDataResp.setCourseName(scoreDataResp.getCourseName());
+		outerGetScoreDataResp.setStartTime(scoreDataResp.getStartTime());
+		outerGetScoreDataResp.setEndTime(scoreDataResp.getEndTime());
+		outerGetScoreDataResp.setTotalScore(scoreDataResp.getTotalScore());
+		outerGetScoreDataResp.setIsWarn(scoreDataResp.getIsWarn());
+		outerGetScoreDataResp.setIsAudit(scoreDataResp.getIsAudit());
+		outerGetScoreDataResp.setIsIllegality(scoreDataResp.getIsIllegality());
+		
+		return outerGetScoreDataResp;
 	}
 
 }

+ 32 - 6
examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/QueryCapturePhotoServiceProvider.java

@@ -1,40 +1,66 @@
 package cn.com.qmth.examcloud.exchange.outer.api.provider;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.commons.web.support.StatusResponse;
+import cn.com.qmth.examcloud.core.oe.admin.api.ExamScoreDataCloudService;
+import cn.com.qmth.examcloud.core.oe.admin.api.bean.QueryCapturePhotoBean;
+import cn.com.qmth.examcloud.core.oe.admin.api.request.QueryCapturePhotoReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.response.QueryCapturePhotoResp;
 import cn.com.qmth.examcloud.exchange.outer.api.QueryCapturePhotoService;
+import cn.com.qmth.examcloud.exchange.outer.api.bean.OuterGetCapturePhotoBean;
 import cn.com.qmth.examcloud.exchange.outer.api.request.OuterQueryCapturePhotoReq;
 import cn.com.qmth.examcloud.exchange.outer.api.response.OuterQueryCapturePhotoResp;
 
 @Api("获取抓拍照片信息服务")
 @RestController
 @RequestMapping("${$rmp.cloud.exchange.outer}/capturePhoto")
-public class QueryCapturePhotoServiceProvider implements QueryCapturePhotoService {
+public class QueryCapturePhotoServiceProvider extends ControllerSupport implements QueryCapturePhotoService {
 
 	/**
 	 * 
 	 */
 	private static final long serialVersionUID = 3051021630006959568L;
+	
+	@Autowired
+	private ExamScoreDataCloudService examScoreDataCloudService;
 
 	@ApiOperation(value = "获取抓拍照片信息数据", httpMethod = "GET")
 	@ApiResponses({@ApiResponse(code = 200, message = "成功", response = OuterQueryCapturePhotoResp.class),
 			@ApiResponse(code = 500, message = "系统异常(异常信息见响应体)", response = StatusResponse.class)})
-	@PostMapping("/getScoreData")
+	@PostMapping("/queryCapturePhoto")
 	@Override
 	public OuterQueryCapturePhotoResp queryCapturePhotoList(@RequestBody OuterQueryCapturePhotoReq req) {
-		// TODO Auto-generated method stub
-		return null;
+		QueryCapturePhotoReq queryCapturePhotoReq = new QueryCapturePhotoReq();
+		queryCapturePhotoReq.setExamRecordDataId(req.getExamRecordDataId());
+		QueryCapturePhotoResp capturePhotoResp = examScoreDataCloudService.queryCapturePhoto(queryCapturePhotoReq);
+		OuterQueryCapturePhotoResp resp = new OuterQueryCapturePhotoResp();
+		resp.setExamRecordDataId(capturePhotoResp.getExamRecordDataId());
+		
+		List<OuterGetCapturePhotoBean> capturePhotoList = new ArrayList<OuterGetCapturePhotoBean>();
+		for(QueryCapturePhotoBean queryCapturePhotoBean:capturePhotoResp.getCapturePhotoList()){
+			OuterGetCapturePhotoBean outerGetCapturePhotoBean = new OuterGetCapturePhotoBean();
+			outerGetCapturePhotoBean.setFileUrl(queryCapturePhotoBean.getFileUrl());
+			outerGetCapturePhotoBean.setIsPass(queryCapturePhotoBean.getIsPass());
+			outerGetCapturePhotoBean.setIsStranger(queryCapturePhotoBean.getIsStranger());
+			outerGetCapturePhotoBean.setIsLivenessPass(queryCapturePhotoBean.getIsLivenessPass());
+			capturePhotoList.add(outerGetCapturePhotoBean);
+		}
+		resp.setCapturePhotoList(capturePhotoList);
+		return resp;
 	}
 
-	
-
 }

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -12,6 +13,10 @@ import org.springframework.web.bind.annotation.RestController;
 
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.commons.web.support.StatusResponse;
+import cn.com.qmth.examcloud.core.oe.admin.api.ExamScoreObtainQueueCloudService;
+import cn.com.qmth.examcloud.core.oe.admin.api.request.DeleteExamScoreQueueReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.request.GetTopExamScoreQueueReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.response.GetTopExamScoreQueueResp;
 import cn.com.qmth.examcloud.exchange.outer.api.ScoreQueueService;
 import cn.com.qmth.examcloud.exchange.outer.api.request.OuterDeleteScoreQueueTopReq;
 import cn.com.qmth.examcloud.exchange.outer.api.request.OuterGetScoreQueueTopReq;
@@ -27,23 +32,41 @@ public class ScoreQueueServiceProvider extends ControllerSupport implements Scor
 	 * 
 	 */
 	private static final long serialVersionUID = -7975687672489564748L;
+	
+	@Autowired
+	private ExamScoreObtainQueueCloudService examScoreObtainQueueCloudService;
 
 	@ApiOperation(value = "取队列最顶层记录", httpMethod = "GET")
 	@ApiResponses({@ApiResponse(code = 200, message = "成功", response = OuterGetScoreQueueTopResp.class),
 			@ApiResponse(code = 500, message = "系统异常(异常信息见响应体)", response = StatusResponse.class)})
 	@PostMapping("/getScoreQueueTop")
 	@Override
-	public OuterGetScoreQueueTopResp GetScoreQueueTop(@RequestBody OuterGetScoreQueueTopReq req) {
-		return null;
+	public OuterGetScoreQueueTopResp getScoreQueueTop(@RequestBody OuterGetScoreQueueTopReq req) {
+		GetTopExamScoreQueueReq getTopExamScoreQueueReq = new GetTopExamScoreQueueReq();
+		getTopExamScoreQueueReq.setRootOrgId(req.getRootOrgId());
+		GetTopExamScoreQueueResp getTopExamScoreQueueResp = examScoreObtainQueueCloudService.getTopExamScoreQueue(getTopExamScoreQueueReq);
+		OuterGetScoreQueueTopResp resp = new OuterGetScoreQueueTopResp();
+		if(getTopExamScoreQueueResp!=null){
+			resp.setQueueId(getTopExamScoreQueueResp.getQueueId());
+			resp.setExamRecordDataId(getTopExamScoreQueueResp.getExamRecordDataId());
+		}
+		return resp;
 	}
 
 	@ApiOperation(value = "删除队列最顶层记录", httpMethod = "GET")
 	@ApiResponses({@ApiResponse(code = 200, message = "成功", response = OuterDeleteScoreQueueTopResp.class),
 			@ApiResponse(code = 500, message = "系统异常(异常信息见响应体)", response = StatusResponse.class)})
-	@PostMapping("deleteScoreQueueTop")
+	@PostMapping("/deleteScoreQueueTop")
 	@Override
-	public OuterDeleteScoreQueueTopResp DeleteScoreQueueTop(@RequestBody OuterDeleteScoreQueueTopReq req) {
-		return null;
+	public OuterDeleteScoreQueueTopResp deleteScoreQueueTop(@RequestBody OuterDeleteScoreQueueTopReq req) {
+		DeleteExamScoreQueueReq deleteExamScoreQueueReq = new DeleteExamScoreQueueReq();
+		deleteExamScoreQueueReq.setQueueId(req.getQueueId());
+		deleteExamScoreQueueReq.setRootOrgId(req.getRootOrgId());
+		examScoreObtainQueueCloudService.deleteExamScoreQueue(deleteExamScoreQueueReq);
+		OuterDeleteScoreQueueTopResp resp = new OuterDeleteScoreQueueTopResp();
+		resp.setIsSuccess(true);
+		resp.setDesc("删除成功");
+		return resp;
 	}
 
 }

+ 2 - 1
examcloud-exchange-outer-api/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/GetExamRecordAuditInfoService.java

@@ -1,5 +1,6 @@
 package cn.com.qmth.examcloud.exchange.outer.api;
 
+import cn.com.qmth.examcloud.commons.web.cloud.api.OuterService;
 import cn.com.qmth.examcloud.exchange.outer.api.request.OuterGetExamRecordAuditInfoReq;
 import cn.com.qmth.examcloud.exchange.outer.api.response.OuterGetExamRecordAuditInfoResp;
 
@@ -10,7 +11,7 @@ import cn.com.qmth.examcloud.exchange.outer.api.response.OuterGetExamRecordAudit
  * @company 	QMTH
  * @description 获取考试记录审核信息
  */
-public interface GetExamRecordAuditInfoService {
+public interface GetExamRecordAuditInfoService extends OuterService{
 
 	public OuterGetExamRecordAuditInfoResp getExamRecordAuditInfo(OuterGetExamRecordAuditInfoReq req);
 	

+ 2 - 2
examcloud-exchange-outer-api/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/ScoreQueueService.java

@@ -21,12 +21,12 @@ public interface ScoreQueueService extends OuterService{
 	 * @param req
 	 * @return
 	 */
-	public OuterGetScoreQueueTopResp GetScoreQueueTop(OuterGetScoreQueueTopReq req);
+	public OuterGetScoreQueueTopResp getScoreQueueTop(OuterGetScoreQueueTopReq req);
 	
 	/**
 	 * 删除队列最顶层记录
 	 * @param req
 	 * @return
 	 */
-	public OuterDeleteScoreQueueTopResp DeleteScoreQueueTop(OuterDeleteScoreQueueTopReq req);
+	public OuterDeleteScoreQueueTopResp deleteScoreQueueTop(OuterDeleteScoreQueueTopReq req);
 }

+ 7 - 9
examcloud-exchange-outer-api/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/bean/OuterGetCapturePhotoBean.java

@@ -20,9 +20,6 @@ public class OuterGetCapturePhotoBean implements JsonSerializable{
 	 */
 	private static final long serialVersionUID = 2867275034372864464L;
 	
-	@ApiModelProperty(value = "考试记录ID", example = "0", required = true)
-	private Long examRecordDataId;
-   
 	@ApiModelProperty(value = "文件URL", example = "https://ecs-XXX.qmth.com.cn/capture_photo/XXX/XXX.jpg", required = true)
     private String fileUrl;
     
@@ -35,12 +32,6 @@ public class OuterGetCapturePhotoBean implements JsonSerializable{
 	@ApiModelProperty(value = "人脸真实性是否通过", example = "true", required = true)
     private Boolean isLivenessPass;
 	
-	public Long getExamRecordDataId() {
-		return examRecordDataId;
-	}
-	public void setExamRecordDataId(Long examRecordDataId) {
-		this.examRecordDataId = examRecordDataId;
-	}
 	public String getFileUrl() {
 		return fileUrl;
 	}
@@ -59,4 +50,11 @@ public class OuterGetCapturePhotoBean implements JsonSerializable{
 	public void setIsStranger(Boolean isStranger) {
 		this.isStranger = isStranger;
 	}
+	public Boolean getIsLivenessPass() {
+		return isLivenessPass;
+	}
+	public void setIsLivenessPass(Boolean isLivenessPass) {
+		this.isLivenessPass = isLivenessPass;
+	}
+	
 }

+ 11 - 0
examcloud-exchange-outer-api/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/request/OuterDeleteScoreQueueTopReq.java

@@ -18,6 +18,9 @@ public class OuterDeleteScoreQueueTopReq extends BaseRequest{
 	 */
 	private static final long serialVersionUID = 6340573640799250911L;
 	
+	@ApiModelProperty(value = "机构ID", example = "1", required = true)
+	private Long rootOrgId;
+	
 	@ApiModelProperty(value = "队列ID", example = "1", required = true)
 	private Long queueId;
 
@@ -28,5 +31,13 @@ public class OuterDeleteScoreQueueTopReq extends BaseRequest{
 	public void setQueueId(Long queueId) {
 		this.queueId = queueId;
 	}
+
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
 	
 }