...

examcloud-task-api-provider/src/main/java/cn/com/qmth/examcloud/task/api/controller/ExamStudentImportController.java

@@ -11,7 +11,6 @@ import javax.transaction.Transactional;
 import org.apache.commons.fileupload.disk.DiskFileItem;
 import org.apache.commons.io.FileUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
@@ -44,6 +43,7 @@ import cn.com.qmth.examcloud.task.api.controller.bean.ExamStudentImportDomain;
 import cn.com.qmth.examcloud.task.dao.ExamStudentImportRepo;
 import cn.com.qmth.examcloud.task.dao.entity.ExamStudentImportEntity;
 import cn.com.qmth.examcloud.task.dao.enums.ExamStudentImportStatus;
+import cn.com.qmth.examcloud.web.config.SystemConfig;
 import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import io.swagger.annotations.ApiOperation;
 
@@ -59,8 +59,8 @@ import io.swagger.annotations.ApiOperation;
 @RequestMapping("${$rmp.ctr.task}" + "examStudentImport")
 public class ExamStudentImportController extends ControllerSupport {
 
-	@Value("${$dir}")
-	private String dir;
+	@Autowired
+	SystemConfig systemConfig;
 
 	private static final String EXAM_STUDENT_IMPORT_FILES = "exam_student_import_files";
 
@@ -97,8 +97,8 @@ public class ExamStudentImportController extends ControllerSupport {
 		String destFileName = name + suffix;
 		String resultFileName = name + ".txt";
 
-		String destFilePath = PathUtil
-				.getCanonicalPath(dir + "/" + EXAM_STUDENT_IMPORT_FILES + "/" + destFileName);
+		String destFilePath = PathUtil.getCanonicalPath(
+				systemConfig.getDataDir() + "/" + EXAM_STUDENT_IMPORT_FILES + "/" + destFileName);
 		File destFile = new File(destFilePath);
 
 		FileUtils.copyFile(storeLocation, destFile);
@@ -193,8 +193,8 @@ public class ExamStudentImportController extends ControllerSupport {
 			}
 		}
 
-		String path = PathUtil
-				.getCanonicalPath(dir + "/" + EXAM_STUDENT_IMPORT_FILES + "/" + resultFilePath);
+		String path = PathUtil.getCanonicalPath(
+				systemConfig.getDataDir() + "/" + EXAM_STUDENT_IMPORT_FILES + "/" + resultFilePath);
 
 		File file = new File(path);
 
@@ -222,8 +222,8 @@ public class ExamStudentImportController extends ControllerSupport {
 		}
 
 		String filePath = entity.getFilePath();
-		String path = PathUtil
-				.getCanonicalPath(dir + "/" + EXAM_STUDENT_IMPORT_FILES + "/" + filePath);
+		String path = PathUtil.getCanonicalPath(
+				systemConfig.getDataDir() + "/" + EXAM_STUDENT_IMPORT_FILES + "/" + filePath);
 
 		File file = new File(path);
 

examcloud-task-service/src/main/java/cn/com/qmth/examcloud/task/service/job/CopyExamStudentTask.java

@@ -3,7 +3,6 @@ package cn.com.qmth.examcloud.task.service.job;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import com.google.common.collect.Lists;
@@ -31,9 +30,6 @@ import cn.com.qmth.examcloud.task.dao.enums.CopyExamStudentStatus;
 @Component("copyExamStudentTask")
 public class CopyExamStudentTask extends AbstractTask {
 
-	@Value("${$dir}")
-	private String dir;
-
 	@Autowired
 	TaskTracker TaskTracker;
 

examcloud-task-service/src/main/java/cn/com/qmth/examcloud/task/service/job/ExamStudentImportCleanTask.java

@@ -10,7 +10,6 @@ import javax.persistence.criteria.Predicate;
 
 import org.apache.commons.io.FileUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
@@ -26,6 +25,7 @@ import cn.com.qmth.examcloud.task.base.TaskTracker;
 import cn.com.qmth.examcloud.task.dao.ExamStudentImportRepo;
 import cn.com.qmth.examcloud.task.dao.ExamStudentTempRepo;
 import cn.com.qmth.examcloud.task.dao.entity.ExamStudentImportEntity;
+import cn.com.qmth.examcloud.web.config.SystemConfig;
 
 /**
  * 考生导入-数据清理
@@ -38,8 +38,8 @@ import cn.com.qmth.examcloud.task.dao.entity.ExamStudentImportEntity;
 @Component("examStudentImportCleanTask")
 public class ExamStudentImportCleanTask extends AbstractTask {
 
-	@Value("${$dir}")
-	private String dir;
+	@Autowired
+	SystemConfig systemConfig;
 
 	@Autowired
 	TaskTracker TaskTracker;
@@ -67,16 +67,16 @@ public class ExamStudentImportCleanTask extends AbstractTask {
 			return cb.and(predicates.toArray(new Predicate[predicates.size()]));
 		};
 
-		Pageable pageable = new PageRequest(0, 100, Sort.Direction.ASC, "creationTime");
+		Pageable pageable = PageRequest.of(0, 100, Sort.Direction.ASC, "creationTime");
 		Page<ExamStudentImportEntity> list = examStudentImportRepo.findAll(specification, pageable);
 		for (ExamStudentImportEntity cur : list) {
 
 			examStudentTempRepo.deleteByBatchId(cur.getBatchId());
 
-			String destFilePath = PathUtil.getCanonicalPath(
-					dir + "/" + EXAM_STUDENT_IMPORT_FILES + "/" + cur.getFilePath());
-			String resultFilePath = PathUtil.getCanonicalPath(
-					dir + "/" + EXAM_STUDENT_IMPORT_FILES + "/" + cur.getResultFilePath());
+			String destFilePath = PathUtil.getCanonicalPath(systemConfig.getDataDir() + "/"
+					+ EXAM_STUDENT_IMPORT_FILES + "/" + cur.getFilePath());
+			String resultFilePath = PathUtil.getCanonicalPath(systemConfig.getDataDir() + "/"
+					+ EXAM_STUDENT_IMPORT_FILES + "/" + cur.getResultFilePath());
 
 			FileUtils.deleteQuietly(new File(destFilePath));
 			FileUtils.deleteQuietly(new File(resultFilePath));

examcloud-task-service/src/main/java/cn/com/qmth/examcloud/task/service/job/ExamStudentImportDataProcessingTask.java

@@ -10,7 +10,6 @@ import java.util.Map;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.io.FileUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
@@ -42,6 +41,7 @@ import cn.com.qmth.examcloud.task.dao.ExamStudentTempRepo;
 import cn.com.qmth.examcloud.task.dao.entity.ExamStudentImportEntity;
 import cn.com.qmth.examcloud.task.dao.entity.ExamStudentTempEntity;
 import cn.com.qmth.examcloud.task.dao.enums.ExamStudentImportStatus;
+import cn.com.qmth.examcloud.web.config.SystemConfig;
 
 /**
  * 考生导入-文件解析
@@ -53,8 +53,8 @@ import cn.com.qmth.examcloud.task.dao.enums.ExamStudentImportStatus;
 @Component("examStudentImportDataProcessingTask")
 public class ExamStudentImportDataProcessingTask extends AbstractTask {
 
-	@Value("${$dir}")
-	private String dir;
+	@Autowired
+	SystemConfig systemConfig;
 
 	private static final String EXAM_STUDENT_IMPORT_FILES = "exam_student_import_files";
 
@@ -120,8 +120,8 @@ public class ExamStudentImportDataProcessingTask extends AbstractTask {
 			sb.append("line ").append(cur.get("lineNum")).append(cur.get("msg")).append("\n");
 		}
 		sb.append("====================异常数据\n");
-		String resultFilePath = PathUtil.getCanonicalPath(
-				dir + "/" + EXAM_STUDENT_IMPORT_FILES + "/" + importEntity.getResultFilePath());
+		String resultFilePath = PathUtil.getCanonicalPath(systemConfig.getDataDir() + "/"
+				+ EXAM_STUDENT_IMPORT_FILES + "/" + importEntity.getResultFilePath());
 		File resultFile = new File(resultFilePath);
 
 		try {
@@ -151,7 +151,7 @@ public class ExamStudentImportDataProcessingTask extends AbstractTask {
 		Long batchId = importEntity.getBatchId();
 
 		while (true) {
-			Pageable pageable = new PageRequest(0, 100, Sort.Direction.ASC, "lineNum");
+			Pageable pageable = PageRequest.of(0, 100, Sort.Direction.ASC, "lineNum");
 			List<ExamStudentTempEntity> list = examStudentTempRepo
 					.findByBatchIdAndStatusCodeIsNull(batchId, pageable);
 			if (CollectionUtils.isEmpty(list)) {

examcloud-task-service/src/main/java/cn/com/qmth/examcloud/task/service/job/ExamStudentImportParsingFileTask.java

@@ -13,7 +13,6 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import com.google.common.collect.Lists;
@@ -30,6 +29,7 @@ import cn.com.qmth.examcloud.task.dao.ExamStudentTempRepo;
 import cn.com.qmth.examcloud.task.dao.entity.ExamStudentImportEntity;
 import cn.com.qmth.examcloud.task.dao.entity.ExamStudentTempEntity;
 import cn.com.qmth.examcloud.task.dao.enums.ExamStudentImportStatus;
+import cn.com.qmth.examcloud.web.config.SystemConfig;
 
 /**
  * 考生导入-文件解析
@@ -41,8 +41,8 @@ import cn.com.qmth.examcloud.task.dao.enums.ExamStudentImportStatus;
 @Component("examStudentImportParsingFileTask")
 public class ExamStudentImportParsingFileTask extends AbstractTask {
 
-	@Value("${$dir}")
-	private String dir;
+	@Autowired
+	SystemConfig systemConfig;
 
 	private static final String EXAM_STUDENT_IMPORT_FILES = "exam_student_import_files";
 
@@ -94,10 +94,10 @@ public class ExamStudentImportParsingFileTask extends AbstractTask {
 	 * @param importEntity
 	 */
 	private void importExcel(ExamStudentImportEntity importEntity) {
-		String destFilePath = PathUtil.getCanonicalPath(
-				dir + "/" + EXAM_STUDENT_IMPORT_FILES + "/" + importEntity.getFilePath());
-		String resultFilePath = PathUtil.getCanonicalPath(
-				dir + "/" + EXAM_STUDENT_IMPORT_FILES + "/" + importEntity.getResultFilePath());
+		String destFilePath = PathUtil.getCanonicalPath(systemConfig.getDataDir() + "/"
+				+ EXAM_STUDENT_IMPORT_FILES + "/" + importEntity.getFilePath());
+		String resultFilePath = PathUtil.getCanonicalPath(systemConfig.getDataDir() + "/"
+				+ EXAM_STUDENT_IMPORT_FILES + "/" + importEntity.getResultFilePath());
 
 		File file = new File(destFilePath);