|
@@ -99,8 +99,8 @@ public class TOeExamRecordServiceImpl extends ServiceImpl<TOeExamRecordMapper, T
|
|
* @param orgId
|
|
* @param orgId
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
- @SuppressWarnings({ "rawtypes", "unchecked" })
|
|
|
|
- @Override
|
|
|
|
|
|
+ @SuppressWarnings({"rawtypes", "unchecked"})
|
|
|
|
+ @Override
|
|
public Map getUnFinishExam(Long studentId, Long examId, Long orgId) {
|
|
public Map getUnFinishExam(Long studentId, Long examId, Long orgId) {
|
|
TEExamUnFinishDto teExamUnFinishDto = tOeExamRecordMapper.getUnFinishExam(studentId, examId, orgId);
|
|
TEExamUnFinishDto teExamUnFinishDto = tOeExamRecordMapper.getUnFinishExam(studentId, examId, orgId);
|
|
if (Objects.nonNull(teExamUnFinishDto)) {
|
|
if (Objects.nonNull(teExamUnFinishDto)) {
|
|
@@ -350,7 +350,6 @@ public class TOeExamRecordServiceImpl extends ServiceImpl<TOeExamRecordMapper, T
|
|
// transMap, MqTagEnum.CALCULATE_OBJECTIVE_SCORE, recordId.toString(), propMap, recordId.toString());
|
|
// transMap, MqTagEnum.CALCULATE_OBJECTIVE_SCORE, recordId.toString(), propMap, recordId.toString());
|
|
// mqDtoService.assembleSendAsyncDelayMsg(mqDto);
|
|
// mqDtoService.assembleSendAsyncDelayMsg(mqDto);
|
|
// }
|
|
// }
|
|
-
|
|
|
|
private boolean checkSingleChoice(String answerArray, JSONArray ar) {
|
|
private boolean checkSingleChoice(String answerArray, JSONArray ar) {
|
|
JSONArray an = JSONArray.parseArray(answerArray);
|
|
JSONArray an = JSONArray.parseArray(answerArray);
|
|
if (an.size() == 0) {
|
|
if (an.size() == 0) {
|
|
@@ -412,6 +411,7 @@ public class TOeExamRecordServiceImpl extends ServiceImpl<TOeExamRecordMapper, T
|
|
.get(RedisKeyHelper.studentPaperStructKey(recordId));
|
|
.get(RedisKeyHelper.studentPaperStructKey(recordId));
|
|
|
|
|
|
//保存考试记录
|
|
//保存考试记录
|
|
|
|
+ ExamRecordCacheUtil.setStatus(recordId, ExamRecordCacheUtil.getStatus(recordId));
|
|
Map<String, Object> record = redisUtil.getHashEntries(RedisKeyHelper.examRecordCacheKey(recordId));
|
|
Map<String, Object> record = redisUtil.getHashEntries(RedisKeyHelper.examRecordCacheKey(recordId));
|
|
TOeExamRecord er = SimpleBeanUtil.mapToObject(record, TOeExamRecord.class);
|
|
TOeExamRecord er = SimpleBeanUtil.mapToObject(record, TOeExamRecord.class);
|
|
er.setStatus(ExamRecordStatusEnum.PERSISTED);
|
|
er.setStatus(ExamRecordStatusEnum.PERSISTED);
|
|
@@ -616,7 +616,7 @@ public class TOeExamRecordServiceImpl extends ServiceImpl<TOeExamRecordMapper, T
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
@SuppressWarnings("rawtypes")
|
|
@SuppressWarnings("rawtypes")
|
|
- @Override
|
|
|
|
|
|
+ @Override
|
|
public IPage<InvigilateListBean> invigilatePageList(IPage<Map> iPage, Long examId, Long examActivityId,
|
|
public IPage<InvigilateListBean> invigilatePageList(IPage<Map> iPage, Long examId, Long examActivityId,
|
|
String roomCode, Integer paperDownload, String status, String name, String identity,
|
|
String roomCode, Integer paperDownload, String status, String name, String identity,
|
|
Integer minWarningCount, Integer maxWarningCount, String clientWebsocketStatus, String monitorStatusSource,
|
|
Integer minWarningCount, Integer maxWarningCount, String clientWebsocketStatus, String monitorStatusSource,
|
|
@@ -645,7 +645,7 @@ public class TOeExamRecordServiceImpl extends ServiceImpl<TOeExamRecordMapper, T
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
@SuppressWarnings("rawtypes")
|
|
@SuppressWarnings("rawtypes")
|
|
- @Override
|
|
|
|
|
|
+ @Override
|
|
public IPage<InvigilateListVideoBean> invigilatePageListVideo(IPage<Map> iPage, Long examId, Long examActivityId,
|
|
public IPage<InvigilateListVideoBean> invigilatePageListVideo(IPage<Map> iPage, Long examId, Long examActivityId,
|
|
String roomCode, Integer paperDownload, String status, String name, String identity,
|
|
String roomCode, Integer paperDownload, String status, String name, String identity,
|
|
Integer minWarningCount, Integer maxWarningCount, String clientWebsocketStatus, Long userId, Long orgId) {
|
|
Integer minWarningCount, Integer maxWarningCount, String clientWebsocketStatus, Long userId, Long orgId) {
|
|
@@ -691,7 +691,7 @@ public class TOeExamRecordServiceImpl extends ServiceImpl<TOeExamRecordMapper, T
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
@SuppressWarnings("rawtypes")
|
|
@SuppressWarnings("rawtypes")
|
|
- @Override
|
|
|
|
|
|
+ @Override
|
|
public IPage<InvigilateListPatrolBean> invigilatePagePatrolList(IPage<Map> iPage, Long examId, Long examActivityId,
|
|
public IPage<InvigilateListPatrolBean> invigilatePagePatrolList(IPage<Map> iPage, Long examId, Long examActivityId,
|
|
String roomCode, String status, String name, String identity, Integer minMultipleFaceCount,
|
|
String roomCode, String status, String name, String identity, Integer minMultipleFaceCount,
|
|
Integer maxMultipleFaceCount, Integer minExceptionCount, Integer maxExceptionCount, Integer minWarningCount,
|
|
Integer maxMultipleFaceCount, Integer minExceptionCount, Integer maxExceptionCount, Integer minWarningCount,
|
|
@@ -723,7 +723,7 @@ public class TOeExamRecordServiceImpl extends ServiceImpl<TOeExamRecordMapper, T
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
@SuppressWarnings("rawtypes")
|
|
@SuppressWarnings("rawtypes")
|
|
- @Override
|
|
|
|
|
|
+ @Override
|
|
public IPage<InvigilateListWarningBean> invigilatePageWarningList(IPage<Map> iPage, Long examId,
|
|
public IPage<InvigilateListWarningBean> invigilatePageWarningList(IPage<Map> iPage, Long examId,
|
|
Long examActivityId, String roomCode, Integer approveStatus, String name, String identity,
|
|
Long examActivityId, String roomCode, Integer approveStatus, String name, String identity,
|
|
Integer minMultipleFaceCount, Integer maxMultipleFaceCount, Integer minExceptionCount,
|
|
Integer minMultipleFaceCount, Integer maxMultipleFaceCount, Integer minExceptionCount,
|
|
@@ -778,7 +778,7 @@ public class TOeExamRecordServiceImpl extends ServiceImpl<TOeExamRecordMapper, T
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
@SuppressWarnings("rawtypes")
|
|
@SuppressWarnings("rawtypes")
|
|
- @Override
|
|
|
|
|
|
+ @Override
|
|
public IPage<InvigilateListProgressBean> invigilatePageProgressList(IPage<Map> iPage, Long examId,
|
|
public IPage<InvigilateListProgressBean> invigilatePageProgressList(IPage<Map> iPage, Long examId,
|
|
Long examActivityId, String roomCode, String courseCode, String name, String identity, Long userId,
|
|
Long examActivityId, String roomCode, String courseCode, String name, String identity, Long userId,
|
|
Long orgId) {
|
|
Long orgId) {
|
|
@@ -832,7 +832,7 @@ public class TOeExamRecordServiceImpl extends ServiceImpl<TOeExamRecordMapper, T
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
@SuppressWarnings("rawtypes")
|
|
@SuppressWarnings("rawtypes")
|
|
- @Override
|
|
|
|
|
|
+ @Override
|
|
public IPage<InvigilateListHistoryBean> invigilatePageListHistory(IPage<Map> iPage, Long examId,
|
|
public IPage<InvigilateListHistoryBean> invigilatePageListHistory(IPage<Map> iPage, Long examId,
|
|
Long examActivityId, String roomCode, String courseCode, String status, Integer breachStatus,
|
|
Long examActivityId, String roomCode, String courseCode, String status, Integer breachStatus,
|
|
String finishType, String name, String identity, Integer minMultipleFaceCount, Integer maxMultipleFaceCount,
|
|
String finishType, String name, String identity, Integer minMultipleFaceCount, Integer maxMultipleFaceCount,
|