|
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
|
+import com.google.gson.Gson;
|
|
import com.qmth.themis.business.bean.admin.*;
|
|
import com.qmth.themis.business.bean.admin.*;
|
|
import com.qmth.themis.business.bean.status.ClientWebsocketStatusBean;
|
|
import com.qmth.themis.business.bean.status.ClientWebsocketStatusBean;
|
|
import com.qmth.themis.business.bean.status.ExamStatusBean;
|
|
import com.qmth.themis.business.bean.status.ExamStatusBean;
|
|
@@ -421,12 +422,14 @@ public class TOeExamRecordServiceImpl extends ServiceImpl<TOeExamRecordMapper, T
|
|
if (o instanceof ClientWebsocketStatusBean) {
|
|
if (o instanceof ClientWebsocketStatusBean) {
|
|
record.put(ExamRecordFieldEnum.client_websocket_status.getCode(), ((ClientWebsocketStatusBean) o).getWebsocketStatusEnum());
|
|
record.put(ExamRecordFieldEnum.client_websocket_status.getCode(), ((ClientWebsocketStatusBean) o).getWebsocketStatusEnum());
|
|
}
|
|
}
|
|
- record.put(ExamRecordFieldEnum.finish_type.getCode(), ExamRecordCacheUtil.getFinishType(recordId));
|
|
|
|
- record.put(ExamRecordFieldEnum.review_result.getCode(), ExamRecordCacheUtil.getReviewResult(recordId));
|
|
|
|
- record.put(ExamRecordFieldEnum.in_process_liveness_judge_policy.getCode(), ExamRecordCacheUtil.getInProcessLivenessJudgePolicy(recordId));
|
|
|
|
- record.put(ExamRecordFieldEnum.entry_authentication_result.getCode(), ExamRecordCacheUtil.getEntryAuthenticationResult(recordId));
|
|
|
|
- record.put(ExamRecordFieldEnum.entry_authentication_policy.getCode(), EntryAuthenticationPolicyEnum.valueOf(ExamRecordCacheUtil.getEntryAuthenticationPolicy(recordId)));
|
|
|
|
- TOeExamRecord er = SimpleBeanUtil.mapToObject(record, TOeExamRecord.class);
|
|
|
|
|
|
+// record.put(ExamRecordFieldEnum.finish_type.getCode(), ExamRecordCacheUtil.getFinishType(recordId));
|
|
|
|
+// record.put(ExamRecordFieldEnum.review_result.getCode(), ExamRecordCacheUtil.getReviewResult(recordId));
|
|
|
|
+// record.put(ExamRecordFieldEnum.in_process_liveness_judge_policy.getCode(), ExamRecordCacheUtil.getInProcessLivenessJudgePolicy(recordId));
|
|
|
|
+// record.put(ExamRecordFieldEnum.entry_authentication_result.getCode(), ExamRecordCacheUtil.getEntryAuthenticationResult(recordId));
|
|
|
|
+// record.put(ExamRecordFieldEnum.entry_authentication_policy.getCode(), EntryAuthenticationPolicyEnum.valueOf(ExamRecordCacheUtil.getEntryAuthenticationPolicy(recordId)));
|
|
|
|
+ Gson gson = new Gson();
|
|
|
|
+ TOeExamRecord er = gson.fromJson(gson.toJson(record), TOeExamRecord.class);
|
|
|
|
+// TOeExamRecord er = SimpleBeanUtil.mapToObject(record, TOeExamRecord.class);
|
|
er.setStatus(ExamRecordStatusEnum.PERSISTED);
|
|
er.setStatus(ExamRecordStatusEnum.PERSISTED);
|
|
if (struct != null) {
|
|
if (struct != null) {
|
|
er.setPaperStructPath(structFilePath);
|
|
er.setPaperStructPath(structFilePath);
|