Merge branch 'dev'

1

themis-backend/src/main/java/com/qmth/themis/backend/api/TIeInvigilateCallMobileController.java

@@ -194,7 +194,10 @@ public class TIeInvigilateCallMobileController {
         MonitorVideoSourceEnum source = MonitorVideoSourceEnum.valueOf(String.valueOf(mapParameter.get("source")));
         //获取考试记录缓存
         String liveUrl = null;
-        if (Objects.isNull(ExamRecordCacheUtil.getMonitorStatus(recordId, source))) {
+        ExamRecordStatusEnum statusEnum = ExamRecordCacheUtil.getStatus(recordId);
+        if (Objects.isNull(statusEnum) || Objects.equals(statusEnum, ExamRecordStatusEnum.FINISHED) || Objects.equals(statusEnum, ExamRecordStatusEnum.PERSISTED)) {
+            return ResultUtil.ok(Collections.singletonMap(SystemConstant.SUCCESS, true));
+        } else if (Objects.isNull(ExamRecordCacheUtil.getMonitorStatus(recordId, source))) {
             throw new BusinessException("推流状态为空");
         }
         ExamRecordCacheUtil.setMonitorCallStatus(recordId, source, MonitorCallStatusSourceEnum.STOP);

themis-business/src/main/java/com/qmth/themis/business/templete/TaskExportCommon.java

@@ -7,6 +7,7 @@ import com.qmth.themis.business.config.SystemConfig;
 import com.qmth.themis.business.constant.SpringContextHolder;
 import com.qmth.themis.business.constant.SystemConstant;
 import com.qmth.themis.business.entity.TBTaskHistory;
+import com.qmth.themis.business.enums.TaskStatusEnum;
 import com.qmth.themis.business.enums.UploadFileEnum;
 import com.qmth.themis.business.service.TBAttachmentService;
 import com.qmth.themis.business.service.TBTaskHistoryService;
@@ -184,6 +185,7 @@ public class TaskExportCommon {
         String exceptionStr = "数据导出到第" + (y == 0 ? y + 1 : y) + "条时发生异常，请联系系统管理员处理！";
         txtList.add(DateUtil.format(new Date(), this.timeFormat) + "->" + exceptionStr);
         this.tbTaskHistory.setSummary(exceptionStr);
+        this.tbTaskHistory.setStatus(TaskStatusEnum.FINISH);
         return txtList;
     }
 

themis-business/src/main/java/com/qmth/themis/business/templete/TaskImportCommon.java

@@ -7,6 +7,7 @@ import com.qmth.themis.business.config.SystemConfig;
 import com.qmth.themis.business.constant.SpringContextHolder;
 import com.qmth.themis.business.constant.SystemConstant;
 import com.qmth.themis.business.entity.TBTaskHistory;
+import com.qmth.themis.business.enums.TaskStatusEnum;
 import com.qmth.themis.business.service.TBTaskHistoryService;
 import com.qmth.themis.business.util.OssUtil;
 import org.slf4j.Logger;
@@ -157,6 +158,7 @@ public class TaskImportCommon {
         String exceptionStr = "数据处理到第" + (y == 0 ? y + 1 : y) + "条时发生异常，请联系系统管理员处理！";
         txtList.add(DateUtil.format(new Date(), this.timeFormat) + "->" + exceptionStr);
         this.tbTaskHistory.setSummary(exceptionStr);
+        this.tbTaskHistory.setStatus(TaskStatusEnum.FINISH);
         return txtList;
     }