|
@@ -16,7 +16,6 @@ import com.qmth.jkserver.service.ExamPaperTempService;
|
|
import com.qmth.jkserver.service.ExamStudentService;
|
|
import com.qmth.jkserver.service.ExamStudentService;
|
|
import com.qmth.jkserver.service.KWService;
|
|
import com.qmth.jkserver.service.KWService;
|
|
import com.qmth.jkserver.util.FileStoreUtil;
|
|
import com.qmth.jkserver.util.FileStoreUtil;
|
|
-import com.qmth.jkserver.util.JacksonUtil;
|
|
|
|
import net.lingala.zip4j.core.ZipFile;
|
|
import net.lingala.zip4j.core.ZipFile;
|
|
import org.apache.commons.io.FilenameUtils;
|
|
import org.apache.commons.io.FilenameUtils;
|
|
import org.apache.commons.io.IOUtils;
|
|
import org.apache.commons.io.IOUtils;
|
|
@@ -122,12 +121,13 @@ public class ExamPaperTempServiceImpl extends ServiceImpl<ExamPaperTempDao, Exam
|
|
|
|
|
|
File finalAnswerDir = null;
|
|
File finalAnswerDir = null;
|
|
if (!CollectionUtils.isEmpty(map)) {
|
|
if (!CollectionUtils.isEmpty(map)) {
|
|
- log.info("fileDirectoryCount:{}", JacksonUtil.parseJson(map));
|
|
|
|
- int fileDirectoryCount = (int) map.get("fileDirectoryCount");
|
|
|
|
- if (fileDirectoryCount == 3) {
|
|
|
|
- finalAnswerDir = new File((String) map.get("1"));
|
|
|
|
- } else if (fileDirectoryCount == 4) {
|
|
|
|
- finalAnswerDir = new File((String) map.get("2"));
|
|
|
|
|
|
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
|
|
|
|
+ if (!Objects.equals(entry.getKey(), "fileDirectoryCount")) {
|
|
|
|
+ finalAnswerDir = new File((String) entry.getValue());
|
|
|
|
+ if (finalAnswerDir.getAbsolutePath().endsWith("answer")) {
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
finalAnswerDir = answerDir;
|
|
finalAnswerDir = answerDir;
|