Merge remote-tracking branch 'origin/dev_v5.0.5' into dev_v5.0.5

examcloud-core-oe-admin-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/admin/client/ExamRecordQuestionsCloudServiceClient.java

@@ -1,6 +1,8 @@
 package cn.com.qmth.examcloud.core.oe.admin.client;
 
+import cn.com.qmth.examcloud.core.oe.admin.api.request.ClearMarkResultReq;
 import cn.com.qmth.examcloud.core.oe.admin.api.request.GetSubjectiveAnswerReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.response.ClearMarkResultResp;
 import cn.com.qmth.examcloud.core.oe.admin.api.response.GetSubjectiveAnswerResp;
 import org.springframework.stereotype.Service;
 
@@ -11,33 +13,33 @@ import cn.com.qmth.examcloud.core.oe.admin.api.response.QuerySubjectiveAnswerLis
 
 @Service
 public class ExamRecordQuestionsCloudServiceClient extends AbstractCloudClientSupport
-		implements
-			ExamRecordQuestionsCloudService {
-
-	private static final long serialVersionUID = 7406118545852910455L;
-
-	@Override
-	public QuerySubjectiveAnswerListResp querySubjectiveAnswerList(
-			QuerySubjectiveAnswerListReq req) {
-		return post("examRecordQuestions/querySubjectiveAnswerList", req,
-				QuerySubjectiveAnswerListResp.class);
-	}
-
-	@Override
-	public void saveSubjectiveQuestionScore(SaveSubjectiveQuestionScoreReq req) {
-		post("examRecordQuestions/saveSubjectiveQuestionScore", req, null);
-	}
-
-	/**
-	 * 批量获取主观题答案
-	 *
-	 * @param req
-	 * @return
-	 */
-	@Override
-	public GetSubjectiveAnswerResp getSubjectiveAnswerList(GetSubjectiveAnswerReq req) {
-		return post("examRecordQuestions/getSubjectiveAnswerList", req,
-				GetSubjectiveAnswerResp.class);
-	}
-
+        implements ExamRecordQuestionsCloudService {
+
+    private static final long serialVersionUID = 7406118545852910455L;
+
+    @Override
+    public QuerySubjectiveAnswerListResp querySubjectiveAnswerList(QuerySubjectiveAnswerListReq req) {
+        return post("examRecordQuestions/querySubjectiveAnswerList", req, QuerySubjectiveAnswerListResp.class);
+    }
+
+    @Override
+    public void saveSubjectiveQuestionScore(SaveSubjectiveQuestionScoreReq req) {
+        post("examRecordQuestions/saveSubjectiveQuestionScore", req, null);
+    }
+
+    /**
+     * 批量获取主观题答案
+     *
+     * @param req
+     * @return
+     */
+    @Override
+    public GetSubjectiveAnswerResp getSubjectiveAnswerList(GetSubjectiveAnswerReq req) {
+        return post("examRecordQuestions/getSubjectiveAnswerList", req, GetSubjectiveAnswerResp.class);
+    }
+
+    @Override
+    public ClearMarkResultResp clearSubjectiveScore(ClearMarkResultReq req) {
+        return post("examRecordQuestions/subjective-score/clear", req, ClearMarkResultResp.class);
+    }
 }

examcloud-core-oe-admin-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/admin/client/MarkResultCloudServiceClient.java

@@ -1,18 +0,0 @@
-package cn.com.qmth.examcloud.core.oe.admin.client;
-
-import org.springframework.stereotype.Service;
-
-import cn.com.qmth.examcloud.core.oe.admin.api.MarkResultCloudService;
-import cn.com.qmth.examcloud.core.oe.admin.api.request.ClearMarkResultReq;
-import cn.com.qmth.examcloud.core.oe.admin.api.response.ClearMarkResultResp;
-
-@Service("markResultCloudService")
-public class MarkResultCloudServiceClient extends AbstractCloudClientSupport implements MarkResultCloudService {
-
-    private static final long serialVersionUID = 6596862028883396367L;
-
-    @Override
-    public ClearMarkResultResp clearScore(ClearMarkResultReq req) {
-        return post("mark/result/clear", req, ClearMarkResultResp.class);
-    }
-}

examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/ExamRecordQuestionsCloudService.java

@@ -1,30 +1,37 @@
 package cn.com.qmth.examcloud.core.oe.admin.api;
 
 import cn.com.qmth.examcloud.api.commons.CloudService;
+import cn.com.qmth.examcloud.core.oe.admin.api.request.ClearMarkResultReq;
 import cn.com.qmth.examcloud.core.oe.admin.api.request.GetSubjectiveAnswerReq;
 import cn.com.qmth.examcloud.core.oe.admin.api.request.QuerySubjectiveAnswerListReq;
 import cn.com.qmth.examcloud.core.oe.admin.api.request.SaveSubjectiveQuestionScoreReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.response.ClearMarkResultResp;
 import cn.com.qmth.examcloud.core.oe.admin.api.response.GetSubjectiveAnswerResp;
 import cn.com.qmth.examcloud.core.oe.admin.api.response.QuerySubjectiveAnswerListResp;
 
-public interface ExamRecordQuestionsCloudService extends CloudService{
+public interface ExamRecordQuestionsCloudService extends CloudService {
 
-	/**
-	 * 根据考试记录ID获取主观题答案集合
-	 * @param req
-	 * @return
-	 */
-	public QuerySubjectiveAnswerListResp querySubjectiveAnswerList(QuerySubjectiveAnswerListReq req);
-	
-	/**
-	 * 阅卷回传主观题分数
-	 * @param req
-	 */
-	public void saveSubjectiveQuestionScore(SaveSubjectiveQuestionScoreReq req);
+    /**
+     * 根据考试记录ID获取主观题答案集合
+     * 
+     * @param req
+     * @return
+     */
+    public QuerySubjectiveAnswerListResp querySubjectiveAnswerList(QuerySubjectiveAnswerListReq req);
 
-	/**
-	 * 批量获取主观题答案（此接口外部工具调用）
-	 * @return
-	 */
-	GetSubjectiveAnswerResp getSubjectiveAnswerList(GetSubjectiveAnswerReq req);
+    /**
+     * 阅卷回传主观题分数
+     * 
+     * @param req
+     */
+    public void saveSubjectiveQuestionScore(SaveSubjectiveQuestionScoreReq req);
+
+    /**
+     * 批量获取主观题答案（此接口外部工具调用）
+     * 
+     * @return
+     */
+    GetSubjectiveAnswerResp getSubjectiveAnswerList(GetSubjectiveAnswerReq req);
+
+    ClearMarkResultResp clearSubjectiveScore(ClearMarkResultReq req);
 }

examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/MarkResultCloudService.java

@@ -1,11 +0,0 @@
-package cn.com.qmth.examcloud.core.oe.admin.api;
-
-import cn.com.qmth.examcloud.api.commons.CloudService;
-import cn.com.qmth.examcloud.core.oe.admin.api.request.ClearMarkResultReq;
-import cn.com.qmth.examcloud.core.oe.admin.api.response.ClearMarkResultResp;
-
-public interface MarkResultCloudService extends CloudService {
-
-    ClearMarkResultResp clearScore(ClearMarkResultReq req);
-
-}