|
@@ -1926,7 +1926,7 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
|
|
|
return false;
|
|
|
}
|
|
|
// 重复校验任务状态
|
|
|
- if (t.getAssignedCheckCount() == 0 || t.getAssignedCheckCount() == 1 ) {
|
|
|
+ if (t.getAssignedCheckCount() == 0 || t.getAssignedCheckCount() == 1) {
|
|
|
return true;
|
|
|
} else {
|
|
|
taskLock.remove(t.getId());
|
|
@@ -2033,7 +2033,7 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
|
|
|
|
|
|
private IPage<AnswerQueryVo> findUnCheck(Long examId, String subjectCode, int checkCount, int pageNumber,
|
|
|
int pageSize) {
|
|
|
- return this.baseMapper.findUnCheck(new Page<>(pageNumber,pageSize),examId, subjectCode, checkCount);
|
|
|
+ return this.baseMapper.findUnCheck(new Page<>(pageNumber, pageSize), examId, subjectCode, checkCount);
|
|
|
}
|
|
|
|
|
|
private AnswerQueryVo toTaskVo(AnswerQueryVo t) {
|
|
@@ -2224,7 +2224,7 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
|
|
|
|
|
|
@Override
|
|
|
public TaskIdVo breachImport(Long examId, String subjectCode, MultipartFile file) {
|
|
|
- if (!file.getName().toLowerCase().endsWith(".txt")) {
|
|
|
+ if (!file.getOriginalFilename().toLowerCase().endsWith(".txt")) {
|
|
|
throw new ParameterException("只能是txt文件");
|
|
|
}
|
|
|
String taskId = FastUUID.get();
|
|
@@ -2252,6 +2252,8 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
|
|
|
exec.execute(com);
|
|
|
asyncTaskService.addTask(vo);
|
|
|
return TaskIdVo.create(vo.getTaskId());
|
|
|
+ } catch (ParameterException e) {
|
|
|
+ throw e;
|
|
|
} catch (Exception e) {
|
|
|
throw new RuntimeException("系统错误", e);
|
|
|
}
|
|
@@ -2373,7 +2375,7 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
|
|
|
|
|
|
@Override
|
|
|
public TaskIdVo custStatusImport(Long examId, String subjectCode, MultipartFile file) {
|
|
|
- if (!file.getName().toLowerCase().endsWith(".txt")) {
|
|
|
+ if (!file.getOriginalFilename().toLowerCase().endsWith(".txt")) {
|
|
|
throw new ParameterException("只能是txt文件");
|
|
|
}
|
|
|
String taskId = FastUUID.get();
|
|
@@ -2401,6 +2403,8 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
|
|
|
exec.execute(com);
|
|
|
asyncTaskService.addTask(vo);
|
|
|
return TaskIdVo.create(vo.getTaskId());
|
|
|
+ } catch (ParameterException e) {
|
|
|
+ throw e;
|
|
|
} catch (Exception e) {
|
|
|
throw new RuntimeException("系统错误", e);
|
|
|
}
|